From 70dcf4e610a0ec5fd6ca2c3daf9edf4957b30529 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 25 二月 2025 16:34:46 +0800
Subject: [PATCH] 考试制证修改
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 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..f170694 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
@@ -1,19 +1,19 @@
package com.gkhy.exam.noncoalmine.controller;
-
-
-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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
import javax.annotation.Resource;
-import java.io.Serializable;
import java.util.List;
/**
@@ -22,6 +22,7 @@
* @author makejava
* @since 2023-09-11 16:59:05
*/
+@Api(tags = "违规登记接口")
@RestController
@RequestMapping("violation/registration")
public class ViolationRegistrationController extends BaseController {
@@ -37,53 +38,69 @@
* @param query 查询实体
* @return 所有数据
*/
+ @ApiOperation(value = "分页查询")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "pageNum", dataTypeClass = String.class,value = "页码",required = true),
+ @ApiImplicitParam(name = "pageSize", dataTypeClass = String.class,value = "页数",required = true),
+ @ApiImplicitParam(name = "dept", dataTypeClass = String.class,value = "部门名"),
+ @ApiImplicitParam(name = "name", dataTypeClass = String.class,value = "姓名"),
+ @ApiImplicitParam(name = "idCard", dataTypeClass = String.class,value = "身份证号"),
+ @ApiImplicitParam(name = "operateTypeId", dataTypeClass = Long.class,value = "作业类型Id"),
+ @ApiImplicitParam(name = "isCm", dataTypeClass = Long.class,value = "是否为煤矿：0为非，1是"),
+ })
@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));
+ @ApiOperation(value = "通过主键查询单条数据")
+ @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));
+ @ApiOperation(value = "新增数据")
+ @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));
+ @ApiOperation(value = "修改数据")
+ @PostMapping("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));
+ @ApiOperation(value = "删除数据")
+ @DeleteMapping("/del/batch/{violationIds}")
+ public AjaxResult delBatch(@PathVariable("violationIds") List<Long> violationIds) {
+ this.violationRegistrationService.delBatch(violationIds);
+ return success();
}
}
--
Gitblit v1.9.2