正在显示
6 个修改的文件
包含
71 行增加
和
7 行删除
| @@ -19,6 +19,7 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{ | @@ -19,6 +19,7 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{ | ||
| 19 | } | 19 | } |
| 20 | let num = JSON.stringify(Math.floor(Math.random() * 99999) + 1000) | 20 | let num = JSON.stringify(Math.floor(Math.random() * 99999) + 1000) |
| 21 | let meeting = { | 21 | let meeting = { |
| 22 | + id:uuid.db32(), | ||
| 22 | meetingNumber:num, //课堂序号 | 23 | meetingNumber:num, //课堂序号 |
| 23 | meetingName:meetingbody.meetingName, //课堂名字 | 24 | meetingName:meetingbody.meetingName, //课堂名字 |
| 24 | meetingContent:meetingbody.meetingContent, //课堂描述 | 25 | meetingContent:meetingbody.meetingContent, //课堂描述 |
| @@ -55,4 +56,26 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{ | @@ -55,4 +56,26 @@ meetingController.prototype.createMeeting = async(ctx,next)=>{ | ||
| 55 | } | 56 | } |
| 56 | } | 57 | } |
| 57 | 58 | ||
| 59 | +meetingController.prototype.getMeeting = async(ctx,next) =>{ | ||
| 60 | + try { | ||
| 61 | + let meetingbody = ctx.request.body; | ||
| 62 | + let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; | ||
| 63 | + let pageno = ctx.header.pageno; | ||
| 64 | + let meetingData = await meetingService.getMeeting(meetingbody,page,pageno); | ||
| 65 | + return meetingData; | ||
| 66 | + } catch (error) { | ||
| 67 | + throw error; | ||
| 68 | + } | ||
| 69 | +} | ||
| 70 | + | ||
| 71 | +meetingController.prototype.delMeeting = async(ctx,next) =>{ | ||
| 72 | + try { | ||
| 73 | + const meetingId = ctx.params.meetingId; | ||
| 74 | + let delMeetingData = await meetingService.delMeeting(meetingId); | ||
| 75 | + return delMeetingData | ||
| 76 | + } catch (error) { | ||
| 77 | + | ||
| 78 | + } | ||
| 79 | +} | ||
| 80 | + | ||
| 58 | module.exports = new meetingController() | 81 | module.exports = new meetingController() |
| @@ -84,14 +84,14 @@ userController.prototype.login = async(ctx, next) =>{ | @@ -84,14 +84,14 @@ userController.prototype.login = async(ctx, next) =>{ | ||
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | userController.prototype.getStu = async(ctx, next) =>{ | 86 | userController.prototype.getStu = async(ctx, next) =>{ |
| 87 | - | ||
| 88 | try { | 87 | try { |
| 89 | const stuType = ctx.params.type; | 88 | const stuType = ctx.params.type; |
| 90 | if(!stuType){ | 89 | if(!stuType){ |
| 91 | return status.paramError('type'); | 90 | return status.paramError('type'); |
| 92 | } | 91 | } |
| 93 | - | ||
| 94 | - let stu = await userService.getStu(stuType); | 92 | + let page = ctx.header.page ? Number(ctx.header.page):ctx.header.page; |
| 93 | + let pageno = ctx.header.pageno; | ||
| 94 | + let stu = await userService.getStu(stuType,page,pageno); | ||
| 95 | return stu | 95 | return stu |
| 96 | } catch (error) { | 96 | } catch (error) { |
| 97 | throw new Error(error) | 97 | throw new Error(error) |
| @@ -26,7 +26,7 @@ var user = sequelize.define('3m_meeting', { | @@ -26,7 +26,7 @@ var user = sequelize.define('3m_meeting', { | ||
| 26 | }, | 26 | }, |
| 27 | create_user:{ | 27 | create_user:{ |
| 28 | type:Sequelize.STRING(128), | 28 | type:Sequelize.STRING(128), |
| 29 | - field: "user_name" | 29 | + field: "create_user" |
| 30 | }, | 30 | }, |
| 31 | createTime:{ | 31 | createTime:{ |
| 32 | type:Sequelize.DATE, | 32 | type:Sequelize.DATE, |
| @@ -11,6 +11,24 @@ router.post('/createMeeting', async (ctx, next) => { | @@ -11,6 +11,24 @@ router.post('/createMeeting', async (ctx, next) => { | ||
| 11 | var data = await meetingContoller.createMeeting(ctx, next); | 11 | var data = await meetingContoller.createMeeting(ctx, next); |
| 12 | status.successTemp(ctx,200,data); | 12 | status.successTemp(ctx,200,data); |
| 13 | }catch(e){ | 13 | }catch(e){ |
| 14 | + console.error(e) | ||
| 15 | + status.catchError(ctx,400,e.message); | ||
| 16 | + } | ||
| 17 | + }) | ||
| 18 | + | ||
| 19 | + router.put('/getMeeting', async (ctx, next) => { | ||
| 20 | + try{ | ||
| 21 | + var data = await meetingContoller.getMeeting(ctx, next); | ||
| 22 | + status.successTemp(ctx,200,data); | ||
| 23 | + }catch(e){ | ||
| 24 | + status.catchError(ctx,400,e.message); | ||
| 25 | + } | ||
| 26 | + }); | ||
| 27 | + router.delete('/delMeeting/:meetingId', async (ctx, next) => { | ||
| 28 | + try{ | ||
| 29 | + var data = await meetingContoller.delMeeting(ctx, next); | ||
| 30 | + status.successTemp(ctx,200,data); | ||
| 31 | + }catch(e){ | ||
| 14 | status.catchError(ctx,400,e.message); | 32 | status.catchError(ctx,400,e.message); |
| 15 | } | 33 | } |
| 16 | }) | 34 | }) |
| @@ -10,12 +10,34 @@ function meetingService(){ | @@ -10,12 +10,34 @@ function meetingService(){ | ||
| 10 | 10 | ||
| 11 | meetingService.prototype.createMeeting = async(meetingInfo) =>{ | 11 | meetingService.prototype.createMeeting = async(meetingInfo) =>{ |
| 12 | try { | 12 | try { |
| 13 | - let backMeeting = meetingModel.create(meetingInfo); | 13 | + let backMeeting = await meetingModel.create(meetingInfo); |
| 14 | return backMeeting | 14 | return backMeeting |
| 15 | } catch (error) { | 15 | } catch (error) { |
| 16 | throw error | 16 | throw error |
| 17 | } | 17 | } |
| 18 | } | 18 | } |
| 19 | +meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =10) =>{ | ||
| 20 | + try { | ||
| 21 | + let backMeeting = await meetingModel.findAll({where:queryData,offset: (page-1)*pageno, limit: pageno}); | ||
| 22 | + let count = await meetingModel.count({where:queryData}) | ||
| 23 | + return {meetingInfo:backMeeting,count:count,page:page,pageno:pageno}; | ||
| 24 | + } catch (error) { | ||
| 25 | + throw error; | ||
| 26 | + } | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +meetingService.prototype.delMeeting = async(meetingId) =>{ | ||
| 30 | + try { | ||
| 31 | + let Meeting = await meetingModel.findOne({where:{id:meetingId}}); | ||
| 32 | + if(!Meeting){ | ||
| 33 | + return {code:11,msg:'课堂不存在'} | ||
| 34 | + } | ||
| 35 | + let backMeeting = await meetingModel.destroy({where:{id:meetingId}}); | ||
| 36 | + return backMeeting | ||
| 37 | + } catch (error) { | ||
| 38 | + throw error; | ||
| 39 | + } | ||
| 40 | +} | ||
| 19 | 41 | ||
| 20 | 42 | ||
| 21 | 43 |
| @@ -43,13 +43,14 @@ userService.prototype.login = async(name,pw) => { | @@ -43,13 +43,14 @@ userService.prototype.login = async(name,pw) => { | ||
| 43 | 43 | ||
| 44 | 44 | ||
| 45 | 45 | ||
| 46 | -userService.prototype.getStu = async(type)=>{ | 46 | +userService.prototype.getStu = async(type,page = 1,pageno =10)=>{ |
| 47 | try { | 47 | try { |
| 48 | + | ||
| 48 | let sql = `SELECT | 49 | let sql = `SELECT |
| 49 | u.*, ug.name groupName | 50 | u.*, ug.name groupName |
| 50 | FROM | 51 | FROM |
| 51 | 3m_user u | 52 | 3m_user u |
| 52 | - LEFT JOIN 3m_user_group ug ON ug.id = u.group_id` | 53 | + LEFT JOIN 3m_user_group ug ON ug.id = u.group_id`; |
| 53 | let User = await sequelize.query(sql); | 54 | let User = await sequelize.query(sql); |
| 54 | return User | 55 | return User |
| 55 | } catch (error) { | 56 | } catch (error) { |
-
请 注册 或 登录 后发表评论