From 3d0fff0e4f5e5749c22baaa40af9825d593fa7f4 Mon Sep 17 00:00:00 2001
From: 付智勇 <fuzhiyong@efangtec.com>
Date: Mon, 25 Sep 2017 20:48:12 +0800
Subject: [PATCH] no message
---
docs/recod.md | 11 +++++++++++
model/v_meetingModel.js | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
services/meetingService.js | 7 +++++--
3 files changed, 277 insertions(+), 2 deletions(-)
create mode 100644 docs/recod.md
create mode 100644 model/v_meetingModel.js
diff --git a/docs/recod.md b/docs/recod.md
new file mode 100644
index 0000000..ba3d337
--- /dev/null
+++ b/docs/recod.md
@@ -0,0 +1,11 @@
+## 录制管理
+
+
+ > 请求域名： https://networkschool.xuedianyun.com/server/
+ >请求头参数：pageno 每页多少条 page 第几页
+
+ ### 课堂列表查询
+
+ POST /meeting/getAllMeetingBySiteID
+
+
\ No newline at end of file
diff --git a/model/v_meetingModel.js b/model/v_meetingModel.js
new file mode 100644
index 0000000..908c9f5
--- /dev/null
+++ b/model/v_meetingModel.js
@@ -0,0 +1,261 @@
+var sequelize = require('../config');
+var Sequelize = require('sequelize');
+const uuid = require('../util/UuidUtil')
+
+
+var user = sequelize.define('v_meeting', {
+ id: {
+ type: Sequelize.STRING(32),
+ defaultValue:uuid.db32(),
+ allowNull: false,
+ unique: true,
+ primaryKey: true,
+ field: "id"
+ },
+ meetingNumber: {
+ type:Sequelize.STRING(32),
+ field: "meeting_number"
+ },
+ meetingName: {
+ type:Sequelize.STRING(128),
+ field: "meeting_name"
+ },
+ meetingContent:{
+ type:Sequelize.TEXT(0),
+ field: "meeting_content"
+ },
+ create_user:{
+ type:Sequelize.STRING(128),
+ field: "create_user"
+ },
+ createTime:{
+ type:Sequelize.DATE,
+ defaultValue:Sequelize.NOW,
+ field: "create_time"
+ },
+ beginTime:{
+ type:Sequelize.DATE,
+ field: "begin_time"
+ },
+ endTime:{
+ type:Sequelize.DATE,
+ field: "end_time"
+ },
+ inviteUser:{
+ type:Sequelize.STRING(1024),
+ field: "invite_user"
+ },
+ meetingType:{
+ type:Sequelize.INTEGER(4),
+ field: "meeting_type"
+ },
+ meetingStatus:{
+ type:Sequelize.STRING(32),
+ field: "meeting_status"
+ },
+ userIp:{
+ type:Sequelize.INTEGER(11),
+ field: "user_ip"
+ },
+ meetingKey:{
+ type:Sequelize.STRING(128),
+ field: "meeting_key"
+ },
+ hostPassword:{
+ type:Sequelize.STRING(12),
+ field: "host_password"
+ },
+ presenterPassword:{
+ type:Sequelize.STRING(12),
+ field: "presenter_password"
+ },
+ assistantPassword:{
+ type:Sequelize.STRING(12),
+ field: "assistant_password"
+ },
+ attendeePassword:{
+ type:Sequelize.STRING(12),
+ field: "attendee_password"
+ },
+ capacity:{
+ type:Sequelize.INTEGER(11),
+ field: "capacity"
+ },
+ topNodeId:{
+ type:Sequelize.STRING(32),
+ field: "top_node_id"
+ },
+ topNodeAddr:{
+ type:Sequelize.STRING(128),
+ field: "top_node_addr"
+ },
+ userData:{
+ type:Sequelize.STRING(128),
+ field: "user_data"
+ },
+ siteId:{
+ type:Sequelize.STRING(32),
+ field: "site_id"
+ },
+ classroomNumber:{
+ type:Sequelize.STRING(128),
+ field: "classroom_number"
+ },
+ uiLanguage:{
+ type:Sequelize.INTEGER(11),
+ field: "ui_language"
+ },
+ isPublic:{
+ type:Sequelize.INTEGER(11),
+ field: "is_public"
+ },
+ controlMode:{
+ type:Sequelize.INTEGER(11),
+ field: "control_mode"
+ },
+ micAuto:{
+ type:Sequelize.INTEGER(11),
+ field: "mic_auto"
+ },
+ hasInteraction:{
+ type:Sequelize.INTEGER(11),
+ field: "has_interaction"
+ },
+ autoRecord:{
+ type:Sequelize.INTEGER(11),
+ field: "auto_record"
+ },
+ maxVideoChannels:{
+ type:Sequelize.INTEGER(11),
+ field: "max_videoChannels"
+ },
+ maxAudioChannels:{
+ type:Sequelize.INTEGER(11),
+ field: "max_audioChannels"
+ },
+ videoQuality:{
+ type:Sequelize.INTEGER(11),
+ field: "video_quality"
+ },
+ pagenaviUserprivilege:{
+ type:Sequelize.INTEGER(11),
+ field: "pagenavi_Userprivilege"
+ },
+ markerUserprivilege:{
+ type:Sequelize.INTEGER(11),
+ field: "marker_Userprivilege"
+ },
+ chatToNormalUserprivilege:{
+ type:Sequelize.INTEGER(11),
+ field: "chatToNormal_Userprivilege"
+ },
+ chatToHostUserprivilege:{
+ type:Sequelize.INTEGER(11),
+ field: "chatToHost_Userprivilege"
+ },
+ docModule:{
+ type:Sequelize.INTEGER(11),
+ field: "doc_module"
+ },
+ screenModule:{
+ type:Sequelize.INTEGER(11),
+ field: "screen_module"
+ },
+ mediaModule:{
+ type:Sequelize.INTEGER(11),
+ field: "media_module"
+ },
+ whiteboardModule:{
+ type:Sequelize.INTEGER(11),
+ field: "whiteboard_module"
+ },
+ recordModule:{
+ type:Sequelize.INTEGER(11),
+ field: "record_module"
+ },
+ videoModule:{
+ type:Sequelize.INTEGER(11),
+ field: "video_module"
+ },
+ userListModule:{
+ type:Sequelize.INTEGER(11),
+ field: "userList_module"
+ },
+ chatModule:{
+ type:Sequelize.INTEGER(11),
+ field: "chat_module"
+ },
+ cycle:{
+ type:Sequelize.INTEGER(11),
+ field: "cycle"
+ },
+ repeatmode:{
+ type:Sequelize.INTEGER(11),
+ field: "repeatmode"
+ },
+ endmode:{
+ type:Sequelize.INTEGER(11),
+ field: "endmode"
+ },
+ finalenddate:{
+ type:Sequelize.INTEGER(11),
+ field: "finalenddate"
+ },
+ endcount:{
+ type:Sequelize.INTEGER(11),
+ field: "endcount"
+ },
+ repeatday:{
+ type:Sequelize.INTEGER(11),
+ field: "repeatday"
+ },
+ repeatweek:{
+ type:Sequelize.INTEGER(11),
+ field: "repeatweek"
+ },
+ repeatmonthday:{
+ type:Sequelize.INTEGER(11),
+ field: "repeatmonthday"
+ },
+ repeatmonthweekweek:{
+ type:Sequelize.INTEGER(11),
+ field: "repeatmonthweekweek"
+ },
+ repeatmonthweekday:{
+ type:Sequelize.INTEGER(11),
+ field: "repeatmonthweekday"
+ },
+ frequency:{
+ type:Sequelize.INTEGER(11),
+ field: "frequency"
+ },
+ monthType:{
+ type:Sequelize.INTEGER(11),
+ field: "month_type"
+ },
+ inviterRadio:{
+ type:Sequelize.INTEGER(11),
+ field: "inviter_radio"
+ },
+ aheadTime:{
+ type:Sequelize.INTEGER(11),
+ field: "ahead_time"
+ },
+ chatInterval:{
+ type:Sequelize.INTEGER(11),
+ field: "chat_interval"
+ },
+ h5Module:{
+ type:Sequelize.INTEGER(11),
+ field: "h5_Module"
+ },
+ // reservationNumber:{
+ // type:Sequelize.INTEGER(11),
+ // field: "reservation_number"
+ // },
+}, {
+ timestamps: false,
+ freezeTableName: true
+ });
+
+module.exports = user;
\ No newline at end of file
diff --git a/services/meetingService.js b/services/meetingService.js
index cb98c70..ddd4ed9 100644
--- a/services/meetingService.js
+++ b/services/meetingService.js
@@ -1,6 +1,7 @@
var meetingModel = require('../model/meetingModel');
var oldMeetingModel = require('../model/oldMeetingModel');
var oldMeetingRecording = require('../model/oldMeetingRecording');
+var v_meetingModel = require('../model/v_meetingModel');
var status = require('../util/resTemplate');
var saitMd5 = require('../util/saltMD5');
var sequelize = require('../config');
@@ -155,12 +156,14 @@ meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =1
if(!Meeting){
return {code:11,msg:'课堂不存在'}
}
+ let meetingAll = await v_meetingModel.findAll({where:params,offset: (page-1)*pageno, limit: pageno});
let meetingdata = Meeting.concat(oldMeeting);
- await meetingdata.sort(function(m1,m2){
+ await meetingdata.sort(function(m1,m2){
return new Date(m2.beginTime).getTime() - new Date(m1.beginTime).getTime();
});
console.log((page-1)*pageno,(page-1)*pageno+10)
- return {meeting:meetingdata.slice((page-1)*pageno,100)}
+ // return {meeting:meetingdata.slice((page-1)*pageno,100)}
+ return {meeting:meetingAll}
} catch (error) {
throw error
}
--
libgit2 0.24.0