Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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<TeacherOpenCourseHandsOnSimulationTasksFile> 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<TeacherOpenCourseHandsOnSimulationTasksFile> getTeacherOpenCourseHandsOnSimulationTasksFileList() {
+        return teacherOpenCourseHandsOnSimulationTasksFileList;
+    }
+
+    public void setTeacherOpenCourseHandsOnSimulationTasksFileList(List<TeacherOpenCourseHandsOnSimulationTasksFile> teacherOpenCourseHandsOnSimulationTasksFileList) {
+        this.teacherOpenCourseHandsOnSimulationTasksFileList = teacherOpenCourseHandsOnSimulationTasksFileList;
+    }
 }

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);
+        }
+    }
 }

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<TeacherOpenCourseHandsOnSimulationTasksFile> valuesByQuery = teacherOpenCourseHandsOnSimulationTasksFileService.getValuesByQuery(query);
+            if (CollectionUtils.isNotEmpty(valuesByQuery)) {
+                teacherOpenCourseHandsOnSimulationTasks.setTeacherOpenCourseHandsOnSimulationTasksFileList(valuesByQuery);
+                teacherOpenCourseHandsOnSimulationTasks.setTeacherOpenCourseHandsOnSimulationTasksFile(JSONArray.toJSONString(valuesByQuery));
+            }
+            return teacherOpenCourseHandsOnSimulationTasks;
         }else{
             return null;
         }

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
@@ -240,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());
@@ -257,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());

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;
-    }
-
 }