From 247cb86585a1d1894596ed18a6c93efecb992946 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 14 十一月 2024 10:34:27 +0800
Subject: [PATCH] 班级成绩图表分析
---
src/main/java/com/ycl/jxkg/controller/admin/TaskController.java | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/TaskController.java b/src/main/java/com/ycl/jxkg/controller/admin/TaskController.java
index 781a711..a8a38e4 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/TaskController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/TaskController.java
@@ -2,62 +2,59 @@
import com.ycl.jxkg.base.BaseApiController;
-import com.ycl.jxkg.base.RestResponse;
-import com.ycl.jxkg.domain.TaskExam;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.entity.TaskExam;
import com.ycl.jxkg.service.TaskExamService;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.PageInfoHelper;
-import com.ycl.jxkg.viewmodel.admin.task.TaskPageRequestVM;
-import com.ycl.jxkg.viewmodel.admin.task.TaskPageResponseVM;
-import com.ycl.jxkg.viewmodel.admin.task.TaskRequestVM;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.PageInfoHelper;
+import com.ycl.jxkg.domain.vo.admin.task.TaskPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.task.TaskPageResponseVO;
+import com.ycl.jxkg.domain.vo.admin.task.TaskRequestVO;
import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+@RequiredArgsConstructor
@RestController("AdminTaskController")
@RequestMapping(value = "/api/admin/task")
public class TaskController extends BaseApiController {
private final TaskExamService taskExamService;
- @Autowired
- public TaskController(TaskExamService taskExamService) {
- this.taskExamService = taskExamService;
- }
-
@RequestMapping(value = "/page", method = RequestMethod.POST)
- public RestResponse<PageInfo<TaskPageResponseVM>> pageList(@RequestBody TaskPageRequestVM model) {
+ public Result<PageInfo<TaskPageResponseVO>> pageList(@RequestBody TaskPageRequestVO model) {
PageInfo<TaskExam> pageInfo = taskExamService.page(model);
- PageInfo<TaskPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, m -> {
- TaskPageResponseVM vm = modelMapper.map(m, TaskPageResponseVM.class);
- vm.setCreateTime(DateTimeUtil.dateFormat(m.getCreateTime()));
- return vm;
+ PageInfo<TaskPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, m -> {
+ TaskPageResponseVO vo = new TaskPageResponseVO();
+ BeanUtils.copyProperties(m, vo);
+ vo.setCreateTime(DateTimeUtil.dateFormat(m.getCreateTime()));
+ return vo;
});
- return RestResponse.ok(page);
+ return Result.ok(page);
}
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public RestResponse edit(@RequestBody @Valid TaskRequestVM model) {
+ public Result edit(@RequestBody @Valid TaskRequestVO model) {
taskExamService.edit(model, getCurrentUser());
- TaskRequestVM vm = taskExamService.taskExamToVM(model.getId());
- return RestResponse.ok(vm);
+ TaskRequestVO vm = taskExamService.taskExamToVM(model.getId());
+ return Result.ok(vm);
}
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
- public RestResponse<TaskRequestVM> select(@PathVariable Integer id) {
- TaskRequestVM vm = taskExamService.taskExamToVM(id);
- return RestResponse.ok(vm);
+ public Result<TaskRequestVO> select(@PathVariable Integer id) {
+ TaskRequestVO vm = taskExamService.taskExamToVM(id);
+ return Result.ok(vm);
}
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
- public RestResponse delete(@PathVariable Integer id) {
- TaskExam taskExam = taskExamService.selectById(id);
- taskExam.setDeleted(true);
- taskExamService.updateByIdFilter(taskExam);
- return RestResponse.ok();
+ public Result delete(@PathVariable Integer id) {
+ TaskExam taskExam = taskExamService.getById(id);
+ taskExamService.updateById(taskExam);
+ return Result.ok();
}
}
--
Gitblit v1.8.0