重构：lombok、vo、mybatisplus、beanutils、包名

xiangpei

2024-05-31 16d10cef208de048f8b325facd143c54b7be9963

 src/main/java/com/ycl/jxkg/controller/admin/TaskController.java

@@ -2,15 +2,16 @@


import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.RestResponse;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.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.vo.admin.task.TaskPageRequestVO;
import com.ycl.jxkg.vo.admin.task.TaskPageResponseVO;
import com.ycl.jxkg.vo.admin.task.TaskRequestVO;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -28,36 +29,37 @@
    }

    @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) {
    public Result delete(@PathVariable Integer id) {
        TaskExam taskExam = taskExamService.selectById(id);
        taskExam.setDeleted(true);
        taskExamService.updateByIdFilter(taskExam);
        return RestResponse.ok();
        return Result.ok();
    }
}