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 32055f84..e94f73ab 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java @@ -100,6 +100,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ List 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); diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java index aca3718d..f2707e49 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskReportController.java +++ b/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{ diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java index 9b0f2741..21829f7c 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; 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{ diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksController.java index d4fee188..23be8694 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksController.java @@ -8,9 +8,7 @@ import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.TaskTypeParam; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks; -import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasksFile; import com.ibeetl.jlw.service.TeacherOpenCourseHandsOnSimulationTasksService; -import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksFileQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksQuery; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -19,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.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import java.util.List; @@ -211,7 +206,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{ * @return */ @PostMapping(MODEL + "/add.do") - public JsonResult addTeacherOpenCourseHandsOnSimulationTasks(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery, + public JsonResult addTeacherOpenCourseHandsOnSimulationTasks(@RequestBody @Validated(ValidateConfig.ADD.class) TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery, BindingResult result,@SCoreUser CoreUser coreUser){ if(result.hasErrors()){ return JsonResult.failMessage(result); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java index ea18e86e..6481d956 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointRelationController.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; 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{