From dbd7fd484b5c7ed00cb895f227645848c3677c08 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java b/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
index 33d32bd..d5d835d 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeContingencyPlanController.java
@@ -2,13 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.safe.pojo.SafeCertification;
 import com.ruoyi.safe.pojo.SafeContingencyPlan;
-import com.ruoyi.safe.service.SafeCertificationService;
 import com.ruoyi.safe.service.SafeContingencyPlanService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -23,31 +21,31 @@
  */
 @RestController
 @RequestMapping("/safeContingencyPlan")
-@Api(tags = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
+@Tag(name = "瀹夊叏鐢熶骇--搴旀�ラ妗堟煡闃�")
+@AllArgsConstructor
 public class SafeContingencyPlanController {
 
-    @Autowired
-    private SafeContingencyPlanService safeContingencyPlanService;
+    private final SafeContingencyPlanService safeContingencyPlanService;
 
     @GetMapping("/page")
-    @ApiOperation("鍒嗛〉鏌ヨ")
+    @Operation(summary = "鍒嗛〉鏌ヨ")
     public R page(Page page, SafeContingencyPlan safeContingencyPlan) {
         return R.ok(safeContingencyPlanService.pageSafeContingencyPlan(page, safeContingencyPlan));
     }
 
-    @ApiOperation("鏂板搴旀�ラ妗堟煡闃�")
+    @Operation(summary = "鏂板搴旀�ラ妗堟煡闃�")
     @PostMapping()
     public R add(@RequestBody SafeContingencyPlan safeContingencyPlan) {
         return R.ok(safeContingencyPlanService.save(safeContingencyPlan));
     }
 
-    @ApiOperation("淇敼搴旀�ラ妗堟煡闃�")
+    @Operation(summary = "淇敼搴旀�ラ妗堟煡闃�")
     @PutMapping ()
     public R update(@RequestBody  SafeContingencyPlan safeContingencyPlan) {
         return R.ok(safeContingencyPlanService.updateById(safeContingencyPlan));
     }
 
-    @ApiOperation("鍒犻櫎搴旀�ラ妗堟煡闃�")
+    @Operation(summary = "鍒犻櫎搴旀�ラ妗堟煡闃�")
     @DeleteMapping("/{ids}")
     public R delSafeCertification(@RequestBody List<Integer> ids) {
         return R.ok(safeContingencyPlanService.removeBatchByIds(ids));

--
Gitblit v1.9.3