From 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 19:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java b/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
index 88a61c4..bdedc46 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeCertificationController.java
@@ -1,19 +1,15 @@
package com.ruoyi.safe.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProcessRouteDto;
-import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.safe.pojo.SafeCertification;
import com.ruoyi.safe.service.SafeCertificationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
/**
@@ -26,31 +22,33 @@
*/
@RestController
@RequestMapping("/safeCertification")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+@AllArgsConstructor
public class SafeCertificationController {
- @Autowired
private SafeCertificationService safeCertificationService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page<SafeCertification> page, SafeCertification safeCertification) {
return R.ok(safeCertificationService.pageSafeCertification(page, safeCertification));
}
- @ApiOperation("鏂板瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+ @Operation(summary = "鏂板瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
@PostMapping()
public R add(@RequestBody SafeCertification safeCertification) {
return R.ok(safeCertificationService.save(safeCertification));
}
- @ApiOperation("淇敼瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+
+ @Operation(summary = "淇敼瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
@PutMapping ()
public R update(@RequestBody SafeCertification safeCertification) {
return R.ok(safeCertificationService.updateById(safeCertification));
}
- @ApiOperation("鍒犻櫎瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
+
+ @Operation(summary = "鍒犻櫎瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�")
@DeleteMapping("/{ids}")
- public R delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public R delSafeCertification(@RequestBody List<Integer> ids) {
return R.ok(safeCertificationService.removeBatchByIds(ids));
}
--
Gitblit v1.9.3