From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
index 82b4192..7743769 100644
--- a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
+++ b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
@@ -5,9 +5,11 @@
import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.RpaProcessAutomationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
-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.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +19,7 @@
@RestController
@RequestMapping("/rpaProcessAutomation")
@AllArgsConstructor
-@Api(tags = "RPA娴佺▼鑷姩鍖�")
+@Tag(name = "RPA娴佺▼鑷姩鍖�")
public class RpaProcessAutomationController {
private RpaProcessAutomationService rpaProcessAutomationService;
/**銆�
@@ -34,6 +36,7 @@
* 澧炴坊
* @return
*/
+ @Log(title = "RPA娴佺▼鑷姩鍖�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
return AjaxResult.success(rpaProcessAutomationService.save(rpaProcessAutomation));
@@ -42,6 +45,7 @@
* 鏇存柊
* @return
*/
+ @Log(title = "RPA娴佺▼鑷姩鍖�", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public AjaxResult update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
return AjaxResult.success(rpaProcessAutomationService.updateById(rpaProcessAutomation));
@@ -50,13 +54,15 @@
* 鍒犻櫎
* @return
*/
+ @Log(title = "RPA娴佺▼鑷姩鍖�", businessType = BusinessType.DELETE)
@DeleteMapping("/delete")
public AjaxResult delete(@RequestBody List<Long> ids){
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(rpaProcessAutomationService.removeByIds(ids));
}
- @ApiOperation(value = "RPA娴佺▼鑷姩鍖栧鍑�")
+ @Log(title = "RPA娴佺▼鑷姩鍖�", businessType = BusinessType.EXPORT)
+ @Operation(summary = "RPA娴佺▼鑷姩鍖栧鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<RpaProcessAutomation> accountExpenses = rpaProcessAutomationService.list();
--
Gitblit v1.9.3