From 36b5a2397a94f210d3f3a0723139aa5f2c638003 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 六月 2024 11:54:02 +0800
Subject: [PATCH] 注册完善
---
src/main/java/com/ycl/jxkg/controller/admin/EducationController.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/EducationController.java b/src/main/java/com/ycl/jxkg/controller/admin/EducationController.java
index 51327b9..b4beeab 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/EducationController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/EducationController.java
@@ -2,68 +2,69 @@
import com.ycl.jxkg.base.BaseApiController;
-import com.ycl.jxkg.base.RestResponse;
-import com.ycl.jxkg.domain.Subject;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.utility.PageInfoHelper;
-import com.ycl.jxkg.viewmodel.admin.education.SubjectEditRequestVM;
-import com.ycl.jxkg.viewmodel.admin.education.SubjectPageRequestVM;
-import com.ycl.jxkg.viewmodel.admin.education.SubjectResponseVM;
+import com.ycl.jxkg.utils.PageInfoHelper;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectEditRequestVO;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectResponseVO;
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;
import java.util.List;
+@RequiredArgsConstructor
@RestController("AdminEducationController")
@RequestMapping(value = "/api/admin/education")
public class EducationController extends BaseApiController {
private final SubjectService subjectService;
- @Autowired
- public EducationController(SubjectService subjectService) {
- this.subjectService = subjectService;
- }
-
@RequestMapping(value = "/subject/list", method = RequestMethod.POST)
- public RestResponse<List<Subject>> list() {
+ public Result<List<Subject>> list() {
List<Subject> subjects = subjectService.allSubject();
- return RestResponse.ok(subjects);
+ return Result.ok(subjects);
}
@RequestMapping(value = "/subject/page", method = RequestMethod.POST)
- public RestResponse<PageInfo<SubjectResponseVM>> pageList(@RequestBody SubjectPageRequestVM model) {
+ public Result<PageInfo<SubjectResponseVO>> pageList(@RequestBody SubjectPageRequestVO model) {
PageInfo<Subject> pageInfo = subjectService.page(model);
- PageInfo<SubjectResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> modelMapper.map(e, SubjectResponseVM.class));
- return RestResponse.ok(page);
+ PageInfo<SubjectResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
+ SubjectResponseVO vo = new SubjectResponseVO();
+ BeanUtils.copyProperties(e, vo);
+ return vo;
+ });
+ return Result.ok(page);
}
@RequestMapping(value = "/subject/edit", method = RequestMethod.POST)
- public RestResponse edit(@RequestBody @Valid SubjectEditRequestVM model) {
- Subject subject = modelMapper.map(model, Subject.class);
+ public Result edit(@RequestBody @Valid SubjectEditRequestVO model) {
+ Subject subject = new Subject();
+ BeanUtils.copyProperties(model, subject);
if (model.getId() == null) {
- subject.setDeleted(false);
- subjectService.insertByFilter(subject);
+ subjectService.save(subject);
} else {
- subjectService.updateByIdFilter(subject);
+ subjectService.updateById(subject);
}
- return RestResponse.ok();
+ return Result.ok();
}
@RequestMapping(value = "/subject/select/{id}", method = RequestMethod.POST)
- public RestResponse<SubjectEditRequestVM> select(@PathVariable Integer id) {
- Subject subject = subjectService.selectById(id);
- SubjectEditRequestVM vm = modelMapper.map(subject, SubjectEditRequestVM.class);
- return RestResponse.ok(vm);
+ public Result<SubjectEditRequestVO> select(@PathVariable Integer id) {
+ Subject subject = subjectService.getById(id);
+ SubjectEditRequestVO vo = new SubjectEditRequestVO();
+ BeanUtils.copyProperties(subject, vo);
+ return Result.ok(vo);
}
@RequestMapping(value = "/subject/delete/{id}", method = RequestMethod.POST)
- public RestResponse delete(@PathVariable Integer id) {
- Subject subject = subjectService.selectById(id);
- subject.setDeleted(true);
- subjectService.updateByIdFilter(subject);
- return RestResponse.ok();
+ public Result delete(@PathVariable Integer id) {
+ Subject subject = subjectService.getById(id);
+ subjectService.updateById(subject);
+ return Result.ok();
}
}
--
Gitblit v1.8.0