From d5c789bea1cc151ed95d3cd7b957f09ee8c29741 Mon Sep 17 00:00:00 2001 From: Liuyang <2746366019@qq.com> Date: Fri, 14 Mar 2025 10:14:21 +0800 Subject: [PATCH] =?UTF-8?q?fix(llm):=20=E4=BF=AE=E5=A4=8D=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9F=A5=E8=AF=86=E5=BA=93=E6=97=B6=E6=9C=AA=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=AF=B9=E5=BA=94=E6=96=87=E6=A1=A3=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98-=20=E6=9B=B4=E6=96=B0=20KnowledgeBaseServiceImpl=20?= =?UTF-8?q?=E4=B8=AD=E5=88=A0=E9=99=A4=E7=9F=A5=E8=AF=86=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20-=20=E4=BF=AE=E6=94=B9=20KnowledgeDocument?= =?UTF-8?q?sMapper=20=E4=B8=AD=E8=8E=B7=E5=8F=96=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=96=87=E6=A1=A3=20ID=20=E7=9A=84=20SQL=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20-=20=E4=BF=AE=E6=AD=A3=20RagHttpService=20=E4=B8=AD?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9F=A5=E8=AF=86=E6=96=87=E6=A1=A3=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/knowledgedocuments/KnowledgeDocumentsMapper.java | 4 ++-- .../yudao/module/llm/service/http/RagHttpService.java | 2 +- .../llm/service/knowledgebase/KnowledgeBaseServiceImpl.java | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/knowledgedocuments/KnowledgeDocumentsMapper.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/knowledgedocuments/KnowledgeDocumentsMapper.java index 78367b746..5527be93d 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/knowledgedocuments/KnowledgeDocumentsMapper.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/knowledgedocuments/KnowledgeDocumentsMapper.java @@ -28,7 +28,7 @@ public interface KnowledgeDocumentsMapper extends BaseMapperX selectDeleteIds(Long id); -} \ No newline at end of file +} diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/RagHttpService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/RagHttpService.java index e34a2cb7e..4ef269755 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/RagHttpService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/RagHttpService.java @@ -723,7 +723,7 @@ public class RagHttpService { private KnowledgeDocumentsDO getKnowledgeDocuments (Long id, String fileId) { return knowledgeDocumentsMapper.selectOne(new LambdaQueryWrapperX() .eq(KnowledgeDocumentsDO::getKnowledgeBaseId, id) - .eq(KnowledgeDocumentsDO::getId, fileId)); + .eq(KnowledgeDocumentsDO::getFileId, fileId)); } /** diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java index db3cf7fda..1131a78ff 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/knowledgebase/KnowledgeBaseServiceImpl.java @@ -120,6 +120,7 @@ public class KnowledgeBaseServiceImpl implements KnowledgeBaseService { return; } + // 获取需要保留的文档 ID List retainedIds = documents.stream() .map(KnowledgeDocumentsSaveReqVO::getId) @@ -186,9 +187,9 @@ public class KnowledgeBaseServiceImpl implements KnowledgeBaseService { KnowledgeDocumentsDO docDO = BeanUtils.toBean(doc, KnowledgeDocumentsDO.class); docDO.setKnowledgeBaseId(knowledgeBaseId); if (doc.getId() == null) { - newDocuments.add(docDO); // 收集新增文档 + newDocuments.add(docDO); } - knowledgeDocumentsMapper.insertOrUpdate(docDO); // 更新或插入文档 + knowledgeDocumentsMapper.insertOrUpdate(docDO); }); return newDocuments; }