Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 531a0c28dbabde3e9e2ee2598e0448cf323c9b94

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

File was renamed from src/main/java/com/ycl/jxkg/controller/admin/EducationController.java
@@ -18,19 +18,19 @@
import java.util.List;

@RequiredArgsConstructor
@RestController("AdminEducationController")
@RequestMapping(value = "/api/admin/education")
public class EducationController extends BaseApiController {
@RestController("AdminSubjectController")
@RequestMapping(value = "/api/admin/subject")
public class SubjectController extends BaseApiController {

    private final SubjectService subjectService;

    @RequestMapping(value = "/subject/list", method = RequestMethod.POST)
    @RequestMapping(value = "/list", method = RequestMethod.POST)
    public Result<List<Subject>> list() {
        List<Subject> subjects = subjectService.allSubject();
        return Result.ok(subjects);
    }

    @RequestMapping(value = "/subject/page", method = RequestMethod.POST)
    @RequestMapping(value = "/page", method = RequestMethod.POST)
    public Result<PageInfo<SubjectResponseVO>> pageList(@RequestBody SubjectPageRequestVO model) {
        PageInfo<Subject> pageInfo = subjectService.page(model);
        PageInfo<SubjectResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
@@ -41,7 +41,7 @@
        return Result.ok(page);
    }

    @RequestMapping(value = "/subject/edit", method = RequestMethod.POST)
    @RequestMapping(value = "/edit", method = RequestMethod.POST)
    public Result edit(@RequestBody @Valid SubjectEditRequestVO model) {
        Subject subject = new Subject();
        BeanUtils.copyProperties(model, subject);
@@ -53,7 +53,7 @@
        return Result.ok();
    }

    @RequestMapping(value = "/subject/select/{id}", method = RequestMethod.POST)
    @RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
    public Result<SubjectEditRequestVO> select(@PathVariable Integer id) {
        Subject subject = subjectService.getById(id);
        SubjectEditRequestVO vo = new SubjectEditRequestVO();
@@ -61,7 +61,7 @@
        return Result.ok(vo);
    }

    @RequestMapping(value = "/subject/delete/{id}", method = RequestMethod.POST)
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        Subject subject = subjectService.getById(id);
        subjectService.updateById(subject);