From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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..1e26526 100644
--- a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
+++ b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
@@ -5,9 +5,10 @@
import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.RpaProcessAutomationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+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,46 +18,46 @@
@RestController
@RequestMapping("/rpaProcessAutomation")
@AllArgsConstructor
-@Api(tags = "RPA娴佺▼鑷姩鍖�")
-public class RpaProcessAutomationController {
+@Tag(name = "RPA娴佺▼鑷姩鍖�")
+public class RpaProcessAutomationController extends BaseController {
private RpaProcessAutomationService rpaProcessAutomationService;
/**銆�
* 鑾峰彇鍒楄〃
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "100") long size, RpaProcessAutomation rpaProcessAutomation) {
Page page = new Page(current, size);
- return AjaxResult.success(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
+ return R.ok(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return AjaxResult.success(rpaProcessAutomationService.save(rpaProcessAutomation));
+ public R<?> add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return R.ok(rpaProcessAutomationService.save(rpaProcessAutomation));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return AjaxResult.success(rpaProcessAutomationService.updateById(rpaProcessAutomation));
+ public R<?> update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return R.ok(rpaProcessAutomationService.updateById(rpaProcessAutomation));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(rpaProcessAutomationService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(rpaProcessAutomationService.removeByIds(ids));
}
- @ApiOperation(value = "RPA娴佺▼鑷姩鍖栧鍑�")
+ @Operation(summary = "RPA娴佺▼鑷姩鍖栧鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<RpaProcessAutomation> accountExpenses = rpaProcessAutomationService.list();
--
Gitblit v1.9.3