From ff0a3d10161898470fe3cae6c533d22f2f3ae7e2 Mon Sep 17 00:00:00 2001 From: w Date: Wed, 17 Sep 2025 12:00:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(Knowledge):=20=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/ruoyi/mapper/KnowledgeInfoMapper.java | 7 +++++++ .../java/org/ruoyi/service/IKnowledgeInfoService.java | 2 +- .../src/main/resources/mapper/KnowledgeInfoMapper.xml | 9 +++++++++ .../chat/controller/knowledge/KnowledgeController.java | 6 +++--- .../chat/service/knowledge/KnowledgeInfoServiceImpl.java | 7 ++++--- 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 ruoyi-modules-api/ruoyi-knowledge-api/src/main/resources/mapper/KnowledgeInfoMapper.xml diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/KnowledgeInfoMapper.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/KnowledgeInfoMapper.java index 3068a560..5a8383f2 100644 --- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/KnowledgeInfoMapper.java +++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/mapper/KnowledgeInfoMapper.java @@ -2,6 +2,7 @@ package org.ruoyi.mapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.ruoyi.core.mapper.BaseMapperPlus; import org.ruoyi.domain.KnowledgeInfo; import org.ruoyi.domain.vo.KnowledgeInfoVo; @@ -15,4 +16,10 @@ import org.ruoyi.domain.vo.KnowledgeInfoVo; @Mapper public interface KnowledgeInfoMapper extends BaseMapperPlus { + /** + * 根据kid查询知识库 + * @param kid 知识库id + * @return KnowledgeInfo + */ + KnowledgeInfo selectByKid(@Param("kid") String kid); } diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeInfoService.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeInfoService.java index 754ba7c7..bf7084af 100644 --- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeInfoService.java +++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/service/IKnowledgeInfoService.java @@ -61,7 +61,7 @@ public interface IKnowledgeInfoService { /** * 删除知识库 */ - void removeKnowledge(String id); + void removeKnowledge(String kid); /** * 上传附件 diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/resources/mapper/KnowledgeInfoMapper.xml b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/resources/mapper/KnowledgeInfoMapper.xml new file mode 100644 index 00000000..433cc4df --- /dev/null +++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/resources/mapper/KnowledgeInfoMapper.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/knowledge/KnowledgeController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/knowledge/KnowledgeController.java index a1a72e1a..c5e3e0ff 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/knowledge/KnowledgeController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/knowledge/KnowledgeController.java @@ -100,9 +100,9 @@ public class KnowledgeController extends BaseController { /** * 删除知识库 */ - @PostMapping("/remove/{id}") - public R remove(@PathVariable String id) { - knowledgeInfoService.removeKnowledge(id); + @PostMapping("/remove/{kid}") + public R remove(@PathVariable String kid) { + knowledgeInfoService.removeKnowledge(kid); return R.ok("删除知识库成功!"); } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java index 12ccab1f..37a3cb95 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/knowledge/KnowledgeInfoServiceImpl.java @@ -227,11 +227,12 @@ public class KnowledgeInfoServiceImpl implements IKnowledgeInfoService { @Override @Transactional(rollbackFor = Exception.class) - public void removeKnowledge(String id) { + public void removeKnowledge(String kid) { Map map = new HashMap<>(); - KnowledgeInfo knowledgeInfo = baseMapper.selectById(id); + KnowledgeInfo knowledgeInfo = baseMapper.selectByKid(kid); + check(knowledgeInfo); - map.put("kid", knowledgeInfo.getId()); + map.put("kid", knowledgeInfo.getKid()); // 删除向量数据 vectorStoreService.removeById(String.valueOf(knowledgeInfo.getId()), knowledgeInfo.getVectorModelName()); // 删除附件和知识片段