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

xiangpei

2024-05-31 16d10cef208de048f8b325facd143c54b7be9963

 src/main/java/com/ycl/jxkg/controller/student/EducationController.java

@@ -2,12 +2,13 @@


import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.RestResponse;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.Subject;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.viewmodel.student.education.SubjectEditRequestVM;
import com.ycl.jxkg.viewmodel.student.education.SubjectVM;
import com.ycl.jxkg.vo.student.education.SubjectEditRequestVO;
import com.ycl.jxkg.vo.student.education.SubjectVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -26,22 +27,24 @@
    }

    @RequestMapping(value = "/subject/list", method = RequestMethod.POST)
    public RestResponse<List<SubjectVM>> list() {
    public Result<List<SubjectVO>> list() {
        User user = getCurrentUser();
        List<Subject> subjects = subjectService.getSubjectByLevel(user.getUserLevel());
        List<SubjectVM> subjectVMS = subjects.stream().map(d -> {
            SubjectVM subjectVM = modelMapper.map(d, SubjectVM.class);
            subjectVM.setId(String.valueOf(d.getId()));
            return subjectVM;
        List<SubjectVO> subjectVOS = subjects.stream().map(d -> {
            SubjectVO subjectVO = new SubjectVO();
            BeanUtils.copyProperties(d, subjectVO);
            subjectVO.setId(String.valueOf(d.getId()));
            return subjectVO;
        }).collect(Collectors.toList());
        return RestResponse.ok(subjectVMS);
        return Result.ok(subjectVOS);
    }

    @RequestMapping(value = "/subject/select/{id}", method = RequestMethod.POST)
    public RestResponse<SubjectEditRequestVM> select(@PathVariable Integer id) {
    public Result<SubjectEditRequestVO> select(@PathVariable Integer id) {
        Subject subject = subjectService.selectById(id);
        SubjectEditRequestVM vm = modelMapper.map(subject, SubjectEditRequestVM.class);
        return RestResponse.ok(vm);
        SubjectEditRequestVO vo = new SubjectEditRequestVO();
        BeanUtils.copyProperties(subject, vo);
        return Result.ok(vo);
    }

}