From 8208e8137a3d950152d358ccd2ab0a8dc08cf4de Mon Sep 17 00:00:00 2001 From: zf <1603559716@qq.com> Date: 星期四, 14 九月 2023 17:13:20 +0800 Subject: [PATCH] 机构&&考点 --- exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ExamSiteController.java | 70 +++++++++++++++++------------------ 1 files changed, 34 insertions(+), 36 deletions(-) diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ExamSiteController.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ExamSiteController.java index 1dbcafd..80ef674 100644 --- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ExamSiteController.java +++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ExamSiteController.java @@ -1,17 +1,15 @@ -package controller; +package com.gkhy.exam.noncoalmine.controller; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.api.ApiController; -import com.baomidou.mybatisplus.extension.api.R; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import .entity.ExamSite; -import .service.ExamSiteService; +import com.gkhy.exam.noncoalmine.model.addForm.ExamSiteAddForm; +import com.gkhy.exam.noncoalmine.model.modForm.ExamSiteModForm; +import com.gkhy.exam.noncoalmine.model.query.ExamSiteQuery; +import com.gkhy.exam.noncoalmine.service.ExamSiteService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.io.Serializable; import java.util.List; /** @@ -21,68 +19,68 @@ * @since 2023-09-13 16:11:04 */ @RestController -@RequestMapping("examSite") -public class ExamSiteController extends ApiController { +@RequestMapping("exam/site") +public class ExamSiteController extends BaseController { /** * 服务对象 */ - @Resource + @Autowired private ExamSiteService examSiteService; /** * 分页查询所有数据 * - * @param page 分页对象 - * @param examSite 查询实体 + * @param query 查询实体 * @return 所有数据 */ - @GetMapping - public R selectAll(Page<ExamSite> page, ExamSite examSite) { - return success(this.examSiteService.page(page, new QueryWrapper<>(examSite))); + @GetMapping("page/list") + public TableDataInfo listByPage(ExamSiteQuery query) { + startPage(); + return getDataTable(this.examSiteService.listByPage(query)); } /** * 通过主键查询单条数据 * - * @param id 主键 + * @param siteId 主键 * @return 单条数据 */ - @GetMapping("{id}") - public R selectOne(@PathVariable Serializable id) { - return success(this.examSiteService.getById(id)); + @GetMapping("{get/siteId}") + public AjaxResult selectOne(@PathVariable Long siteId) { + return success(this.examSiteService.getById(siteId)); } /** * 新增数据 * - * @param examSite 实体对象 + * @param addForm 实体对象 * @return 新增结果 */ - @PostMapping - public R insert(@RequestBody ExamSite examSite) { - return success(this.examSiteService.save(examSite)); + @PostMapping("add") + public AjaxResult add(@Validated @RequestBody ExamSiteAddForm addForm) { + return toAjax(this.examSiteService.add(addForm)); } /** * 修改数据 * - * @param examSite 实体对象 + * @param modForm 实体对象 * @return 修改结果 */ - @PutMapping - public R update(@RequestBody ExamSite examSite) { - return success(this.examSiteService.updateById(examSite)); + @PutMapping("mod") + public AjaxResult mod(@Validated @RequestBody ExamSiteModForm modForm) { + return toAjax(this.examSiteService.mod(modForm)); } /** * 删除数据 * - * @param idList 主键结合 + * @param siteIds 主键结合 * @return 删除结果 */ - @DeleteMapping - public R delete(@RequestParam("idList") List<Long> idList) { - return success(this.examSiteService.removeByIds(idList)); + @DeleteMapping("/del/batch/{siteIds}") + public AjaxResult delete(@PathVariable("siteIds") List<Long> siteIds) { + return toAjax(this.examSiteService.removeByIds(siteIds)); } } -- Gitblit v1.9.2