From 1614615fc9319b8626eb028598b894311992c033 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期一, 25 九月 2023 15:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 682b590..1e422db 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
@@ -9,6 +9,10 @@
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;
@@ -20,6 +24,7 @@
* @author makejava
* @since 2023-09-11 16:59:05
*/
+@Api(tags = "违规登记接口")
@RestController
@RequestMapping("violation/registration")
public class ViolationRegistrationController extends BaseController {
@@ -35,6 +40,15 @@
* @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"),
+ })
@GetMapping("page/list")
public TableDataInfo listByPage(ViolationRegistrationQuery query) {
startPage();
@@ -47,6 +61,7 @@
* @param violationId 主键
* @return 单条数据
*/
+ @ApiOperation(value = "通过主键查询单条数据")
@GetMapping("get/{violationId}")
public AjaxResult selectOne(@PathVariable Long violationId) {
return success(this.violationRegistrationService.getById(violationId));
@@ -58,6 +73,7 @@
* @param addForm 实体对象
* @return 新增结果
*/
+ @ApiOperation(value = "新增数据")
@PostMapping("add")
public AjaxResult add(@Validated @RequestBody ViolationRegistrationAddForm addForm) {
return toAjax(this.violationRegistrationService.add(addForm));
@@ -69,7 +85,8 @@
* @param modForm 实体对象
* @return 修改结果
*/
- @PutMapping("mod")
+ @ApiOperation(value = "修改数据")
+ @PostMapping("mod")
public AjaxResult mod(@Validated @RequestBody ViolationRegistrationModForm modForm) {
return toAjax(this.violationRegistrationService.mod(modForm));
}
@@ -80,9 +97,11 @@
* @param violationIds 主键结合
* @return 删除结果
*/
+ @ApiOperation(value = "删除数据")
@DeleteMapping("/del/batch/{violationIds}")
- public AjaxResult delete(@PathVariable("violationIds") List<Long> violationIds) {
- return success(this.violationRegistrationService.removeByIds(violationIds));
+ public AjaxResult delBatch(@PathVariable("violationIds") List<Long> violationIds) {
+ this.violationRegistrationService.delBatch(violationIds);
+ return success();
}
}
--
Gitblit v1.9.2