付智勇 / koa2_Sequelize_project

转到一个项目
Toggle navigation Toggle navigation pinning
付智勇
3d0fff0e 1 parent 56f65295

no message

内嵌 并排对比
正在显示 3 个修改的文件 包含 277 行增加 和 2 行删除
  1 +## 录制管理
  2 +
  3 +
  4 + > 请求域名： https://networkschool.xuedianyun.com/server/
  5 + >请求头参数：pageno 每页多少条 page 第几页
  6 +
  7 + ### 课堂列表查询
  8 +
  9 + POST /meeting/getAllMeetingBySiteID
  10 +
  11 +
  1 +var sequelize = require('../config');
  2 +var Sequelize = require('sequelize');
  3 +const uuid = require('../util/UuidUtil')
  4 +
  5 +
  6 +var user = sequelize.define('v_meeting', {
  7 + id: {
  8 + type: Sequelize.STRING(32),
  9 + defaultValue:uuid.db32(),
  10 + allowNull: false,
  11 + unique: true,
  12 + primaryKey: true,
  13 + field: "id"
  14 + },
  15 + meetingNumber: {
  16 + type:Sequelize.STRING(32),
  17 + field: "meeting_number"
  18 + },
  19 + meetingName: {
  20 + type:Sequelize.STRING(128),
  21 + field: "meeting_name"
  22 + },
  23 + meetingContent:{
  24 + type:Sequelize.TEXT(0),
  25 + field: "meeting_content"
  26 + },
  27 + create_user:{
  28 + type:Sequelize.STRING(128),
  29 + field: "create_user"
  30 + },
  31 + createTime:{
  32 + type:Sequelize.DATE,
  33 + defaultValue:Sequelize.NOW,
  34 + field: "create_time"
  35 + },
  36 + beginTime:{
  37 + type:Sequelize.DATE,
  38 + field: "begin_time"
  39 + },
  40 + endTime:{
  41 + type:Sequelize.DATE,
  42 + field: "end_time"
  43 + },
  44 + inviteUser:{
  45 + type:Sequelize.STRING(1024),
  46 + field: "invite_user"
  47 + },
  48 + meetingType:{
  49 + type:Sequelize.INTEGER(4),
  50 + field: "meeting_type"
  51 + },
  52 + meetingStatus:{
  53 + type:Sequelize.STRING(32),
  54 + field: "meeting_status"
  55 + },
  56 + userIp:{
  57 + type:Sequelize.INTEGER(11),
  58 + field: "user_ip"
  59 + },
  60 + meetingKey:{
  61 + type:Sequelize.STRING(128),
  62 + field: "meeting_key"
  63 + },
  64 + hostPassword:{
  65 + type:Sequelize.STRING(12),
  66 + field: "host_password"
  67 + },
  68 + presenterPassword:{
  69 + type:Sequelize.STRING(12),
  70 + field: "presenter_password"
  71 + },
  72 + assistantPassword:{
  73 + type:Sequelize.STRING(12),
  74 + field: "assistant_password"
  75 + },
  76 + attendeePassword:{
  77 + type:Sequelize.STRING(12),
  78 + field: "attendee_password"
  79 + },
  80 + capacity:{
  81 + type:Sequelize.INTEGER(11),
  82 + field: "capacity"
  83 + },
  84 + topNodeId:{
  85 + type:Sequelize.STRING(32),
  86 + field: "top_node_id"
  87 + },
  88 + topNodeAddr:{
  89 + type:Sequelize.STRING(128),
  90 + field: "top_node_addr"
  91 + },
  92 + userData:{
  93 + type:Sequelize.STRING(128),
  94 + field: "user_data"
  95 + },
  96 + siteId:{
  97 + type:Sequelize.STRING(32),
  98 + field: "site_id"
  99 + },
  100 + classroomNumber:{
  101 + type:Sequelize.STRING(128),
  102 + field: "classroom_number"
  103 + },
  104 + uiLanguage:{
  105 + type:Sequelize.INTEGER(11),
  106 + field: "ui_language"
  107 + },
  108 + isPublic:{
  109 + type:Sequelize.INTEGER(11),
  110 + field: "is_public"
  111 + },
  112 + controlMode:{
  113 + type:Sequelize.INTEGER(11),
  114 + field: "control_mode"
  115 + },
  116 + micAuto:{
  117 + type:Sequelize.INTEGER(11),
  118 + field: "mic_auto"
  119 + },
  120 + hasInteraction:{
  121 + type:Sequelize.INTEGER(11),
  122 + field: "has_interaction"
  123 + },
  124 + autoRecord:{
  125 + type:Sequelize.INTEGER(11),
  126 + field: "auto_record"
  127 + },
  128 + maxVideoChannels:{
  129 + type:Sequelize.INTEGER(11),
  130 + field: "max_videoChannels"
  131 + },
  132 + maxAudioChannels:{
  133 + type:Sequelize.INTEGER(11),
  134 + field: "max_audioChannels"
  135 + },
  136 + videoQuality:{
  137 + type:Sequelize.INTEGER(11),
  138 + field: "video_quality"
  139 + },
  140 + pagenaviUserprivilege:{
  141 + type:Sequelize.INTEGER(11),
  142 + field: "pagenavi_Userprivilege"
  143 + },
  144 + markerUserprivilege:{
  145 + type:Sequelize.INTEGER(11),
  146 + field: "marker_Userprivilege"
  147 + },
  148 + chatToNormalUserprivilege:{
  149 + type:Sequelize.INTEGER(11),
  150 + field: "chatToNormal_Userprivilege"
  151 + },
  152 + chatToHostUserprivilege:{
  153 + type:Sequelize.INTEGER(11),
  154 + field: "chatToHost_Userprivilege"
  155 + },
  156 + docModule:{
  157 + type:Sequelize.INTEGER(11),
  158 + field: "doc_module"
  159 + },
  160 + screenModule:{
  161 + type:Sequelize.INTEGER(11),
  162 + field: "screen_module"
  163 + },
  164 + mediaModule:{
  165 + type:Sequelize.INTEGER(11),
  166 + field: "media_module"
  167 + },
  168 + whiteboardModule:{
  169 + type:Sequelize.INTEGER(11),
  170 + field: "whiteboard_module"
  171 + },
  172 + recordModule:{
  173 + type:Sequelize.INTEGER(11),
  174 + field: "record_module"
  175 + },
  176 + videoModule:{
  177 + type:Sequelize.INTEGER(11),
  178 + field: "video_module"
  179 + },
  180 + userListModule:{
  181 + type:Sequelize.INTEGER(11),
  182 + field: "userList_module"
  183 + },
  184 + chatModule:{
  185 + type:Sequelize.INTEGER(11),
  186 + field: "chat_module"
  187 + },
  188 + cycle:{
  189 + type:Sequelize.INTEGER(11),
  190 + field: "cycle"
  191 + },
  192 + repeatmode:{
  193 + type:Sequelize.INTEGER(11),
  194 + field: "repeatmode"
  195 + },
  196 + endmode:{
  197 + type:Sequelize.INTEGER(11),
  198 + field: "endmode"
  199 + },
  200 + finalenddate:{
  201 + type:Sequelize.INTEGER(11),
  202 + field: "finalenddate"
  203 + },
  204 + endcount:{
  205 + type:Sequelize.INTEGER(11),
  206 + field: "endcount"
  207 + },
  208 + repeatday:{
  209 + type:Sequelize.INTEGER(11),
  210 + field: "repeatday"
  211 + },
  212 + repeatweek:{
  213 + type:Sequelize.INTEGER(11),
  214 + field: "repeatweek"
  215 + },
  216 + repeatmonthday:{
  217 + type:Sequelize.INTEGER(11),
  218 + field: "repeatmonthday"
  219 + },
  220 + repeatmonthweekweek:{
  221 + type:Sequelize.INTEGER(11),
  222 + field: "repeatmonthweekweek"
  223 + },
  224 + repeatmonthweekday:{
  225 + type:Sequelize.INTEGER(11),
  226 + field: "repeatmonthweekday"
  227 + },
  228 + frequency:{
  229 + type:Sequelize.INTEGER(11),
  230 + field: "frequency"
  231 + },
  232 + monthType:{
  233 + type:Sequelize.INTEGER(11),
  234 + field: "month_type"
  235 + },
  236 + inviterRadio:{
  237 + type:Sequelize.INTEGER(11),
  238 + field: "inviter_radio"
  239 + },
  240 + aheadTime:{
  241 + type:Sequelize.INTEGER(11),
  242 + field: "ahead_time"
  243 + },
  244 + chatInterval:{
  245 + type:Sequelize.INTEGER(11),
  246 + field: "chat_interval"
  247 + },
  248 + h5Module:{
  249 + type:Sequelize.INTEGER(11),
  250 + field: "h5_Module"
  251 + },
  252 + // reservationNumber:{
  253 + // type:Sequelize.INTEGER(11),
  254 + // field: "reservation_number"
  255 + // },
  256 +}, {
  257 + timestamps: false,
  258 + freezeTableName: true
  259 + });
  260 +
  261 +module.exports = user;
1 var meetingModel = require('../model/meetingModel'); 1 var meetingModel = require('../model/meetingModel');
2 var oldMeetingModel = require('../model/oldMeetingModel'); 2 var oldMeetingModel = require('../model/oldMeetingModel');
3 var oldMeetingRecording = require('../model/oldMeetingRecording'); 3 var oldMeetingRecording = require('../model/oldMeetingRecording');
  4 +var v_meetingModel = require('../model/v_meetingModel');
4 var status = require('../util/resTemplate'); 5 var status = require('../util/resTemplate');
5 var saitMd5 = require('../util/saltMD5'); 6 var saitMd5 = require('../util/saltMD5');
6 var sequelize = require('../config'); 7 var sequelize = require('../config');
@@ -155,12 +156,14 @@ meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =1 @@ -155,12 +156,14 @@ meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =1
155 if(!Meeting){ 156 if(!Meeting){
156 return {code:11,msg:'课堂不存在'} 157 return {code:11,msg:'课堂不存在'}
157 } 158 }
  159 + let meetingAll = await v_meetingModel.findAll({where:params,offset: (page-1)*pageno, limit: pageno});
158 let meetingdata = Meeting.concat(oldMeeting); 160 let meetingdata = Meeting.concat(oldMeeting);
159 - await meetingdata.sort(function(m1,m2){ 161 + await meetingdata.sort(function(m1,m2){
160 return new Date(m2.beginTime).getTime() - new Date(m1.beginTime).getTime(); 162 return new Date(m2.beginTime).getTime() - new Date(m1.beginTime).getTime();
161 }); 163 });
162 console.log((page-1)*pageno,(page-1)*pageno+10) 164 console.log((page-1)*pageno,(page-1)*pageno+10)
163 - return {meeting:meetingdata.slice((page-1)*pageno,100)} 165 + // return {meeting:meetingdata.slice((page-1)*pageno,100)}
  166 + return {meeting:meetingAll}
164 } catch (error) { 167 } catch (error) {
165 throw error 168 throw error
166 } 169 }