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/SafeTrainingFileController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java b/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java
index 7ca0450..e82c121 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeTrainingFileController.java
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.SafeHiddenFile;
import com.ruoyi.safe.pojo.SafeTrainingFile;
import com.ruoyi.safe.service.SafeTrainingFileService;
-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 org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +26,7 @@
*/
@RestController
@RequestMapping("/safeTrainingFile")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏鍩硅鑰冩牳--闄勪欢")
public class SafeTrainingFileController {
@Resource
@@ -36,8 +38,9 @@
* @param safeHiddenFile
* @return
*/
+ @Log(title = "鏂板鍩硅鏂囦欢", businessType = BusinessType.INSERT)
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public R add(@RequestBody SafeTrainingFile safeHiddenFile) {
return R.ok(safeTrainingFileService.save(safeHiddenFile));
}
@@ -47,8 +50,9 @@
* @param ids
* @return
*/
+ @Log(title = "鍒犻櫎鍩硅鏂囦欢", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public R delSafeHiddenFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -64,7 +68,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R listPage(Page page, SafeTrainingFile safeTrainingFile) {
return R.ok(safeTrainingFileService.page(page, Wrappers.<SafeTrainingFile>lambdaQuery().eq(SafeTrainingFile::getSafeTrainingId,safeTrainingFile.getSafeTrainingId())));
}
--
Gitblit v1.9.3