From 7fb490778ad70a3959f45de8d019dfafc061f5f7 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Sun, 15 Jun 2025 17:02:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(knowledge):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BB=93=E6=9E=84=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=88=B0=E4=B8=80=E4=B8=AA=E8=B7=AF=E5=BE=84=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E4=B8=BA=E5=90=88=E5=B9=B6=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/{ => knowledge}/GroupController.java | 6 +++--- .../{ => knowledge}/KnowledgeBaseController.java | 4 ++-- .../controller/{ => knowledge}/SegmentController.java | 6 +++--- .../service/ai/knowledge/service/EmbeddingService.java | 2 ++ .../ai/knowledge/service/{ => knowledge}/GroupService.java | 2 +- .../service/{ => knowledge}/KnowledgeBaseService.java | 7 ++----- .../knowledge/service/{ => knowledge}/SegmentService.java | 2 +- service-web/client/src/pages/ai/knowledge/DataDetail.tsx | 4 ++-- service-web/client/src/pages/ai/knowledge/DataSegment.tsx | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) rename service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/{ => knowledge}/GroupController.java (86%) rename service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/{ => knowledge}/KnowledgeBaseController.java (96%) rename service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/{ => knowledge}/SegmentController.java (87%) rename service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/{ => knowledge}/GroupService.java (98%) rename service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/{ => knowledge}/KnowledgeBaseService.java (96%) rename service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/{ => knowledge}/SegmentService.java (97%) diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/GroupController.java b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/GroupController.java similarity index 86% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/GroupController.java rename to service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/GroupController.java index 8205864..63eaab9 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/GroupController.java +++ b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/GroupController.java @@ -1,7 +1,7 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller; +package com.lanyuanxiaoyao.service.ai.knowledge.controller.knowledge; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse; -import com.lanyuanxiaoyao.service.ai.knowledge.service.GroupService; +import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.GroupService; import java.util.concurrent.ExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; * @version 20250528 */ @RestController -@RequestMapping("group") +@RequestMapping("knowledge/group") public class GroupController { private static final Logger logger = LoggerFactory.getLogger(GroupController.class); diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/KnowledgeBaseController.java b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/KnowledgeBaseController.java similarity index 96% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/KnowledgeBaseController.java rename to service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/KnowledgeBaseController.java index 4a32256..fb67ab9 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/KnowledgeBaseController.java +++ b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/KnowledgeBaseController.java @@ -1,11 +1,11 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller; +package com.lanyuanxiaoyao.service.ai.knowledge.controller.knowledge; import cn.hutool.core.util.StrUtil; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisMapResponse; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse; import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.SegmentVO; import com.lanyuanxiaoyao.service.ai.knowledge.service.EmbeddingService; -import com.lanyuanxiaoyao.service.ai.knowledge.service.KnowledgeBaseService; +import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.KnowledgeBaseService; import java.io.IOException; import java.util.concurrent.ExecutionException; import org.eclipse.collections.api.factory.Lists; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/SegmentController.java b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/SegmentController.java similarity index 87% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/SegmentController.java rename to service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/SegmentController.java index 8eb17a7..5d0c960 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/SegmentController.java +++ b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/SegmentController.java @@ -1,7 +1,7 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller; +package com.lanyuanxiaoyao.service.ai.knowledge.controller.knowledge; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse; -import com.lanyuanxiaoyao.service.ai.knowledge.service.SegmentService; +import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.SegmentService; import java.util.concurrent.ExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; * @version 20250528 */ @RestController -@RequestMapping("segment") +@RequestMapping("knowledge/segment") public class SegmentController { private static final Logger logger = LoggerFactory.getLogger(SegmentController.class); diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java index 35691ec..d2c46ac 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java +++ b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java @@ -7,6 +7,8 @@ import cn.hutool.core.util.StrUtil; import com.lanyuanxiaoyao.service.ai.knowledge.entity.EmbeddingContext; import com.lanyuanxiaoyao.service.ai.knowledge.entity.Knowledge; import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.DataFileVO; +import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.GroupService; +import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.KnowledgeBaseService; import com.yomahub.liteflow.core.FlowExecutor; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/GroupService.java b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/GroupService.java similarity index 98% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/GroupService.java rename to service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/GroupService.java index 7f3329a..04efa73 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/GroupService.java +++ b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/GroupService.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service; +package com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge; import club.kingon.sql.builder.SqlBuilder; import club.kingon.sql.builder.entry.Alias; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/KnowledgeBaseService.java b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/KnowledgeBaseService.java similarity index 96% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/KnowledgeBaseService.java rename to service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/KnowledgeBaseService.java index 411bb59..84fab50 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/KnowledgeBaseService.java +++ b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/KnowledgeBaseService.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service; +package com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge; import club.kingon.sql.builder.SqlBuilder; import cn.hutool.core.util.IdUtil; @@ -15,7 +15,6 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; -import org.noear.solon.ai.reranking.RerankingModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ai.document.Document; @@ -50,14 +49,12 @@ public class KnowledgeBaseService { private final EmbeddingModel model; private final QdrantClient client; private final GroupService groupService; - private final RerankingModel rerankingModel; - public KnowledgeBaseService(JdbcTemplate template, EmbeddingModel model, VectorStore vectorStore, GroupService groupService, RerankingModel rerankingModel) { + public KnowledgeBaseService(JdbcTemplate template, EmbeddingModel model, VectorStore vectorStore, GroupService groupService) { this.template = template; this.model = model; this.client = (QdrantClient) vectorStore.getNativeClient().orElseThrow(); this.groupService = groupService; - this.rerankingModel = rerankingModel; } public Knowledge get(Long id) { diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/SegmentService.java b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/SegmentService.java similarity index 97% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/SegmentService.java rename to service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/SegmentService.java index 700cc06..3ba33ca 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/SegmentService.java +++ b/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/SegmentService.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service; +package com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge; import com.lanyuanxiaoyao.service.ai.knowledge.entity.Knowledge; import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.SegmentVO; diff --git a/service-web/client/src/pages/ai/knowledge/DataDetail.tsx b/service-web/client/src/pages/ai/knowledge/DataDetail.tsx index 3e6f751..8b0d65f 100644 --- a/service-web/client/src/pages/ai/knowledge/DataDetail.tsx +++ b/service-web/client/src/pages/ai/knowledge/DataDetail.tsx @@ -38,7 +38,7 @@ const DataDetail: React.FC = () => { body: [ { type: 'crud', - api: `${commonInfo.baseAiKnowledgeUrl}/group/list?knowledge_id=${knowledge_id}`, + api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/group/list?knowledge_id=${knowledge_id}`, ...crudCommonOptions(), headerToolbar: [ 'reload', @@ -146,7 +146,7 @@ const DataDetail: React.FC = () => { level: 'link', size: 'sm', actionType: 'ajax', - api: `get:${commonInfo.baseAiKnowledgeUrl}/group/delete?id=\${id}`, + api: `get:${commonInfo.baseAiKnowledgeUrl}/knowledge/group/delete?id=\${id}`, confirmText: '确认删除', confirmTitle: '删除', }, diff --git a/service-web/client/src/pages/ai/knowledge/DataSegment.tsx b/service-web/client/src/pages/ai/knowledge/DataSegment.tsx index 041d1a2..f1d3888 100644 --- a/service-web/client/src/pages/ai/knowledge/DataSegment.tsx +++ b/service-web/client/src/pages/ai/knowledge/DataSegment.tsx @@ -32,7 +32,7 @@ const DataDetail: React.FC = () => { body: [ { type: 'crud', - api: `${commonInfo.baseAiKnowledgeUrl}/segment/list?knowledge_id=${knowledge_id}&group_id=${group_id}`, + api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/segment/list?knowledge_id=${knowledge_id}&group_id=${group_id}`, ...crudCommonOptions(), headerToolbar: [ 'reload',