|
|
@@ -31,9 +31,8 @@ public class EducationController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/subject/list", method = RequestMethod.POST)
|
|
|
- public RestResponse<List<Subject>> list() {
|
|
|
- List<Subject> subjects = subjectService.allSubject();
|
|
|
- return RestResponse.ok(subjects);
|
|
|
+ public CommonResult<List<Subject>> list() {
|
|
|
+ return CommonResult.data(subjectService.allSubject());
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/subject/page", method = RequestMethod.POST)
|
|
|
@@ -42,7 +41,7 @@ public class EducationController extends BaseApiController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/subject/edit", method = RequestMethod.POST)
|
|
|
- public RestResponse edit(@RequestBody @Valid SubjectEditRequestVM model) {
|
|
|
+ public CommonResult edit(@RequestBody @Valid SubjectEditRequestVM model) {
|
|
|
Subject subject = modelMapper.map(model, Subject.class);
|
|
|
if (model.getId() == null) {
|
|
|
subject.setDeleted(false);
|
|
|
@@ -50,21 +49,19 @@ public class EducationController extends BaseApiController {
|
|
|
} else {
|
|
|
subjectService.updateByIdFilter(subject);
|
|
|
}
|
|
|
- return RestResponse.ok();
|
|
|
+ return CommonResult.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 CommonResult<Subject> select(@PathVariable Integer id) {
|
|
|
+ return CommonResult.data(subjectService.selectById(id));
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/subject/delete/{id}", method = RequestMethod.POST)
|
|
|
- public RestResponse delete(@PathVariable Integer id) {
|
|
|
+ public CommonResult delete(@PathVariable Integer id) {
|
|
|
Subject subject = subjectService.selectById(id);
|
|
|
subject.setDeleted(true);
|
|
|
subjectService.updateByIdFilter(subject);
|
|
|
- return RestResponse.ok();
|
|
|
+ return CommonResult.ok();
|
|
|
}
|
|
|
}
|