正在显示
3 个修改的文件
包含
99 行增加
和
5 行删除
| @@ -241,6 +241,15 @@ meetingController.prototype.getAllMeetingBySiteID = async(ctx,next)=>{ | @@ -241,6 +241,15 @@ meetingController.prototype.getAllMeetingBySiteID = async(ctx,next)=>{ | ||
| 241 | meetingController.prototype.recording = async(ctx,next)=>{ | 241 | meetingController.prototype.recording = async(ctx,next)=>{ |
| 242 | try { | 242 | try { |
| 243 | let params = ctx.request.body; | 243 | let params = ctx.request.body; |
| 244 | + if(!params.mtgKey){ | ||
| 245 | + return status.paramError('mtgKey'); | ||
| 246 | + } | ||
| 247 | + if(!params.siteId){ | ||
| 248 | + return status.paramError('siteId'); | ||
| 249 | + } | ||
| 250 | + if(!params.username){ | ||
| 251 | + return status.paramError('username'); | ||
| 252 | + } | ||
| 244 | let updateMeeting = meetingService.recording(params) | 253 | let updateMeeting = meetingService.recording(params) |
| 245 | return updateMeeting; | 254 | return updateMeeting; |
| 246 | } catch (error) { | 255 | } catch (error) { |
| @@ -2,10 +2,95 @@ | @@ -2,10 +2,95 @@ | ||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | > 请求域名: https://networkschool.xuedianyun.com/server/ | 4 | > 请求域名: https://networkschool.xuedianyun.com/server/ |
| 5 | - >请求头参数:pageno 每页多少条 page 第几页 | ||
| 6 | 5 | ||
| 7 | ### 课堂列表查询 | 6 | ### 课堂列表查询 |
| 8 | 7 | ||
| 9 | POST /meeting/getAllMeetingBySiteID | 8 | POST /meeting/getAllMeetingBySiteID |
| 10 | 9 | ||
| 11 | - | ||
| 10 | + 请求参数: | ||
| 11 | + | ||
| 12 | + 请求头参数:pageno 每页多少条 page 第几页 | ||
| 13 | + | ||
| 14 | + | ||
| 15 | + body | ||
| 16 | + | ||
| 17 | + { | ||
| 18 | + "siteId": "kaifang" | ||
| 19 | + } | ||
| 20 | + | ||
| 21 | + | ||
| 22 | + 返回参数: | ||
| 23 | + | ||
| 24 | + { | ||
| 25 | + "code": 200, | ||
| 26 | + "returnData": { | ||
| 27 | + "data": { | ||
| 28 | + "meeting": [ | ||
| 29 | + { | ||
| 30 | + "id": "8a2589d65e542a41015e559a41150064", //课堂id | ||
| 31 | + "meetingNumber": "2120839286", //课堂编号 | ||
| 32 | + "meetingName": "jiang-live", //课堂主题 | ||
| 33 | + "meetingContent": "", | ||
| 34 | + "create_user": "kaifang",//创建人 | ||
| 35 | + "createTime": "2017-09-06 13:12:06",//创建时间 | ||
| 36 | + "beginTime": "2017-09-26 00:00:00",//课堂开始时间 | ||
| 37 | + "endTime": "2017-09-26 23:00:00",//课堂结束时间 | ||
| 38 | + "inviteUser": "", | ||
| 39 | + "meetingType": 2, | ||
| 40 | + "meetingStatus": 1, | ||
| 41 | + "userIp": "60.253.214.122", | ||
| 42 | + "meetingKey": "SvidOmTjKQeHZTbDNzytdJjTXnhD5LyN", | ||
| 43 | + "hostPassword": "111111", | ||
| 44 | + "presenterPassword": "111111", | ||
| 45 | + "assistantPassword": "111111", | ||
| 46 | + "attendeePassword": "111111", | ||
| 47 | + "capacity": 1300, | ||
| 48 | + "topNodeId": "101", | ||
| 49 | + "topNodeAddr": "www.3mang.com", | ||
| 50 | + "userData": "", | ||
| 51 | + "siteId": "kaifang", | ||
| 52 | + "classroomNumber": "", | ||
| 53 | + "uiLanguage": 2, | ||
| 54 | + "isPublic": 1, | ||
| 55 | + "controlMode": 1, | ||
| 56 | + "micAuto": 0, | ||
| 57 | + "hasInteraction": 1, | ||
| 58 | + "autoRecord": 1, | ||
| 59 | + "maxVideoChannels": 1, | ||
| 60 | + "maxAudioChannels": 1, | ||
| 61 | + "videoQuality": 3, | ||
| 62 | + "pagenaviUserprivilege": 1, | ||
| 63 | + "markerUserprivilege": 1, | ||
| 64 | + "chatToNormalUserprivilege": 1, | ||
| 65 | + "chatToHostUserprivilege": 1, | ||
| 66 | + "docModule": 1, | ||
| 67 | + "screenModule": 1, | ||
| 68 | + "mediaModule": 1, | ||
| 69 | + "whiteboardModule": 1, | ||
| 70 | + "recordModule": 1, | ||
| 71 | + "videoModule": 1, | ||
| 72 | + "userListModule": 1, | ||
| 73 | + "chatModule": 1, | ||
| 74 | + "cycle": 1, | ||
| 75 | + "repeatmode": 0, | ||
| 76 | + "endmode": 2, | ||
| 77 | + "finalenddate": "", | ||
| 78 | + "endcount": 1, | ||
| 79 | + "repeatday": 1, | ||
| 80 | + "repeatweek": "", | ||
| 81 | + "repeatmonthday": 0, | ||
| 82 | + "repeatmonthweekweek": 0, | ||
| 83 | + "repeatmonthweekday": 0, | ||
| 84 | + "frequency": 1, | ||
| 85 | + "monthType": 0, | ||
| 86 | + "inviterRadio": 1, | ||
| 87 | + "aheadTime": 10, | ||
| 88 | + "chatInterval": 0, | ||
| 89 | + "h5Module": 1 | ||
| 90 | + } | ||
| 91 | + ] | ||
| 92 | + } | ||
| 93 | + } | ||
| 94 | +} | ||
| 95 | + | ||
| 96 | + |
| @@ -172,13 +172,13 @@ meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =1 | @@ -172,13 +172,13 @@ meetingService.prototype.getAllMeetingBySiteID = async(params,page = 1,pageno =1 | ||
| 172 | meetingService.prototype.recording = async(params)=>{ | 172 | meetingService.prototype.recording = async(params)=>{ |
| 173 | try { | 173 | try { |
| 174 | let newURL = 'http://'+params.siteId+'.xuedianyun.com/3m/doPlayRecord.do?meetingNumber='; | 174 | let newURL = 'http://'+params.siteId+'.xuedianyun.com/3m/doPlayRecord.do?meetingNumber='; |
| 175 | - let Meeting = await meetingModel.findOne({where:{id:params.meetingId}}); | 175 | + let Meeting = await meetingModel.findOne({where:{classroomNumber:params.mtgKey}}); |
| 176 | if(Meeting){ | 176 | if(Meeting){ |
| 177 | return {url:newURL+Meeting.meetingNumber} | 177 | return {url:newURL+Meeting.meetingNumber} |
| 178 | }else{ | 178 | }else{ |
| 179 | - let oldMeeting = await oldMeetingModel.findOne({where:{id:params.meetingId}}); | 179 | + let oldMeeting = await oldMeetingModel.findOne({where:{classroomNumber:params.mtgKey}}); |
| 180 | if(!oldMeeting){ | 180 | if(!oldMeeting){ |
| 181 | - return {code:11,msg:'课堂不存在'} | 181 | + return {code:400,msg:'课堂不存在'} |
| 182 | }else{ | 182 | }else{ |
| 183 | let oldURL = 'http://saas.3mang.com:80/3m/attend.do?meetingNumber='+oldMeeting.meetingNumber+'&streamNameOfRecord='; | 183 | let oldURL = 'http://saas.3mang.com:80/3m/attend.do?meetingNumber='+oldMeeting.meetingNumber+'&streamNameOfRecord='; |
| 184 | let oldMRecording = await oldMeetingRecording.findOne({where:{meetingId:oldMeeting.meetingNumber}}); | 184 | let oldMRecording = await oldMeetingRecording.findOne({where:{meetingId:oldMeeting.meetingNumber}}); |
-
请 注册 或 登录 后发表评论