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/KnowledgeBaseController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..4bbb84b 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -2,27 +2,25 @@
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.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.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 = "鐭ヨ瘑搴撶鐞�")
+@Tag(name = "鐭ヨ瘑搴撶鐞�")
public class KnowledgeBaseController {
- @Autowired
private KnowledgeBaseService knowledgeBaseService;
/**銆�
@@ -39,6 +37,7 @@
* 澧炴坊
* @return
*/
+ @Log(title = "鐭ヨ瘑搴�", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase){
return AjaxResult.success(knowledgeBaseService.save(knowledgeBase));
@@ -47,6 +46,7 @@
* 鏇存柊
* @return
*/
+ @Log(title = "鐭ヨ瘑搴�", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public AjaxResult update(@RequestBody KnowledgeBase knowledgeBase){
return AjaxResult.success(knowledgeBaseService.updateById(knowledgeBase));
@@ -55,13 +55,15 @@
* 鍒犻櫎
* @return
*/
+ @Log(title = "鐭ヨ瘑搴�", businessType = BusinessType.DELETE)
@DeleteMapping("/delete")
public AjaxResult delete(@RequestBody List<Long> ids){
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
}
- @ApiOperation(value = "鐭ヨ瘑搴撶鐞嗗鍑�")
+ @Log(title = "鐭ヨ瘑搴�", businessType = BusinessType.EXPORT)
+ @Operation(summary = "鐭ヨ瘑搴撶鐞嗗鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<KnowledgeBase> accountExpenses = knowledgeBaseService.list();
--
Gitblit v1.9.3