From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/safe/controller/SafeHazardController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
index 598d864..493ff73 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
@@ -1,11 +1,13 @@
package com.ruoyi.safe.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.service.SafeHazardService;
-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.web.bind.annotation.*;
@@ -21,31 +23,34 @@
*/
@RestController
@RequestMapping("/safeHazard")
-@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
+@Tag(name = "瀹夊叏鐢熶骇--鍗遍櫓婧愬彴璐�")
@AllArgsConstructor
public class SafeHazardController {
private SafeHazardService safeHazardService;
@GetMapping("/page")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R page(Page page, SafeHazard safeHazard) {
return R.ok(safeHazardService.pageSafeHazard(page, safeHazard));
}
- @ApiOperation("鏂板鍗遍櫓婧愬彴璐�")
+ @Log(title = "鏂板鍗遍櫓婧�", businessType = BusinessType.INSERT)
+ @Operation(summary = "鏂板鍗遍櫓婧愬彴璐�")
@PostMapping()
public R add(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.save(safeHazard));
}
- @ApiOperation("淇敼鍗遍櫓婧愬彴璐�")
+ @Log(title = "淇敼鍗遍櫓婧�", businessType = BusinessType.UPDATE)
+ @Operation(summary = "淇敼鍗遍櫓婧愬彴璐�")
@PutMapping ()
public R update(@RequestBody SafeHazard safeHazard) {
return R.ok(safeHazardService.updateById(safeHazard));
}
- @ApiOperation("鍒犻櫎鍗遍櫓婧愬彴璐�")
+ @Log(title = "鍒犻櫎鍗遍櫓婧�", businessType = BusinessType.DELETE)
+ @Operation(summary = "鍒犻櫎鍗遍櫓婧愬彴璐�")
@DeleteMapping("/{ids}")
public R delSafeHazard(@RequestBody List<Integer> ids) {
return R.ok(safeHazardService.delSafeHazard(ids));
--
Gitblit v1.9.3