From 704ea6024361970e2c99f21c12d0f0d88d0f1942 Mon Sep 17 00:00:00 2001 From: zf <1603559716@qq.com> Date: 星期四, 14 九月 2023 16:00:15 +0800 Subject: [PATCH] 违章 --- exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java | 45 ++++++++++++++++++++++----------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java index 47f4115..682b590 100644 --- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java +++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java @@ -2,18 +2,16 @@ -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gkhy.exam.noncoalmine.entity.ViolationRegistration; +import com.gkhy.exam.noncoalmine.model.addForm.ViolationRegistrationAddForm; +import com.gkhy.exam.noncoalmine.model.modForm.ViolationRegistrationModForm; +import com.gkhy.exam.noncoalmine.model.query.ViolationRegistrationQuery; import com.gkhy.exam.noncoalmine.service.ViolationRegistrationService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; -import java.io.Serializable; import java.util.List; /** @@ -39,51 +37,52 @@ */ @GetMapping("page/list") public TableDataInfo listByPage(ViolationRegistrationQuery query) { - return getDataTable(this.violationRegistrationService.listByPage(page, new QueryWrapper<>(violationRegistration))); + startPage(); + return getDataTable(this.violationRegistrationService.listByPage(query)); } /** * 通过主键查询单条数据 * - * @param id 主键 + * @param violationId 主键 * @return 单条数据 */ - @GetMapping("get/{id}") - public AjaxResult selectOne(@PathVariable Long id) { - return success(this.violationRegistrationService.getById(id)); + @GetMapping("get/{violationId}") + public AjaxResult selectOne(@PathVariable Long violationId) { + return success(this.violationRegistrationService.getById(violationId)); } /** * 新增数据 * - * @param violationRegistration 实体对象 + * @param addForm 实体对象 * @return 新增结果 */ - @PostMapping() - public AjaxResult insert(@RequestBody ViolationRegistration violationRegistration) { - return success(this.violationRegistrationService.save(violationRegistration)); + @PostMapping("add") + public AjaxResult add(@Validated @RequestBody ViolationRegistrationAddForm addForm) { + return toAjax(this.violationRegistrationService.add(addForm)); } /** * 修改数据 * - * @param violationRegistration 实体对象 + * @param modForm 实体对象 * @return 修改结果 */ - @PutMapping - public AjaxResult update(@RequestBody ViolationRegistration violationRegistration) { - return success(this.violationRegistrationService.updateById(violationRegistration)); + @PutMapping("mod") + public AjaxResult mod(@Validated @RequestBody ViolationRegistrationModForm modForm) { + return toAjax(this.violationRegistrationService.mod(modForm)); } /** * 删除数据 * - * @param workIds 主键结合 + * @param violationIds 主键结合 * @return 删除结果 */ - @DeleteMapping("/del/batch/{workIds}") - public AjaxResult delete(@PathVariable("workIds") List<Long> workIds) { - return success(this.violationRegistrationService.removeByIds(workIds)); + @DeleteMapping("/del/batch/{violationIds}") + public AjaxResult delete(@PathVariable("violationIds") List<Long> violationIds) { + return success(this.violationRegistrationService.removeByIds(violationIds)); } } -- Gitblit v1.9.2