From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java b/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
index 9c4a1a3..49e3e1d 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
@@ -2,18 +2,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.pojo.ProductWorkOrderFile;
-import com.ruoyi.production.service.ProductWorkOrderFileService;
import com.ruoyi.safe.pojo.SafeCertificationFile;
import com.ruoyi.safe.service.SafeCertificationFileService;
-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 jakarta.annotation.Resource;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
import java.util.List;
/**
@@ -26,7 +23,7 @@
*/
@RestController
@RequestMapping("/safeCertificationFile")
-@Api(tags = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�--闄勪欢")
+@Tag(name = "瀹夊叏鐢熶骇--瀹夊叏瑙勭▼涓庤祫璐ㄧ鐞�--闄勪欢")
public class SafeCertificationFileController {
@Resource
@@ -39,7 +36,7 @@
* @return
*/
@PostMapping("/add")
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public R add(@RequestBody SafeCertificationFile safeCertificationFile) {
return R.ok(safeCertificationFileService.save(safeCertificationFile));
}
@@ -50,8 +47,8 @@
* @return
*/
@DeleteMapping("/del")
- @ApiOperation("鍒犻櫎")
- public R delQualityUnqualified(@RequestBody List<Integer> ids) {
+ @Operation(summary = "鍒犻櫎")
+ public R delSafeCertificationFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
@@ -66,7 +63,7 @@
* @return
*/
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public R listPage(Page page, SafeCertificationFile safeCertificationFile) {
return R.ok(safeCertificationFileService.page(page, Wrappers.<SafeCertificationFile>lambdaQuery().eq(SafeCertificationFile::getSafeCertificationId,safeCertificationFile.getSafeCertificationId())));
}
--
Gitblit v1.9.3