From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index b6ede4a..dd12369 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -2,27 +2,24 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.mapper.KnowledgeBaseMapper;
import com.ruoyi.approve.pojo.KnowledgeBase;
-import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.KnowledgeBaseService;
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/knowledgeBase")
@AllArgsConstructor
-@Api(tags = "鐭ヨ瘑搴撶鐞�")
-public class KnowledgeBaseController {
- @Autowired
+@Tag(name = "鐭ヨ瘑搴撶鐞�")
+public class KnowledgeBaseController extends BaseController {
private KnowledgeBaseService knowledgeBaseService;
/**銆�
@@ -30,38 +27,38 @@
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "10") long size, KnowledgeBase knowledgeBase) {
Page page = new Page(current, size);
- return AjaxResult.success(knowledgeBaseService.listpage(page,knowledgeBase));
+ return R.ok(knowledgeBaseService.listpage(page,knowledgeBase));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase){
- return AjaxResult.success(knowledgeBaseService.save(knowledgeBase));
+ public R<?> add(@RequestBody KnowledgeBase knowledgeBase){
+ return R.ok(knowledgeBaseService.save(knowledgeBase));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody KnowledgeBase knowledgeBase){
- return AjaxResult.success(knowledgeBaseService.updateById(knowledgeBase));
+ public R<?> update(@RequestBody KnowledgeBase knowledgeBase){
+ return R.ok(knowledgeBaseService.updateById(knowledgeBase));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(knowledgeBaseService.removeByIds(ids));
}
- @ApiOperation(value = "鐭ヨ瘑搴撶鐞嗗鍑�")
+ @Operation(summary = "鐭ヨ瘑搴撶鐞嗗鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<KnowledgeBase> accountExpenses = knowledgeBaseService.list();
--
Gitblit v1.9.3