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