From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index dd12369..3ebb782 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -5,8 +5,7 @@
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.approve.service.KnowledgeBaseService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -19,7 +18,7 @@
@RequestMapping("/knowledgeBase")
@AllArgsConstructor
@Tag(name = "鐭ヨ瘑搴撶鐞�")
-public class KnowledgeBaseController extends BaseController {
+public class KnowledgeBaseController {
private KnowledgeBaseService knowledgeBaseService;
/**銆�
@@ -27,35 +26,35 @@
* @return
*/
@GetMapping("/getList")
- public R<?> getList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "10") long size, KnowledgeBase knowledgeBase) {
Page page = new Page(current, size);
- return R.ok(knowledgeBaseService.listpage(page,knowledgeBase));
+ return AjaxResult.success(knowledgeBaseService.listpage(page,knowledgeBase));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody KnowledgeBase knowledgeBase){
- return R.ok(knowledgeBaseService.save(knowledgeBase));
+ public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase){
+ return AjaxResult.success(knowledgeBaseService.save(knowledgeBase));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody KnowledgeBase knowledgeBase){
- return R.ok(knowledgeBaseService.updateById(knowledgeBase));
+ public AjaxResult update(@RequestBody KnowledgeBase knowledgeBase){
+ return AjaxResult.success(knowledgeBaseService.updateById(knowledgeBase));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(knowledgeBaseService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
}
@Operation(summary = "鐭ヨ瘑搴撶鐞嗗鍑�")
--
Gitblit v1.9.3