From a7dd93b840bdce4bd0011bc948157f440514a207 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 16:36:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/safe/controller/SafeHazardController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
index 172d491..b433d04 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.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.SafeHazard;
-import com.ruoyi.safe.service.SafeCertificationService;
import com.ruoyi.safe.service.SafeHazardService;
-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,34 +21,34 @@
*/
@RestController
@RequestMapping("/safeHazard")
-@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+@Tag(name = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+@AllArgsConstructor
public class SafeHazardController {
- @Autowired
private SafeHazardService safeHazardService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeHazard safeHazard) {
return R.ok(safeHazardService.pageSafeHazard(page, safeHazard));
}
- @ApiOperation("鏂板鍗遍櫓婧愬彴璐�")
+ @Operation(summary = "鏂板鍗遍櫓婧愬彴璐�")
@PostMapping()
public R add(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.save(safeHazard));
}
- @ApiOperation("淇敼鍗遍櫓婧愬彴璐�")
+ @Operation(summary = "淇敼鍗遍櫓婧愬彴璐�")
@PutMapping ()
public R update(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.updateById(safeHazard));
}
- @ApiOperation("鍒犻櫎鍗遍櫓婧愬彴璐�")
+ @Operation(summary = "鍒犻櫎鍗遍櫓婧愬彴璐�")
@DeleteMapping("/{ids}")
public R delSafeHazard(@RequestBody List<Integer> ids) {
- return R.ok(safeHazardService.removeBatchByIds(ids));
+ return R.ok(safeHazardService.delSafeHazard(ids));
}
}
--
Gitblit v1.9.3