正在显示
6 个修改的文件
包含
87 行增加
和
0 行删除
| @@ -225,4 +225,26 @@ meetingController.prototype.updateMeeting = async(ctx,next) =>{ | @@ -225,4 +225,26 @@ meetingController.prototype.updateMeeting = async(ctx,next) =>{ | ||
| 225 | } | 225 | } |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | +meetingController.prototype.getAllMeetingBySiteID = async(ctx,next)=>{ | ||
| 229 | + try { | ||
| 230 | + let params = ctx.request.body; | ||
| 231 | + let updateMeeting = meetingService.getAllMeetingBySiteID(params) | ||
| 232 | + return updateMeeting; | ||
| 233 | + } catch (error) { | ||
| 234 | + console.log(error) | ||
| 235 | + throw error | ||
| 236 | + } | ||
| 237 | +} | ||
| 238 | + | ||
| 239 | +meetingController.prototype.recording = async(ctx,next)=>{ | ||
| 240 | + try { | ||
| 241 | + let params = ctx.request.body; | ||
| 242 | + let updateMeeting = meetingService.recording(params) | ||
| 243 | + return updateMeeting; | ||
| 244 | + } catch (error) { | ||
| 245 | + console.log(error) | ||
| 246 | + throw error | ||
| 247 | + } | ||
| 248 | +} | ||
| 249 | + | ||
| 228 | module.exports = new meetingController() | 250 | module.exports = new meetingController() |
| @@ -10,6 +10,11 @@ router.get('/', async (ctx, next) => { | @@ -10,6 +10,11 @@ router.get('/', async (ctx, next) => { | ||
| 10 | title: 'Hello Koa 2!' | 10 | title: 'Hello Koa 2!' |
| 11 | }) | 11 | }) |
| 12 | }) | 12 | }) |
| 13 | +router.get('/record', async (ctx, next) => { | ||
| 14 | + await ctx.render('playRecord', { | ||
| 15 | + title: 'Hello Koa 2!' | ||
| 16 | + }) | ||
| 17 | +}) | ||
| 13 | 18 | ||
| 14 | 19 | ||
| 15 | router.get('/string', async (ctx, next) => { | 20 | router.get('/string', async (ctx, next) => { |
| @@ -55,5 +55,23 @@ router.post('/AuthId',async (ctx, next) => { | @@ -55,5 +55,23 @@ router.post('/AuthId',async (ctx, next) => { | ||
| 55 | }) | 55 | }) |
| 56 | 56 | ||
| 57 | 57 | ||
| 58 | + router.post('/getAllMeetingBySiteID', async (ctx, next) => { | ||
| 59 | + try{ | ||
| 60 | + var data = await meetingContoller.getAllMeetingBySiteID(ctx, next); | ||
| 61 | + status.successTemp(ctx,200,data); | ||
| 62 | + }catch(e){ | ||
| 63 | + status.catchError(ctx,400,e.message); | ||
| 64 | + } | ||
| 65 | + }) | ||
| 66 | + router.post('/recording', async (ctx, next) => { | ||
| 67 | + try{ | ||
| 68 | + var data = await meetingContoller.recording(ctx, next); | ||
| 69 | + status.successTemp(ctx,200,data); | ||
| 70 | + }catch(e){ | ||
| 71 | + status.catchError(ctx,400,e.message); | ||
| 72 | + } | ||
| 73 | + }) | ||
| 74 | + | ||
| 75 | + | ||
| 58 | module.exports = router | 76 | module.exports = router |
| 59 | 77 |
| @@ -26,6 +26,7 @@ router.post('/upLoadDoc',uploaddemo, async (ctx, next) => { | @@ -26,6 +26,7 @@ router.post('/upLoadDoc',uploaddemo, async (ctx, next) => { | ||
| 26 | console.log( ctx.req.file) | 26 | console.log( ctx.req.file) |
| 27 | console.log('文件名',ctx.request.file) | 27 | console.log('文件名',ctx.request.file) |
| 28 | let w = await fs.rename(applacation.uploade+ctx.req.file.filename,applacation.uploade+ctx.req.file.originalname) | 28 | let w = await fs.rename(applacation.uploade+ctx.req.file.filename,applacation.uploade+ctx.req.file.originalname) |
| 29 | + | ||
| 29 | ctx.body = { | 30 | ctx.body = { |
| 30 | filename:2 | 31 | filename:2 |
| 31 | } | 32 | } |
| 1 | var meetingModel = require('../model/meetingModel'); | 1 | var meetingModel = require('../model/meetingModel'); |
| 2 | +var oldMeetingModel = require('../model/oldMeetingModel'); | ||
| 2 | var status = require('../util/resTemplate'); | 3 | var status = require('../util/resTemplate'); |
| 3 | var saitMd5 = require('../util/saltMD5'); | 4 | var saitMd5 = require('../util/saltMD5'); |
| 4 | var sequelize = require('../config'); | 5 | var sequelize = require('../config'); |
| @@ -136,6 +137,41 @@ meetingService.prototype.updateMeeting = async(params,meetingId) =>{ | @@ -136,6 +137,41 @@ meetingService.prototype.updateMeeting = async(params,meetingId) =>{ | ||
| 136 | } | 137 | } |
| 137 | } | 138 | } |
| 138 | 139 | ||
| 140 | +meetingService.prototype.getAllMeetingBySiteID = async(params)=>{ | ||
| 141 | + try { | ||
| 142 | + let oldMeeting = await oldMeetingModel.findAll({where:{siteId:params.meetingId}}); | ||
| 143 | + let oldMeetingCont = await oldMeetingModel.count({where:{siteId:params.meetingId}}); | ||
| 144 | + let Meeting = await meetingModel.findAll({where:{site_id:params.meetingId}}); | ||
| 145 | + let MeetingCount = await meetingModel.count({where:{site_id:params.meetingId}}); | ||
| 146 | + if(!Meeting){ | ||
| 147 | + return {code:11,msg:'课堂不存在'} | ||
| 148 | + } | ||
| 149 | + return {meeting:Meeting.concat(oldMeeting)} | ||
| 150 | + } catch (error) { | ||
| 151 | + throw error | ||
| 152 | + } | ||
| 153 | +} | ||
| 154 | + | ||
| 155 | +meetingService.prototype.recording = async(params)=>{ | ||
| 156 | + try { | ||
| 157 | + let newURL = 'http://'+params.siteId+'.xuedianyun.com/3m/doPlayRecord.do?meetingNumber=' | ||
| 158 | + let Meeting = await meetingModel.findOne({where:{id:params.meetingId}}); | ||
| 159 | + if(Meeting){ | ||
| 160 | + return {url:newURL+Meeting.meetingNumber} | ||
| 161 | + }else{ | ||
| 162 | + | ||
| 163 | + } | ||
| 164 | + let oldMeeting = await oldMeetingModel.findAll({where:{siteId:params.meetingId}}); | ||
| 165 | + if(!Meeting){ | ||
| 166 | + return {code:11,msg:'课堂不存在'} | ||
| 167 | + } | ||
| 168 | + return {meeting:Meeting.concat(oldMeeting)} | ||
| 169 | + } catch (error) { | ||
| 170 | + console.error(error); | ||
| 171 | + throw error | ||
| 172 | + } | ||
| 173 | +} | ||
| 174 | + | ||
| 139 | 175 | ||
| 140 | 176 | ||
| 141 | module.exports = new meetingService(); | 177 | module.exports = new meetingService(); |
| @@ -12,6 +12,11 @@ | @@ -12,6 +12,11 @@ | ||
| 12 | <input type="text" value="1212" name="class" > | 12 | <input type="text" value="1212" name="class" > |
| 13 | <input type="submit" value="ok"/> | 13 | <input type="submit" value="ok"/> |
| 14 | </form> | 14 | </form> |
| 15 | + <button onclick="window.open('/record')"> asdas </button> | ||
| 16 | + <a href="/record">录制</a> | ||
| 15 | 17 | ||
| 16 | </body> | 18 | </body> |
| 19 | +<script> | ||
| 20 | + | ||
| 21 | +</script> | ||
| 17 | </html> | 22 | </html> |
-
请 注册 或 登录 后发表评论