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

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java

@@ -10,7 +10,10 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.TeacherOpenCourseHandsOnSimulationTasksDao;
 import com.ibeetl.jlw.entity.TaskTypeParam;
 import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks;
+import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasksFile;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksFileQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksQuery;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
@@ -34,6 +37,8 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
 
     @Autowired private TeacherOpenCourseHandsOnSimulationTasksDao teacherOpenCourseHandsOnSimulationTasksDao;
 
+    @Autowired private TeacherOpenCourseHandsOnSimulationTasksFileService teacherOpenCourseHandsOnSimulationTasksFileService;
+
     public PageQuery<TeacherOpenCourseHandsOnSimulationTasks>queryByCondition(PageQuery query){
         PageQuery ret =  teacherOpenCourseHandsOnSimulationTasksDao.queryByCondition(query);
         queryListAfter(ret.getList());
@@ -92,6 +97,15 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
         TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksQuery.pojo();
         teacherOpenCourseHandsOnSimulationTasksDao.insert(teacherOpenCourseHandsOnSimulationTasks);
         teacherOpenCourseHandsOnSimulationTasksQuery.setTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId());
+        List<TeacherOpenCourseHandsOnSimulationTasksFileQuery> teacherOpenCourseHandsOnSimulationTasksFiles = teacherOpenCourseHandsOnSimulationTasksQuery.getTeacherOpenCourseHandsOnSimulationTasksFile();
+        if (CollectionUtils.isNotEmpty(teacherOpenCourseHandsOnSimulationTasksFiles)) {
+            for (TeacherOpenCourseHandsOnSimulationTasksFileQuery teacherOpenCourseHandsOnSimulationTasksFile : teacherOpenCourseHandsOnSimulationTasksFiles) {
+                teacherOpenCourseHandsOnSimulationTasksFile.setTeacherOpenCourseId(teacherOpenCourseHandsOnSimulationTasks.getTeacherOpenCourseId());
+                teacherOpenCourseHandsOnSimulationTasksFile.setHandsOnId(teacherOpenCourseHandsOnSimulationTasks.getHandsOnId());
+                teacherOpenCourseHandsOnSimulationTasksFile.setTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId());
+                teacherOpenCourseHandsOnSimulationTasksFileService.add(teacherOpenCourseHandsOnSimulationTasksFile);
+            }
+        }
         JsonResult jsonResult = new JsonResult();
         jsonResult.setData(teacherOpenCourseHandsOnSimulationTasks.getTaskId());//自增的ID丢进去
         jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());

web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java

@@ -222,7 +222,7 @@ public class StudentHandsOnTaskReportController{
     }
 
     @PostMapping(MODEL + "/add.do")
-    public JsonResult addStudentHandsOnTaskReport(@Validated(ValidateConfig.ADD.class) StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+    public JsonResult addStudentHandsOnTaskReport(@RequestBody @Validated(ValidateConfig.ADD.class) StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, BindingResult result,@SCoreUser CoreUser coreUser){
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java

@@ -24,10 +24,7 @@ import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -345,7 +342,7 @@ public class TeacherOpenCourseHandsOnController{
 
 
     @PostMapping(MODEL + "/add.do")
-    public JsonResult addTeacherOpenCourseHandsOn(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+    public JsonResult addTeacherOpenCourseHandsOn(@RequestBody  @Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery, BindingResult result, @SCoreUser CoreUser coreUser){
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksController.java

@@ -17,10 +17,7 @@ import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -140,7 +137,9 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
 
     @PostMapping(MODEL + "/add.json")
     @Function("teacherOpenCourseHandsOnSimulationTasks.add")
-    public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+    public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery,
+
+                          BindingResult result,@SCoreUser CoreUser coreUser){
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
@@ -191,19 +190,24 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
         return JsonResult.success();
     }
 
+
     /**
-     *
      * 教师端-添加任务（统一接口）
+     * 任务类型taskType: 1:视频 2:ppt 3:理论 4:实操 5:报告
+     * 考核要求assessmentRequirements: A,B,C
+     * 任务taskList, 用逗号分开存任务的ID
+     * teacherOpenCourseHandsOnSimulationTasksFile 附件集合(存视频ppt和报告模板的文件地址)
      *
-     * TODO 这里需要备注每个任务对应的参数例子。
      *
      * @param teacherOpenCourseHandsOnSimulationTasksQuery
+     * @param teacherOpenCourseHandsOnSimulationTasksFile 附件
      * @param result
      * @param coreUser
      * @return
      */
     @PostMapping(MODEL + "/add.do")
-    public JsonResult addTeacherOpenCourseHandsOnSimulationTasks(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+    public JsonResult addTeacherOpenCourseHandsOnSimulationTasks(@RequestBody @Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery,
+                                                                         BindingResult result,@SCoreUser CoreUser coreUser){
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java

@@ -17,10 +17,7 @@ import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.Date;
@@ -210,7 +207,7 @@ public class TeacherOpenCourseKnowledgePointRelationController{
 
 
     @PostMapping(MODEL + "/add.do")
-    public JsonResult addeacherOpenCourseKnowledgePointRelation(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+    public JsonResult addeacherOpenCourseKnowledgePointRelation(@RequestBody @Validated(ValidateConfig.ADD.class) TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery, BindingResult result, @SCoreUser CoreUser coreUser){
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseHandsOnSimulationTasksQuery.java

@@ -11,6 +11,7 @@ import com.ibeetl.admin.core.web.query.PageParam;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  *教师开课-课程实操任务查询
@@ -50,6 +51,11 @@ public class TeacherOpenCourseHandsOnSimulationTasksQuery extends PageParam {
     @Query(name = "添加时间", display = false)
     private Date addTime;
 
+    /**
+     * 附件列表
+     */
+    private List<TeacherOpenCourseHandsOnSimulationTasksFileQuery> teacherOpenCourseHandsOnSimulationTasksFile;
+
     private String taskIdPlural;
     private String handsOnIdPlural;
     private String teacherOpenCourseIdPlural;
@@ -220,4 +226,12 @@ public class TeacherOpenCourseHandsOnSimulationTasksQuery extends PageParam {
     public void set_given(String _given) {
         this._given = _given;
     }
+
+    public List<TeacherOpenCourseHandsOnSimulationTasksFileQuery> getTeacherOpenCourseHandsOnSimulationTasksFile() {
+        return teacherOpenCourseHandsOnSimulationTasksFile;
+    }
+
+    public void setTeacherOpenCourseHandsOnSimulationTasksFile(List<TeacherOpenCourseHandsOnSimulationTasksFileQuery> teacherOpenCourseHandsOnSimulationTasksFile) {
+        this.teacherOpenCourseHandsOnSimulationTasksFile = teacherOpenCourseHandsOnSimulationTasksFile;
+    }
 }