From 93b5762d929faa44ccde90f2191a968d91b28da1 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 9 Nov 2022 14:46:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E5=A4=9A=E4=B8=AA=E7=8F=AD=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/TeacherOpenCourseScheduleSession.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index 99e0ad1a..3429b8e2 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -1,6 +1,7 @@ package com.ibeetl.jlw.entity; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONUtil; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.DictDeep; import com.ibeetl.admin.core.entity.BaseEntity; @@ -100,6 +101,13 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ private String teacherOpenCourseScheduleSessionClassList; + + // 判断是否是多个教室 + @UpdateIgnore + @InsertIgnore + + private boolean teacherOpenCourseScheduleSessionClassIsMultiple; + //组织ID private Long orgId ; @@ -155,4 +163,12 @@ public class TeacherOpenCourseScheduleSession extends BaseEntity{ } } + + public void setTeacherOpenCourseScheduleSessionClassList(String teacherOpenCourseScheduleSessionClassList) { + this.teacherOpenCourseScheduleSessionClassList = teacherOpenCourseScheduleSessionClassList; + // 不为空，且字符串是JSON数组 + if(ObjectUtil.isNotEmpty(teacherOpenCourseScheduleSessionClassList) && JSONUtil.isTypeJSONArray(teacherOpenCourseScheduleSessionClassList)) { + this.setTeacherOpenCourseScheduleSessionClassIsMultiple(JSONUtil.parseArray(teacherOpenCourseScheduleSessionClassList).size() > 1); + } + } } From e3ba7ed88332d02923114b62538d38aa04d63384 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 9 Nov 2022 14:56:03 +0800 Subject: [PATCH 2/4] 1 --- .../jlw/web/TeacherOpenCourseScheduleSessionController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java index d1875c07..2b1b004a 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java @@ -206,6 +206,12 @@ public class TeacherOpenCourseScheduleSessionController{ } + /** + * 学校管理端-查看排课配置 + * + * @param teacherOpenCourseScheduleSessionId + * @return + */ @GetMapping(MODEL + "/view.json") @Function("teacherOpenCourseScheduleSession.query") @ResponseBody From 1fbf36a446f008f457493dfa06dae8eedd62d0c6 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Wed, 9 Nov 2022 14:57:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E6=93=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B8=A6=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...acherOpenCourseHandsOnSimulationTasks.java | 22 +++++++++++++++++++ ...enCourseHandsOnSimulationTasksService.java | 12 ++++++++-- .../com/ibeetl/jlw/web/WeiXinController.java | 8 ++----- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java index 18a7291e..6afb9a79 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java @@ -3,10 +3,12 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksFile; import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; import java.util.Date; +import java.util.List; /* * 教师开课-课程实操-实训任务 @@ -81,6 +83,12 @@ public class TeacherOpenCourseHandsOnSimulationTasks extends BaseEntity{ private Date addTime ; + /** + * 附件列表 + */ + private String teacherOpenCourseHandsOnSimulationTasksFile; + private List teacherOpenCourseHandsOnSimulationTasksFileList; + private HandsOnTaskProblemVO handsOnTaskProblemVo; public HandsOnTaskProblemVO getHandsOnTaskProblemVo() { @@ -302,5 +310,19 @@ public class TeacherOpenCourseHandsOnSimulationTasks extends BaseEntity{ this.addTime = addTime; } + public String getTeacherOpenCourseHandsOnSimulationTasksFile() { + return teacherOpenCourseHandsOnSimulationTasksFile; + } + + public void setTeacherOpenCourseHandsOnSimulationTasksFile(String teacherOpenCourseHandsOnSimulationTasksFile) { + this.teacherOpenCourseHandsOnSimulationTasksFile = teacherOpenCourseHandsOnSimulationTasksFile; + } + public List getTeacherOpenCourseHandsOnSimulationTasksFileList() { + return teacherOpenCourseHandsOnSimulationTasksFileList; + } + + public void setTeacherOpenCourseHandsOnSimulationTasksFileList(List teacherOpenCourseHandsOnSimulationTasksFileList) { + this.teacherOpenCourseHandsOnSimulationTasksFileList = teacherOpenCourseHandsOnSimulationTasksFileList; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java index 32695cb6..dd24cb3c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java @@ -195,8 +195,16 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ HandsOnTaskProblemVO objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList()); teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem); } - - return list.get(0); + TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = list.get(0); + Long taskId = teacherOpenCourseHandsOnSimulationTasks.getTaskId(); + TeacherOpenCourseHandsOnSimulationTasksFileQuery query = new TeacherOpenCourseHandsOnSimulationTasksFileQuery(); + query.setTaskId(taskId); + List valuesByQuery = teacherOpenCourseHandsOnSimulationTasksFileService.getValuesByQuery(query); + if (CollectionUtils.isNotEmpty(valuesByQuery)) { + teacherOpenCourseHandsOnSimulationTasks.setTeacherOpenCourseHandsOnSimulationTasksFileList(valuesByQuery); + teacherOpenCourseHandsOnSimulationTasks.setTeacherOpenCourseHandsOnSimulationTasksFile(JSONArray.toJSONString(valuesByQuery)); + } + return teacherOpenCourseHandsOnSimulationTasks; }else{ return null; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/WeiXinController.java b/web/src/main/java/com/ibeetl/jlw/web/WeiXinController.java index 79fa3b87..501ff33c 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/WeiXinController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/WeiXinController.java @@ -72,7 +72,7 @@ public class WeiXinController { if (encType == null) { // 明文传输的消息 WxMpXmlMessage inMessage = WxMpXmlMessage.fromXml(requestBody); - WxMpXmlOutMessage outMessage = this.route(inMessage); + WxMpXmlOutMessage outMessage = this.weixinService.route(inMessage); if (outMessage == null) { WxMpXmlMessage wxMpXmlMessage = new WxMpXmlMessage(); return ""; @@ -84,7 +84,7 @@ public class WeiXinController { WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody, weixinService.getWxMpConfigStorage(), timestamp, nonce, msgSignature); log.debug("\n消息解密后内容为：\n"+inMessage.toString()); - WxMpXmlOutMessage outMessage = this.route(inMessage); + WxMpXmlOutMessage outMessage = this.weixinService.route(inMessage); if (outMessage == null) { return ""; } @@ -95,8 +95,4 @@ public class WeiXinController { return out; } - private WxMpXmlOutMessage route(WxMpXmlMessage inMessage) { - return null; - } - } \ No newline at end of file From c27ad495128645fad6ede010dbd976f4e95d3fe7 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 9 Nov 2022 14:57:37 +0800 Subject: [PATCH 4/4] 1 --- .../jlw/web/TeacherOpenCourseScheduleSessionController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java index 2b1b004a..0d6bf8ea 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java @@ -246,7 +246,8 @@ public class TeacherOpenCourseScheduleSessionController{ @PostMapping(MODEL + "/addSession.json") @Function("teacherOpenCourseScheduleSession.add") @ResponseBody - public JsonResult addSession(@RequestBody TeacherOpenCourseScheduleSessionOptions teacherOpenCourseScheduleSessionOptions, + public JsonResult addSession(@Validated(ValidateConfig.ADD.class) @RequestBody + TeacherOpenCourseScheduleSessionOptions teacherOpenCourseScheduleSessionOptions, @SCoreUser CoreUser coreUser) { teacherOpenCourseScheduleSessionOptions.setUserId(coreUser.getId()); teacherOpenCourseScheduleSessionOptions.setOrgId(coreUser.getOrgId()); @@ -263,7 +264,8 @@ public class TeacherOpenCourseScheduleSessionController{ @PostMapping(MODEL + "/editSession.json") @Function("teacherOpenCourseScheduleSession.edit") @ResponseBody - public JsonResult editSession(@RequestBody TeacherOpenCourseScheduleSessionOptions teacherOpenCourseScheduleSessionOptions, + public JsonResult editSession(@Validated(ValidateConfig.UPDATE.class) @RequestBody + TeacherOpenCourseScheduleSessionOptions teacherOpenCourseScheduleSessionOptions, @SCoreUser CoreUser coreUser) { teacherOpenCourseScheduleSessionOptions.setUserId(coreUser.getId()); teacherOpenCourseScheduleSessionOptions.setOrgId(coreUser.getOrgId());