升级milvus版本，支持上传修改章节标题后的技术文件

llm-back/pom.xml

@@ -219,6 +219,18 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>3.25.5</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>4.12.0</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

llm-back/ruoyi-agent/pom.xml

@@ -17,7 +17,7 @@
     </description>
 
     <properties>
-        <solon.version>3.4.3</solon.version>
+        <solon.version>3.5.1</solon.version>
     </properties>
 
     <dependencies>
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>2.3.3</version>
+            <version>2.6.2</version>
         </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>

llm-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/McpServerConfig.java

@@ -66,7 +66,7 @@ public class McpServerConfig {
     public FilterRegistrationBean mcpServerFilter() {
         FilterRegistrationBean<SolonServletFilter> filter = new FilterRegistrationBean<>();
         filter.setName("SolonFilter");
-        filter.addUrlPatterns("/llm/*");
+        filter.addUrlPatterns("/mcp/*");
         filter.setFilter(new SolonServletFilter());
         return filter;
     }

llm-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

@@ -13,17 +13,15 @@ import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15Embedding
 import dev.langchain4j.store.embedding.EmbeddingMatch;
 import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
 import dev.langchain4j.store.embedding.inmemory.InMemoryEmbeddingStore;
-import io.milvus.client.MilvusClient;
-import io.milvus.client.MilvusServiceClient;
-import io.milvus.grpc.SearchResults;
-import io.milvus.param.ConnectParam;
-import io.milvus.param.MetricType;
-import io.milvus.param.R;
-import io.milvus.param.RpcStatus;
-import io.milvus.param.collection.LoadCollectionParam;
-import io.milvus.param.collection.ReleaseCollectionParam;
-import io.milvus.param.dml.SearchParam;
-import io.milvus.response.SearchResultsWrapper;
+import io.milvus.v2.client.ConnectConfig;
+import io.milvus.v2.client.MilvusClientV2;
+import io.milvus.v2.common.IndexParam;
+import io.milvus.v2.service.collection.request.LoadCollectionReq;
+import io.milvus.v2.service.collection.request.ReleaseCollectionReq;
+import io.milvus.v2.service.vector.request.SearchReq;
+import io.milvus.v2.service.vector.request.data.BaseVector;
+import io.milvus.v2.service.vector.request.data.FloatVec;
+import io.milvus.v2.service.vector.response.SearchResp;
 import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.extractor.ExtractorFactory;
 import org.apache.poi.xwpf.usermodel.*;
@@ -36,26 +34,25 @@ import org.noear.solon.ai.chat.ChatSession;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.noear.solon.ai.chat.message.ChatMessage;
 import org.noear.solon.ai.chat.session.InMemoryChatSession;
+import org.noear.solon.ai.mcp.McpChannel;
 import org.noear.solon.ai.mcp.server.annotation.McpServerEndpoint;
 import org.noear.solon.annotation.Param;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
-@McpServerEndpoint(sseEndpoint = "/llm/mcp/sse")
+@McpServerEndpoint(channel = McpChannel.SSE, mcpEndpoint = "/mcp/sse")
 public class McpServiceImpl implements IMcpService {
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
     private static final String llmServiceUrl = "http://192.168.28.188:8000/v1/chat/completions";
 
-    private static final MilvusServiceClient milvusClient = new MilvusServiceClient(
-            ConnectParam.newBuilder()
-                    .withHost("192.168.28.188")
-                    .withPort(19530)
+    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
+            ConnectConfig.builder()
+                    .uri("http://192.168.28.188:19530")
                     .build());
 
     /**
@@ -70,9 +67,8 @@ public class McpServiceImpl implements IMcpService {
             try {
                 templatePath = templatePath.replace("/dev-api/profile", Solon.cfg().getProperty("cmc.profile"));
                 List<String> subTitles = extractSubTitles(templatePath, title);
-//                List<JSONObject> contexts = retrieveFromMilvus(milvusClient, embeddingModel, collectionName, title, 10);
-//                return generateAnswerWithDocumentAndCollection(embeddingModel, agentName, templatePath, title, contexts, llmServiceUrl);
-                return generateAnswerWithDocumentAndCollection(embeddingModel, agentName, templatePath, subTitles, new ArrayList<>());
+                List<JSONObject> contexts = retrieveFromMilvus(collectionName, title, 10);
+                return generateAnswerWithDocumentAndCollection(agentName, templatePath, subTitles, contexts);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -82,22 +78,22 @@ public class McpServiceImpl implements IMcpService {
      * 从Milvus检索相关文档
      * @return
      */
-    public List<JSONObject> retrieveFromMilvus(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK) {
-        SearchResultsWrapper wrapper = retrieve(milvusClient, embeddingModel, collectionName, query, topK);
-        return wrapper.getRowRecords(0).stream()
-                .map(record -> {
-                    JSONObject result = new JSONObject();
-                    result.put("file_name", record.get("file_name"));
-                    result.put("content", record.get("content"));
-                    return result;
-                })
-                .collect(Collectors.toList());
+    public List<JSONObject> retrieveFromMilvus(String collectionName, String query, int topK) {
+        List<JSONObject> resultList = new ArrayList<>();
+        List<List<SearchResp.SearchResult>> searchResultList = retrieve(collectionName, query, topK);
+        searchResultList.forEach(searchResult -> {
+            JSONObject result = new JSONObject();
+            result.put("file_name", searchResult.get(0).getEntity().get("file_name"));
+            result.put("content", searchResult.get(0).getEntity().get("content"));
+            resultList.add(result);
+        });
+        return resultList;
     }
 
     /**
      * 调用LLM生成回答
      */
-    public AssistantMessage generateAnswerWithDocumentAndCollection(EmbeddingModel embeddingModel, String agentName, String templatePath, List<String> titles, List<JSONObject> contexts) throws IOException {
+    public AssistantMessage generateAnswerWithDocumentAndCollection(String agentName, String templatePath, List<String> titles, List<JSONObject> contexts) throws IOException {
         StringBuilder sb = new StringBuilder("招标文件内容：\n\n");
         String filename = templatePath.replace("_" + agentName, "");
         File profilePath = new File(filename);
@@ -128,12 +124,12 @@ public class McpServiceImpl implements IMcpService {
         }
         String absolutePath = templatePath.replace("/dev-api/profile", Solon.cfg().getProperty("cmc.profile"));
         writeContent(content.toString(), titles, absolutePath);
-//        for (JSONObject context : contexts) {
-//            sb.append("文件").append(": ")
-//                    .append(context.getString("file_name")).append("\n\n")
-//                    .append("段落格式").append(": ")
-//                    .append(context.getString("content")).append("\n\n");
-//        }
+        for (JSONObject context : contexts) {
+            sb.append("文件").append(": ")
+                    .append(context.getString("file_name")).append("\n\n")
+                    .append("段落格式").append(": ")
+                    .append(context.getString("content")).append("\n\n");
+        }
         content.append( "招标文件分析完成，章节内容已写入【<a href='")
                 .append(templatePath.replace(Solon.cfg().getProperty("cmc.profile"), "/dev-api/profile"))
                 .append("'> 技术文件" + "</a>】，请查阅\n\n")
@@ -151,7 +147,6 @@ public class McpServiceImpl implements IMcpService {
                 .model("Qwen2.5-1.5B-Instruct")
                 .build();
 
-
         List<ChatMessage> messages = new ArrayList<>();
         messages.add(ChatMessage.ofUser(prompt));
         ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
@@ -280,6 +275,7 @@ public class McpServiceImpl implements IMcpService {
         return nextLevel <= level; // 存在更低级别的标题，不是叶子节点
 
     }
+
     /**
      * 获取二、三级标题列表
      */
@@ -302,42 +298,40 @@ public class McpServiceImpl implements IMcpService {
 
     /**
      * 检索知识库
+     * @return
      */
-    private SearchResultsWrapper retrieve(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK) {
-        List<List<Float>> queryVector = Collections.singletonList(embeddingModel.embed(query).content().vectorAsList());
+    private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
+        List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合
-        LoadCollectionParam loadParam = LoadCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+        LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-
-        R<RpcStatus> loadResponse = milvusClient.loadCollection(loadParam);
-        if (loadResponse.getStatus() != R.Status.Success.getCode()) {
-            System.err.println("加载Collection失败: " + loadResponse.getMessage());
-            milvusClient.close();
-        }
+        milvusClient.loadCollection(loadCollectionReq);
 
         // 构建SearchParam
-        SearchParam searchParam = SearchParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withVectors(queryVector)
-                .withTopK(topK)
-                .withOutFields(Arrays.asList("file_name", "file_type", "content"))
-                .withVectorFieldName("embedding")
-                .withMetricType(MetricType.COSINE)
-                .withParams("{\"nprobe\": 8}")
+        Map<String, Object> searchParams = new HashMap<>();
+        searchParams.put("nprobe", 8);
+        SearchReq searchReq = SearchReq.builder()
+                .collectionName(collectionName)
+                .data(queryVector)
+                .topK(topK)
+                .outputFields(Arrays.asList("file_name", "file_type", "content"))
+                .annsField("embedding")
+                .metricType(IndexParam.MetricType.COSINE)
+                .searchParams(searchParams)
                 .build();
 
-        R<SearchResults> response = milvusClient.search(searchParam);
-        SearchResultsWrapper wrapper = new SearchResultsWrapper(response.getData().getResults());
+        SearchResp searchResp = milvusClient.search(searchReq);
+        List<List<SearchResp.SearchResult>> searchResultList = searchResp.getSearchResults();
 
         // 释放集合
-        ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+        ReleaseCollectionReq releaseCollectionReq = ReleaseCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-        milvusClient.releaseCollection(param);
+        milvusClient.releaseCollection(releaseCollectionReq);
 
-        return wrapper;
+        return searchResultList;
     }
 
     /**

llm-back/ruoyi-llm/pom.xml

@@ -31,7 +31,7 @@
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>2.3.3</version>
+            <version>2.6.2</version>
         </dependency>
 
         <!-- LangChain4j -->
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-ai-mcp</artifactId>
-            <version>3.4.3</version>
+            <version>3.5.1</version>
         </dependency>
 
     </dependencies>

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/CmcAgentController.java

@@ -89,6 +89,16 @@ public class CmcAgentController extends BaseController
         return success(cmcAgentService.uploadDocument(file, agentName));
     }
 
+    /**
+     * 上传修改文件
+     * @return
+     */
+    @PostMapping("/modifyFile")
+    public AjaxResult uploadModifyFile(MultipartFile file, String agentName) throws IOException
+    {
+        return success(cmcAgentService.uploadModifyFile(file, agentName));
+    }
+
     /**
      * 上传多文件
      * @return

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/KnowLedgeController.java

@@ -7,11 +7,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15EmbeddingModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
-import io.milvus.client.MilvusServiceClient;
-import io.milvus.grpc.MutationResult;
-import io.milvus.param.ConnectParam;
-import io.milvus.param.R;
-import io.milvus.param.RpcStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,19 +32,13 @@ public class KnowLedgeController extends BaseController
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
-    private static final MilvusServiceClient milvusClient = new MilvusServiceClient(
-            ConnectParam.newBuilder()
-                    .withHost("192.168.28.188")
-                    .withPort(19530)
-                    .build());
-
     /**
      * 新建知识库
      */
     @GetMapping("/list")
     public AjaxResult listKnowLedgeCollection()
     {
-        JSONArray collectionNames = milvusService.getCollectionNames(milvusClient);
+        JSONArray collectionNames = milvusService.getCollectionNames();
         return success(collectionNames);
     }
 
@@ -59,8 +48,8 @@ public class KnowLedgeController extends BaseController
     @PostMapping("/create")
     public AjaxResult createKnowLedgeCollection(String collectionName, String description)
     {
-        R<RpcStatus> status = milvusService.createCollection(milvusClient, collectionName, description, 512);
-        return success(status);
+        milvusService.createCollection(collectionName, description, 512);
+        return success();
     }
 
     /**
@@ -69,7 +58,7 @@ public class KnowLedgeController extends BaseController
     @PostMapping("/modify")
     public AjaxResult modifyKnowLedgeCollection(String collectionName, String newCollectionName)
     {
-        milvusService.collectionRename(milvusClient, collectionName, newCollectionName);
+        milvusService.collectionRename(collectionName, newCollectionName);
         return success();
     }
 
@@ -79,8 +68,8 @@ public class KnowLedgeController extends BaseController
     @DeleteMapping("/remove")
     public AjaxResult removeKnowLedgeCollection(String collectionName)
     {
-        milvusService.removeAllDocument(milvusClient, collectionName);
-        milvusService.deleteCollectionName(milvusClient, collectionName);
+        milvusService.removeAllDocument(collectionName);
+        milvusService.deleteCollectionName(collectionName);
         return success();
     }
 
@@ -90,7 +79,7 @@ public class KnowLedgeController extends BaseController
     @GetMapping("/listDocument")
     public AjaxResult listKnowledgeDocument(String collectionName, String fileType)
     {
-        List<String> documentList = milvusService.listDocument(milvusClient, collectionName, fileType);
+        List<String> documentList = milvusService.listDocument(collectionName, fileType);
         return success(documentList);
     }
 
@@ -99,12 +88,12 @@ public class KnowLedgeController extends BaseController
      */
     @PostMapping("/insertDocument")
     public AjaxResult insertKnowledgeDocument(MultipartFile[] fileList, String collectionName) throws IOException {
-        R<MutationResult> insertResult = null;
+        long insertResult = 0;
         for (MultipartFile file : fileList)
-            insertResult = langChainMilvusService.insertLangchainEmbeddingDocument(milvusClient, file, collectionName, embeddingModel);
+            insertResult = langChainMilvusService.insertLangchainEmbeddingDocument(file, collectionName);
         String message = "文件导入成功";
-        if (insertResult != null && insertResult.getStatus() != R.Status.Success.getCode()) {
-            message = "文件导入失败：" + insertResult.getMessage();
+        if (insertResult == 0) {
+            message = "文件导入失败";
             return error(message);
         }
         else
@@ -117,7 +106,7 @@ public class KnowLedgeController extends BaseController
     @DeleteMapping("/removeDocument")
     public AjaxResult deleteKnowledgeDocument(String fileName, String collectionName)
     {
-        milvusService.removeDocument(milvusClient, collectionName, fileName);
+        milvusService.removeDocument(collectionName, fileName);
         return success();
     }
 

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/McpController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.web.llm.controller;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.llm.domain.CmcChat;
 import com.ruoyi.llm.service.ICmcAgentService;
@@ -18,13 +17,12 @@ import org.noear.solon.ai.chat.ChatSession;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.noear.solon.ai.chat.message.ChatMessage;
 import org.noear.solon.ai.chat.session.InMemoryChatSession;
+import org.noear.solon.ai.mcp.McpChannel;
 import org.noear.solon.ai.mcp.client.McpClientProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import reactor.core.publisher.Flux;
 
 import java.io.IOException;
 import java.util.*;
@@ -69,7 +67,8 @@ public class McpController extends BaseController
     @GetMapping("/answer")
     public AssistantMessage answer(String topicId, String question) throws IOException {
         McpClientProvider clientProvider = McpClientProvider.builder()
-                .apiUrl("http://localhost:8080/llm/mcp/sse")
+                .channel(McpChannel.SSE)
+                .apiUrl("http://localhost:8080/mcp/sse")
                 .build();
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
                 .model("Qwen2.5-1.5B-Instruct")
@@ -100,12 +99,6 @@ public class McpController extends BaseController
                 arguments.put("agentName", agentName);
                 arguments.put("title", question);
             }
-            if (arguments.getString("templatePath").contains("招标") || arguments.getString("templatePath").contains("询价")) {
-                arguments.put("collectionName", "technical");
-                String agentName = cmcAgentService.selectCmcAgentByAgentId(cmcTopicService.selectCmcTopicByTopicId(topicId).getAgentId()).getAgentName();
-                arguments.put("agentName", agentName);
-                arguments.put("title", question);
-            }
             resultContent = clientProvider.callToolAsText(name, arguments).getContent();
             assistantMessage = new AssistantMessage(resultContent);
         }

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/RagController.java

@@ -3,10 +3,6 @@ package com.ruoyi.web.llm.controller;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.web.llm.service.ILangChainMilvusService;
 import com.ruoyi.common.core.controller.BaseController;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15EmbeddingModel;
-import io.milvus.client.MilvusServiceClient;
-import io.milvus.param.ConnectParam;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,21 +25,13 @@ public class RagController extends BaseController
     @Autowired
     private ILangChainMilvusService langChainMilvusService;
 
-    private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
-
-    private static final MilvusServiceClient milvusClient = new MilvusServiceClient(
-            ConnectParam.newBuilder()
-                    .withHost("192.168.28.188")
-                    .withPort(19530)
-                    .build());
-
     /**
      * 调用LLM+RAG（知识库）生成回答
      */
     @GetMapping("/answer")
     public Flux<AssistantMessage> answerWithCollection(String collectionName, String topicId, String question)
     {
-        List<JSONObject> contexts = langChainMilvusService.retrieveFromMilvus(milvusClient, embeddingModel, collectionName, question, 10);
+        List<JSONObject> contexts = langChainMilvusService.retrieveFromMilvus(collectionName, question, 10);
         return langChainMilvusService.generateAnswerWithCollection(topicId, question, contexts, "http://192.168.28.188:8000/v1/chat/completions");
     }
 
@@ -53,7 +41,7 @@ public class RagController extends BaseController
     @GetMapping("/context")
     public List<JSONObject> context(String question, String collectionName)
     {
-        return langChainMilvusService.similarityFromMilvus(milvusClient, embeddingModel, collectionName, question, 10);
+        return langChainMilvusService.similarityFromMilvus(collectionName, question, 10);
     }
 
 }

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/SessionController.java

@@ -2,8 +2,6 @@ package com.ruoyi.web.llm.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.web.llm.service.ILangChainMilvusService;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15EmbeddingModel;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,8 +24,6 @@ public class SessionController extends BaseController
     @Autowired
     private ILangChainMilvusService langChainMilvusService;
 
-    private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
-
     /**
      * 生成回答
      */
@@ -42,7 +38,7 @@ public class SessionController extends BaseController
     @GetMapping("/answerWithDocument")
     public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws IOException
     {
-        return langChainMilvusService.generateAnswerWithDocument(embeddingModel, topicId, chatId, question, "http://192.168.28.188:8000/v1/chat/completions");
+        return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question, "http://192.168.28.188:8000/v1/chat/completions");
     }
 
 }

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/ILangChainMilvusService.java

@@ -1,10 +1,6 @@
 package com.ruoyi.web.llm.service;
 
 import com.alibaba.fastjson2.JSONObject;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import io.milvus.client.MilvusClient;
-import io.milvus.grpc.MutationResult;
-import io.milvus.param.R;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.springframework.web.multipart.MultipartFile;
 import reactor.core.publisher.Flux;
@@ -16,20 +12,21 @@ public interface ILangChainMilvusService {
 
     /**
      * 导入知识库文件
+     * @return
      */
-    public R<MutationResult> insertLangchainEmbeddingDocument(MilvusClient milvusClient, MultipartFile file, String collectionName, EmbeddingModel embeddingModel) throws IOException;
+    public long insertLangchainEmbeddingDocument(MultipartFile file, String collectionName) throws IOException;
 
     /**
      * 从Milvus检索相关文档
      * @return
      */
-    public List<JSONObject> retrieveFromMilvus(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK);
+    public List<JSONObject> retrieveFromMilvus(String collectionName, String query, int topK);
 
     /**
      * 从Milvus检索相关文档及相关度
      * @return
      */
-    public List<JSONObject> similarityFromMilvus(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK);
+    public List<JSONObject> similarityFromMilvus(String collectionName, String query, int topK);
 
     /**
      * 调用LLM生成回答
@@ -47,13 +44,13 @@ public interface ILangChainMilvusService {
      * 调用LLM+RAG（外部文件）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithDocument(EmbeddingModel embeddingModel, String topicId, String chatId, String question, String llmServiceUrl) throws IOException;
+    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws IOException;
 
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(EmbeddingModel embeddingModel, String topicId, String question,  List<JSONObject> requests, String llmServiceUrl) throws IOException;
+    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question,  List<JSONObject> requests, String llmServiceUrl) throws IOException;
 
     /**
      * 获取二级标题下三级标题列表

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/IMilvusService.java

@@ -1,9 +1,6 @@
 package com.ruoyi.web.llm.service;
 
 import com.alibaba.fastjson2.JSONArray;
-import io.milvus.client.MilvusClient;
-import io.milvus.param.R;
-import io.milvus.param.RpcStatus;
 
 import java.util.List;
 
@@ -12,35 +9,35 @@ public interface IMilvusService {
     /**
      * 新建知识库Collection（含Schema、Field、Index）
      */
-    public R<RpcStatus> createCollection(MilvusClient milvusClient, String collectionName, String description, int dimension);
+    public void createCollection(String collectionName, String description, int dimension);
 
     /**
      * 查询知识库Collection
      */
-    public JSONArray getCollectionNames(MilvusClient milvusClient);
+    public JSONArray getCollectionNames();
 
     /**
      * 修改知识库Collection
      */
-    public void collectionRename(MilvusClient milvusClient, String collectionName, String newCollectionName);
+    public void collectionRename(String collectionName, String newCollectionName);
 
     /**
      * 删除知识库Collection
      */
-    public void deleteCollectionName(MilvusClient milvusClient, String collectionName);
+    public void deleteCollectionName(String collectionName);
 
     /**
      * 查询知识库文件
      */
-    public List<String> listDocument(MilvusClient milvusClient, String collectionName, String fileType);
+    public List<String> listDocument(String collectionName, String fileType);
 
     /**
      * 删除知识库文件
      */
-    public void removeDocument(MilvusClient milvusClient, String collectionName, String fileName);
+    public void removeDocument(String collectionName, String fileName);
 
     /**
      * 删除知识库所有文件
      */
-    public void removeAllDocument(MilvusClient milvusClient, String collectionName);
+    public void removeAllDocument(String collectionName);
 }

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.web.llm.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.llm.domain.CmcChat;
 import com.ruoyi.llm.domain.CmcDocument;
@@ -14,20 +16,21 @@ import dev.langchain4j.data.document.splitter.DocumentByParagraphSplitter;
 import dev.langchain4j.data.embedding.Embedding;
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15EmbeddingModel;
 import dev.langchain4j.store.embedding.EmbeddingMatch;
 import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
 import dev.langchain4j.store.embedding.inmemory.InMemoryEmbeddingStore;
-import io.milvus.client.MilvusClient;
-import io.milvus.grpc.MutationResult;
-import io.milvus.grpc.SearchResults;
-import io.milvus.param.MetricType;
-import io.milvus.param.R;
-import io.milvus.param.RpcStatus;
-import io.milvus.param.collection.LoadCollectionParam;
-import io.milvus.param.collection.ReleaseCollectionParam;
-import io.milvus.param.dml.InsertParam;
-import io.milvus.param.dml.SearchParam;
-import io.milvus.response.SearchResultsWrapper;
+import io.milvus.v2.client.ConnectConfig;
+import io.milvus.v2.client.MilvusClientV2;
+import io.milvus.v2.common.IndexParam;
+import io.milvus.v2.service.collection.request.LoadCollectionReq;
+import io.milvus.v2.service.collection.request.ReleaseCollectionReq;
+import io.milvus.v2.service.vector.request.InsertReq;
+import io.milvus.v2.service.vector.request.SearchReq;
+import io.milvus.v2.service.vector.request.data.BaseVector;
+import io.milvus.v2.service.vector.request.data.FloatVec;
+import io.milvus.v2.service.vector.response.InsertResp;
+import io.milvus.v2.service.vector.response.SearchResp;
 import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.extractor.ExtractorFactory;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -46,7 +49,6 @@ import reactor.core.publisher.Flux;
 
 import java.io.*;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class LangChainMilvusServiceImpl implements ILangChainMilvusService
@@ -57,11 +59,19 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     @Autowired
     private ICmcDocumentService cmcDocumentService;
 
+    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
+            ConnectConfig.builder()
+                    .uri("http://192.168.28.188:19530")
+                    .build());
+
+    private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
+
     /**
      * 导入知识库文件
+     * @return
      */
     @Override
-    public R<MutationResult> insertLangchainEmbeddingDocument(MilvusClient milvusClient, MultipartFile file, String collectionName, EmbeddingModel embeddingModel) throws IOException
+    public long insertLangchainEmbeddingDocument(MultipartFile file, String collectionName) throws IOException
     {
         File profilePath = new File( RuoYiConfig.getProfile() + "/upload/rag/knowledge/" + collectionName);
         if (!profilePath.exists())
@@ -71,37 +81,34 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
             file.transferTo(transferFile);
         List<TextSegment> segments = splitDocument(transferFile);
 
-        // 提取文本和生成嵌入
-        List<String> fileNames = new ArrayList<>();
-        List<String> fileTypes = new ArrayList<>();
-        List<String> texts = new ArrayList<>();
-        List<List<Float>> embeddings = new ArrayList<>();
+        // 准备导入数据
+        List<JsonObject> data = new ArrayList<>();
 
+        // 提取文本和生成嵌入
         for (TextSegment segment : segments) {
             String text = segment.text();
             if (text.trim().isEmpty())
                 continue;
-            fileNames.add(file.getOriginalFilename());
+
+            JSONObject fastjsonObj = new JSONObject();
+            fastjsonObj.put("file_name", file.getOriginalFilename());
             String[] fileName = file.getOriginalFilename().split("\\.");
-            fileTypes.add(fileName[fileName.length - 1]);
-            texts.add(text);
-            embeddings.add(embeddingModel.embed(text).content().vectorAsList());
+            fastjsonObj.put("file_type", fileName[fileName.length - 1]);
+            fastjsonObj.put("content", text);
+            fastjsonObj.put("embedding", embeddingModel.embed(text).content().vectorAsList());
+            String jsonString = fastjsonObj.toJSONString();
+            JsonObject jsonObject = JsonParser.parseString(jsonString).getAsJsonObject();
+            data.add(jsonObject);
         }
 
-        // 准备导入数据
-        List<InsertParam.Field> fields = new ArrayList<>();
-        fields.add(new InsertParam.Field("file_name", fileNames));
-        fields.add(new InsertParam.Field("file_type", fileTypes));
-        fields.add(new InsertParam.Field("content", texts));
-        fields.add(new InsertParam.Field("embedding", embeddings));
-
-        InsertParam insertParam = InsertParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withFields(fields)
+        InsertReq insertReq = InsertReq.builder()
+                .collectionName(collectionName)
+                .data(data)
                 .build();
 
         // 执行导入
-        return milvusClient.insert(insertParam);
+        InsertResp insertResp = milvusClient.insert(insertReq);
+        return insertResp.getInsertCnt();
     }
 
     /**
@@ -109,16 +116,16 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * @return
      */
     @Override
-    public List<JSONObject> retrieveFromMilvus(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK) {
-        SearchResultsWrapper wrapper = retrieve(milvusClient, embeddingModel, collectionName, query, topK);
-        return wrapper.getRowRecords(0).stream()
-                .map(record -> {
-                    JSONObject result = new JSONObject();
-                    result.put("file_name", record.get("file_name"));
-                    result.put("content", record.get("content"));
-                    return result;
-                })
-                .collect(Collectors.toList());
+    public List<JSONObject> retrieveFromMilvus(String collectionName, String query, int topK) {
+        List<JSONObject> resultList = new ArrayList<>();
+        List<List<SearchResp.SearchResult>> searchResultList = retrieve(collectionName, query, topK);
+        searchResultList.forEach(searchResult -> {
+            JSONObject result = new JSONObject();
+            result.put("file_name", searchResult.get(0).getEntity().get("file_name"));
+            result.put("content", searchResult.get(0).getEntity().get("content"));
+            resultList.add(result);
+        });
+        return resultList;
     }
 
     /**
@@ -126,19 +133,18 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * @return
      */
     @Override
-    public List<JSONObject> similarityFromMilvus(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK) {
-        SearchResultsWrapper wrapper = retrieve(milvusClient, embeddingModel, collectionName, query, topK);
-        List<JSONObject> wrapperList =  wrapper.getRowRecords(0).stream()
-                .map(record -> {
-                    JSONObject result = new JSONObject();
-                    result.put("distance", record.get("distance"));
-                    result.put("file_name", record.get("file_name"));
-                    result.put("content", record.get("content"));
-                    return result;
-                })
-                .collect(Collectors.toList());
-        wrapperList.removeIf(jsonObject -> jsonObject.getDouble("distance") < 0.7);
-        return wrapperList;
+    public List<JSONObject> similarityFromMilvus(String collectionName, String query, int topK) {
+        List<JSONObject> resultList = new ArrayList<>();
+        List<List<SearchResp.SearchResult>> searchResultList = retrieve(collectionName, query, topK);
+        searchResultList.forEach(searchResult -> {
+            JSONObject result = new JSONObject();
+            result.put("score", searchResult.get(0).getScore());
+            result.put("file_name", searchResult.get(0).getEntity().get("file_name"));
+            result.put("content", searchResult.get(0).getEntity().get("content"));
+            resultList.add(result);
+        });
+        resultList.removeIf(jsonObject -> jsonObject.getDouble("score") < 0.7);
+        return resultList;
     }
 
     /**
@@ -193,7 +199,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * 调用LLM生成回答
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithDocument(EmbeddingModel embeddingModel, String topicId, String chatId, String question, String llmServiceUrl) throws IOException {
+    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws IOException {
         CmcDocument cmcDocument = new CmcDocument();
         cmcDocument.setChatId(chatId);
         List<CmcDocument> documentList = cmcDocumentService.selectCmcDocumentList(cmcDocument);
@@ -226,7 +232,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * 调用LLM生成回答
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(EmbeddingModel embeddingModel, String topicId, String question, List<JSONObject> contexts, String llmServiceUrl) throws IOException {
+    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question, List<JSONObject> contexts, String llmServiceUrl) throws IOException {
         StringBuilder sb = new StringBuilder("招标文件内容：\n\n");
         CmcChat cmcChat = new CmcChat();
         cmcChat.setTopicId(topicId);
@@ -306,42 +312,40 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
 
     /**
      * 检索知识库
+     * @return
      */
-    private SearchResultsWrapper retrieve(MilvusClient milvusClient, EmbeddingModel embeddingModel, String collectionName, String query, int topK) {
-        List<List<Float>> queryVector = Collections.singletonList(embeddingModel.embed(query).content().vectorAsList());
+    private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
+        List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合
-        LoadCollectionParam loadParam = LoadCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+        LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-
-        R<RpcStatus> loadResponse = milvusClient.loadCollection(loadParam);
-        if (loadResponse.getStatus() != R.Status.Success.getCode()) {
-            System.err.println("加载Collection失败: " + loadResponse.getMessage());
-            milvusClient.close();
-        }
+        milvusClient.loadCollection(loadCollectionReq);
 
         // 构建SearchParam
-        SearchParam searchParam = SearchParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withVectors(queryVector)
-                .withTopK(topK)
-                .withOutFields(Arrays.asList("file_name", "file_type", "content"))
-                .withVectorFieldName("embedding")
-                .withMetricType(MetricType.COSINE)
-                .withParams("{\"nprobe\": 8}")
+        Map<String, Object> searchParams = new HashMap<>();
+        searchParams.put("nprobe", 8);
+        SearchReq searchReq = SearchReq.builder()
+                .collectionName(collectionName)
+                .data(queryVector)
+                .topK(topK)
+                .outputFields(Arrays.asList("file_name", "file_type", "content"))
+                .annsField("embedding")
+                .metricType(IndexParam.MetricType.COSINE)
+                .searchParams(searchParams)
                 .build();
 
-        R<SearchResults> response = milvusClient.search(searchParam);
-        SearchResultsWrapper wrapper = new SearchResultsWrapper(response.getData().getResults());
+        SearchResp searchResp = milvusClient.search(searchReq);
+        List<List<SearchResp.SearchResult>> searchResultList = searchResp.getSearchResults();
 
         // 释放集合
-        ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+        ReleaseCollectionReq releaseCollectionReq = ReleaseCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-        milvusClient.releaseCollection(param);
+        milvusClient.releaseCollection(releaseCollectionReq);
 
-        return wrapper;
+        return searchResultList;
     }
 
     /**

llm-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/MilvusServiceImpl.java

@@ -3,112 +3,109 @@ package com.ruoyi.web.llm.service.impl;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.web.llm.service.IMilvusService;
-import io.milvus.client.MilvusClient;
-import io.milvus.grpc.*;
-import io.milvus.param.*;
-import io.milvus.param.collection.*;
 import io.milvus.param.dml.DeleteParam;
-import io.milvus.param.highlevel.collection.ListCollectionsParam;
-import io.milvus.param.highlevel.collection.response.ListCollectionsResponse;
-import io.milvus.param.highlevel.dml.QuerySimpleParam;
-import io.milvus.param.highlevel.dml.response.QueryResponse;
-import io.milvus.param.index.CreateIndexParam;
-import io.milvus.response.QueryResultsWrapper;
+import io.milvus.v2.client.ConnectConfig;
+import io.milvus.v2.client.MilvusClientV2;
+import io.milvus.v2.common.DataType;
+import io.milvus.v2.common.IndexParam;
+import io.milvus.v2.service.collection.request.*;
+import io.milvus.v2.service.collection.response.DescribeCollectionResp;
+import io.milvus.v2.service.collection.response.ListCollectionsResp;
+import io.milvus.v2.service.vector.request.QueryReq;
+import io.milvus.v2.service.vector.response.QueryResp;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.TimeZone;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class MilvusServiceImpl implements IMilvusService {
 
+    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
+            ConnectConfig.builder()
+                    .uri("http://192.168.28.188:19530")
+                    .build());
+
     /**
      * 新建知识库Collection（含Schema、Field、Index）
      */
     @Override
-    public R<RpcStatus> createCollection(MilvusClient milvusClient, String collectionName, String description, int dimension) {
-        FieldType idField = FieldType.newBuilder()
-                .withName("id")
-                .withDataType(DataType.Int64)
-                .withPrimaryKey(true)
-                .withAutoID(true)
-                .build();
-
-        FieldType fileNameField = FieldType.newBuilder()
-                .withName("file_name")
-                .withDataType(DataType.VarChar)
-                .withMaxLength(256)
-                .build();
-
-        FieldType fieldTypeField = FieldType.newBuilder()
-                .withName("file_type")
-                .withDataType(DataType.VarChar)
-                .withMaxLength(256)
-                .build();
-
-        FieldType contentField = FieldType.newBuilder()
-                .withName("content")
-                .withDataType(DataType.VarChar)
-                .withMaxLength(65535)
-                .build();
-
-        FieldType vectorField = FieldType.newBuilder()
-                .withName("embedding")
-                .withDataType(DataType.FloatVector)
-                .withDimension(dimension)
-                .build();
+    public void createCollection(String collectionName, String description, int dimension) {
+        CreateCollectionReq.CollectionSchema schema = MilvusClientV2.CreateSchema();
+
+        schema.addField(AddFieldReq.builder()
+                .fieldName("id")
+                .dataType(DataType.Int64)
+                .isPrimaryKey(true)
+                .autoID(true)
+                .build());
+
+        schema.addField(AddFieldReq.builder()
+                .fieldName("file_name")
+                .dataType(DataType.VarChar)
+                .maxLength(256)
+                .build());
+
+        schema.addField(AddFieldReq.builder()
+                .fieldName("file_type")
+                .dataType(DataType.VarChar)
+                .maxLength(10)
+                .build());
+
+        schema.addField(AddFieldReq.builder()
+                .fieldName("content")
+                .dataType(DataType.VarChar)
+                .maxLength(65535)
+                .build());
+
+        schema.addField(AddFieldReq.builder()
+                .fieldName("embedding")
+                .dataType(DataType.FloatVector)
+                .dimension(5)
+                .build());
 
-        CreateCollectionParam createCollectionParam = CreateCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withDescription(description)
-                .addFieldType(idField)
-                .addFieldType(fileNameField)
-                .addFieldType(fieldTypeField)
-                .addFieldType(contentField)
-                .addFieldType(vectorField)
+        // 创建索引
+        Map<String, Object> extraParams = new HashMap<>();
+        extraParams.put("nlist", 64);
+        IndexParam indexParam = IndexParam.builder()
+                .fieldName("embedding")
+                .indexType(IndexParam.IndexType.IVF_FLAT)
+                .metricType(IndexParam.MetricType.COSINE)
+                .extraParams(extraParams)
                 .build();
 
-        R<RpcStatus> createResult = milvusClient.createCollection(createCollectionParam);
-
-        // 创建索引
-        CreateIndexParam createIndexParam = CreateIndexParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withFieldName("embedding")
-                .withIndexType(IndexType.IVF_FLAT)
-                .withMetricType(MetricType.COSINE)
-                .withExtraParam("{\"nlist\": 64}")
+        CreateCollectionReq createCollectionParam = CreateCollectionReq.builder()
+                .collectionName(collectionName)
+                .description(description)
+                .collectionSchema(schema)
+                .indexParam(indexParam)
                 .build();
 
-        milvusClient.createIndex(createIndexParam);
-        return createResult;
+        milvusClient.createCollection(createCollectionParam);
     }
 
     /**
      * 查询知识库Collection
      */
-    public JSONArray getCollectionNames(MilvusClient milvusClient) {
+    public JSONArray getCollectionNames() {
         JSONArray jsonArray = new JSONArray();
-        ListCollectionsParam listParam = ListCollectionsParam.newBuilder().build();
-        ListCollectionsResponse listResponse = milvusClient.listCollections(listParam).getData();
+        ListCollectionsResp listResponse = milvusClient.listCollections();
         if (listResponse != null) {
-            List<String> collectionNames = milvusClient.listCollections(listParam).getData().collectionNames;
+            List<String> collectionNames = listResponse.getCollectionNames();
             for (String collectionName : collectionNames) {
                 JSONObject jsonObject = new JSONObject();
-                DescribeCollectionParam describeParam = DescribeCollectionParam.newBuilder()
-                                                        .withCollectionName(collectionName)
-                                                        .build();
-                DescribeCollectionResponse describeResponse = milvusClient.describeCollection(describeParam).getData();
+                DescribeCollectionReq request = DescribeCollectionReq.builder()
+                        .collectionName(collectionName)
+                        .build();
+                DescribeCollectionResp describeResponse = milvusClient.describeCollection(request);
                 jsonObject.put("collectionId", describeResponse.getCollectionID());
                 jsonObject.put("collectionName", collectionName);
                 SimpleDateFormat beijingFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 beijingFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-                String beijingTime = beijingFormat.format(describeResponse.getCreatedUtcTimestamp());
+                String beijingTime = beijingFormat.format(describeResponse.getCreateUtcTime());
                 jsonObject.put("createdTime", beijingTime);
-                jsonObject.put("description", describeResponse.getSchema().getDescription());
+                jsonObject.put("description", describeResponse.getDescription());
                 jsonArray.add(jsonObject);
             }
         }
@@ -118,10 +115,10 @@ public class MilvusServiceImpl implements IMilvusService {
     /**
      * 修改知识库Collection
      */
-    public void collectionRename(MilvusClient milvusClient, String collectionName, String newCollectionName) {
-        RenameCollectionParam renameCollectionReq = RenameCollectionParam.newBuilder()
-                .withOldCollectionName(collectionName)
-                .withNewCollectionName(newCollectionName)
+    public void collectionRename(String collectionName, String newCollectionName) {
+        RenameCollectionReq renameCollectionReq = RenameCollectionReq.builder()
+                .collectionName(collectionName)
+                .newCollectionName(newCollectionName)
                 .build();
 
         milvusClient.renameCollection(renameCollectionReq);
@@ -130,86 +127,86 @@ public class MilvusServiceImpl implements IMilvusService {
     /**
      * 删除知识库Collection
      */
-    public void deleteCollectionName(MilvusClient milvusClient, String collectionName) {
-        DropCollectionParam param = DropCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+    public void deleteCollectionName(String collectionName) {
+        DropCollectionReq dropCollectionReq = DropCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-        milvusClient.dropCollection(param);
+        milvusClient.dropCollection(dropCollectionReq);
     }
 
     /**
      * 查询知识库文件
      */
-    public List<String> listDocument(MilvusClient milvusClient, String collectionName, String fileType) {
+    public List<String> listDocument(String collectionName, String fileType) {
         List<String> documentList = new ArrayList<>();
-        loadCollectionName(milvusClient,collectionName);
-        QuerySimpleParam queryParam = QuerySimpleParam.newBuilder()        
-                .withCollectionName(collectionName)
-                .withFilter("id > 0")
-                .withOutputFields(Arrays.asList("file_type", "file_name"))
-                .withLimit(16384L)
+        loadCollectionName(collectionName);
+        QueryReq queryParam = QueryReq.builder()
+                .collectionName(collectionName)
+                .filter("id > 0")
+                .outputFields(Arrays.asList("file_type", "file_name"))
+                .limit(16384L)
                 .build();
         if (fileType != null && !fileType.equals(""))
-            queryParam = QuerySimpleParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withFilter(String.format("file_type == \"%s\"", fileType))
-                .withOutputFields(Arrays.asList("file_type", "file_name"))
-                .withLimit(16384L)
+            queryParam = QueryReq.builder()
+                .collectionName(collectionName)
+                .filter(String.format("file_type == \"%s\"", fileType))
+                .outputFields(Arrays.asList("file_type", "file_name"))
+                .limit(16384L)
                 .build();
-        QueryResponse queryResults = milvusClient.query(queryParam).getData();
-        List<QueryResultsWrapper.RowRecord> rowRecordList = new ArrayList<>();
-        if (queryResults != null) {
-            rowRecordList = queryResults.getRowRecords();
-            for (QueryResultsWrapper.RowRecord rowRecord : rowRecordList) {
-                documentList.add(rowRecord.get("file_name").toString());
+        QueryResp queryResp = milvusClient.query(queryParam);
+        List<QueryResp.QueryResult> rowRecordList = new ArrayList<>();
+        if (queryResp != null) {
+            rowRecordList = queryResp.getQueryResults();
+            for (QueryResp.QueryResult rowRecord : rowRecordList) {
+                documentList.add(rowRecord.getEntity().get("file_name").toString());
             }
         }
-        releaseCollectionName(milvusClient, collectionName);
+        releaseCollectionName(collectionName);
         return documentList.stream().distinct().collect(Collectors.toList());
     }
 
     /**
      * 删除知识库文件
      */
-    public void removeDocument(MilvusClient milvusClient, String collectionName, String fileName) {
-        loadCollectionName(milvusClient, collectionName);
+    public void removeDocument(String collectionName, String fileName) {
+        loadCollectionName(collectionName);
         DeleteParam deleteParam = DeleteParam.newBuilder()
                 .withCollectionName(collectionName)
                 .withExpr(String.format("file_name == \"%s\"", fileName))
                 .build();
-        milvusClient.delete(deleteParam);
+//        milvusClient.delete(deleteParam);
     }
 
     /**
      * 删除知识库所有文件
      */
-    public void removeAllDocument(MilvusClient milvusClient, String collectionName) {
-        loadCollectionName(milvusClient, collectionName);
+    public void removeAllDocument(String collectionName) {
+        loadCollectionName(collectionName);
         DeleteParam deleteParam = DeleteParam.newBuilder()
                 .withCollectionName(collectionName)
                 .withExpr("id > 0")
                 .build();
-        milvusClient.delete(deleteParam);
+//        milvusClient.delete(deleteParam);
     }
 
     /**
      * 加载知识库Collection
      */
-    public void loadCollectionName(MilvusClient milvusClient, String collectionName) {
-        LoadCollectionParam param = LoadCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+    public void loadCollectionName(String collectionName) {
+        LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-        milvusClient.loadCollection(param);
+        milvusClient.loadCollection(loadCollectionReq);
     }
 
     /**
      * 释放知识库Collection
      */
-    public void releaseCollectionName(MilvusClient milvusClient, String collectionName) {
-        ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+    public void releaseCollectionName(String collectionName) {
+        ReleaseCollectionReq releaseCollectionReq = ReleaseCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-        milvusClient.releaseCollection(param);
+        milvusClient.releaseCollection(releaseCollectionReq);
     }
 
 }

llm-back/ruoyi-system/pom.xml

@@ -50,13 +50,13 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-ai</artifactId>
-            <version>3.4.3</version>
+            <version>3.5.1</version>
         </dependency>
 
         <dependency>
             <groupId>io.milvus</groupId>
             <artifactId>milvus-sdk-java</artifactId>
-            <version>2.3.3</version>
+            <version>2.6.2</version>
         </dependency>
 
     </dependencies>

llm-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/ICmcAgentService.java

@@ -47,6 +47,14 @@ public interface ICmcAgentService
      */
     public JSONObject uploadDocument(MultipartFile file, String agentName) throws IOException;
 
+    /**
+     * 上传修改文件
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    public JSONObject uploadModifyFile(MultipartFile file, String agentName) throws IOException;
+
     /**
      * 上传多文件
      *

llm-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/impl/CmcAgentServiceImpl.java

@@ -5,7 +5,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -27,22 +26,23 @@ import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15Embedding
 import dev.langchain4j.store.embedding.EmbeddingMatch;
 import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
 import dev.langchain4j.store.embedding.inmemory.InMemoryEmbeddingStore;
-import io.milvus.client.MilvusServiceClient;
-import io.milvus.grpc.SearchResults;
-import io.milvus.param.ConnectParam;
-import io.milvus.param.MetricType;
-import io.milvus.param.R;
-import io.milvus.param.RpcStatus;
-import io.milvus.param.collection.LoadCollectionParam;
-import io.milvus.param.collection.ReleaseCollectionParam;
-import io.milvus.param.dml.SearchParam;
-import io.milvus.response.SearchResultsWrapper;
+import io.milvus.v2.client.ConnectConfig;
+import io.milvus.v2.client.MilvusClientV2;
+import io.milvus.v2.common.IndexParam;
+import io.milvus.v2.service.collection.request.LoadCollectionReq;
+import io.milvus.v2.service.collection.request.ReleaseCollectionReq;
+import io.milvus.v2.service.vector.request.SearchReq;
+import io.milvus.v2.service.vector.request.data.BaseVector;
+import io.milvus.v2.service.vector.request.data.FloatVec;
+import io.milvus.v2.service.vector.response.SearchResp;
 import org.apache.poi.extractor.ExtractorFactory;
 import org.apache.poi.extractor.POITextExtractor;
 import org.apache.poi.xwpf.usermodel.BreakType;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
+import org.apache.xmlbeans.XmlCursor;
+import org.noear.solon.Solon;
 import org.noear.solon.ai.chat.ChatModel;
 import org.noear.solon.ai.chat.ChatResponse;
 import org.noear.solon.ai.chat.ChatSession;
@@ -57,12 +57,12 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 智能体Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-07-17
  */
 @Service
-public class CmcAgentServiceImpl implements ICmcAgentService 
+public class CmcAgentServiceImpl implements ICmcAgentService
 {
     @Autowired
     private CmcAgentMapper cmcAgentMapper;
@@ -79,15 +79,14 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     private static final String llmServiceUrl = "http://192.168.28.188:8000/v1/chat/completions";
 
-    private static final MilvusServiceClient milvusClient = new MilvusServiceClient(
-            ConnectParam.newBuilder()
-                    .withHost("192.168.28.188")
-                    .withPort(19530)
+    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
+            ConnectConfig.builder()
+                    .uri("http://192.168.28.188:19530")
                     .build());
 
     /**
      * 查询智能体
-     * 
+     *
      * @param agentId 智能体主键
      * @return 智能体
      */
@@ -99,7 +98,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     /**
      * 查询智能体列表
-     * 
+     *
      * @param cmcAgent 智能体
      * @return 智能体
      */
@@ -173,9 +172,58 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                     RuoYiConfig.getProfile() + outputFilename, "工作大纲");
             message = "好的，我已经收到您上传的招标文件。\n\n"+ chapters + "\n\n" +
                     "若您对章节标题有异议，请打开" + "【<a href='/profile" + outputFilename + "'> 技术文件 " + "</a>】" + "进行修改，后续将根据修改后的章节标题，帮您生成对应章节内容。\n\n" +
-                    "请问您需要哪个章节撰写的帮助？\n" +
-                    "如需单个章节，您可以复制章节标题名称至对话输入框，发送给我；如需全部章节，请输入 技术文件 。\n\n" +
-                    "思考时间可能较长，请耐心等待，若提示未检测工具，麻烦重新发送，谢谢！\n";
+                    "思考时间可能较长，请耐心等待！\n";
+        }
+        jsonObject.put("assistantMessage", message);
+        return jsonObject;
+    }
+
+    /**
+     * 上传修改文件
+     *
+     * @param file 文件
+     * @return 结果
+     */
+    @Override
+    public JSONObject uploadModifyFile(MultipartFile file, String agentName) throws IOException {
+        String prefixPath = "/upload/agent/" + agentName;
+        File profilePath = new File( RuoYiConfig.getProfile() + prefixPath);
+        if (!profilePath.exists())
+            profilePath.mkdirs();
+        String chatId = new SnowFlake().generateId();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("chatId", chatId);
+        File transferFile = new File(profilePath + "/" + file.getOriginalFilename());
+        if (!transferFile.exists())
+            file.transferTo(transferFile);
+        else {
+            Path inputFilePath = Paths.get(profilePath + "/" + file.getOriginalFilename());
+            Files.deleteIfExists(inputFilePath);
+            file.transferTo(transferFile);
+        }
+        processValue = "上传完成:100%";
+        CmcDocument cmcDocument = new CmcDocument();
+        cmcDocument.setDocumentId(new SnowFlake().generateId());
+        cmcDocument.setChatId(chatId);
+        cmcDocument.setPath(prefixPath + "/" + file.getOriginalFilename());
+        cmcDocumentMapper.insertCmcDocument(cmcDocument);
+        String message = "";
+        if (agentName.contains("技术")) {
+            CmcChat cmcChat = new CmcChat();
+            cmcChat.setChatId(jsonObject.getString("chatId"));
+            cmcChat.setInputTime(new Date());
+            cmcChat.setInput("投标文件地址：" + prefixPath + "/" + file.getOriginalFilename());
+            cmcChat.setUserId(SecurityUtils.getUserId());
+            cmcChatMapper.insertCmcChat(cmcChat);
+            InputStream fileInputStream = new FileInputStream(profilePath + "/" + file.getOriginalFilename());
+            try (XWPFDocument doc = new XWPFDocument(fileInputStream)) {
+                // 保存文档到本地文件系统
+                try (FileOutputStream out = new FileOutputStream(profilePath + "/" + file.getOriginalFilename())) {
+                    doc.write(out);
+                }
+            }
+            List<String> subTitles = extractSubTitles(profilePath + "/" + file.getOriginalFilename(), "技术文件");
+            message = generateAnswerWithDocumentAndCollection(profilePath + "/" + file.getOriginalFilename(), subTitles);
         }
         jsonObject.put("assistantMessage", message);
         return jsonObject;
@@ -211,7 +259,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     /**
      * 新增智能体
-     * 
+     *
      * @param cmcAgent 智能体
      * @return 结果
      */
@@ -224,7 +272,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     /**
      * 修改智能体
-     * 
+     *
      * @param cmcAgent 智能体
      * @return 结果
      */
@@ -236,7 +284,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     /**
      * 批量删除智能体
-     * 
+     *
      * @param agentIds 需要删除的智能体主键
      * @return 结果
      */
@@ -248,7 +296,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     /**
      * 删除智能体信息
-     * 
+     *
      * @param agentId 智能体主键
      * @return 结果
      */
@@ -258,6 +306,209 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         return cmcAgentMapper.deleteCmcAgentByAgentId(agentId);
     }
 
+    /**
+     * 调用LLM生成回答 - 针对技术文件章节内容生成
+     */
+    public String generateAnswerWithDocumentAndCollection(String templatePath, List<String> titles) throws IOException {
+        File profilePath = new File(templatePath);
+
+        // 构建招标文件内容的嵌入向量存储
+        InMemoryEmbeddingStore<TextSegment> embeddingStore = new InMemoryEmbeddingStore<>();
+        List<TextSegment> segments = splitDocument(profilePath);
+        List<Embedding> embeddings = embeddingModel.embedAll(segments).content();
+        embeddingStore.addAll(embeddings, segments);
+
+        StringBuilder allGeneratedContent = new StringBuilder();
+        Map<String, String> titleContentMap = new HashMap<>();
+
+        List<String> successTitles = new ArrayList<>();
+        List<String> failureTitles = new ArrayList<>();
+
+        // 为每个章节标题生成内容
+        for (String title : titles) {
+            try {
+                // 1. 从招标文件中检索相关内容
+                List<String> tenderContent = retrieveFromTenderDocument(embeddingStore, title);
+
+                // 2. 从知识库中检索相似章节内容
+                List<JSONObject> knowledgeContexts = retrieveFromMilvus("technical", title, 10);
+
+                // 3. 构建针对该章节的提示语
+                String prompt = buildChapterPrompt(title, tenderContent, knowledgeContexts);
+
+                // 4. 生成章节内容
+                String chapterContent = generateAnswer(prompt);
+
+                // 5. 存储章节内容
+                titleContentMap.put(title, chapterContent);
+                allGeneratedContent.append(title).append("\n").append(chapterContent).append("\n\n");
+
+                // 更新进度
+                processValue = "生成章节内容中: " + Double.parseDouble(String.format("%.2f%n", (double) (titles.indexOf(title) + 1)  / titles.size() * 100)) + "%";
+                successTitles.add(title);
+
+            } catch (Exception e) {
+                failureTitles.add(title);
+                System.err.println("生成章节 " + title + " 内容时出错: " + e.getMessage());
+                titleContentMap.put(title, "该章节内容生成失败，请手动填写。");
+            }
+        }
+
+        // 将生成的内容写入技术文件
+        writeContentToDocument(titleContentMap, titles, templatePath);
+
+        // 构建返回消息
+        StringBuilder message = new StringBuilder();
+        message.append("技术文件章节内容生成完成！\n\n");
+        message.append("已为以下章节生成内容：\n");
+        for (String title : successTitles) {
+            message.append("• ").append(title).append("\n");
+        }
+        message.append("以下章节内容待生成：\n");
+        for (String title : failureTitles) {
+            message.append("× ").append(title).append("\n");
+        }
+        message.append("\n技术文件已更新，请查看：\n");
+        message.append("【<a href='/profile").append(templatePath.replace("\\", "/").replace(RuoYiConfig.getProfile(), ""))
+               .append("'>点击查看技术文件</a>】\n\n");
+        message.append("如需修改特定章节，请输入章节标题名称。\n").append("若提示未检测到工具，麻烦重新发送，谢谢");
+
+        return message.toString();
+    }
+
+    /**
+     * 从招标文件中检索与指定标题相关的内容
+     */
+    private List<String> retrieveFromTenderDocument(InMemoryEmbeddingStore<TextSegment> embeddingStore, String title) {
+        List<String> relevantContent = new ArrayList<>();
+
+        try {
+            Embedding queryEmbedding = embeddingModel.embed(title).content();
+            EmbeddingSearchRequest embeddingSearchRequest = EmbeddingSearchRequest.builder()
+                    .queryEmbedding(queryEmbedding)
+                    .minScore(0.7) // 降低阈值以获取更多相关内容
+                    .maxResults(5) // 限制结果数量
+                    .build();
+
+            List<EmbeddingMatch<TextSegment>> results = embeddingStore.search(embeddingSearchRequest).matches();
+            results.sort(Comparator.comparingDouble(EmbeddingMatch<TextSegment>::score).reversed());
+
+            for (EmbeddingMatch<TextSegment> match : results) {
+                relevantContent.add(match.embedded().text());
+            }
+        } catch (Exception e) {
+            System.err.println("从招标文件检索内容时出错: " + e.getMessage());
+        }
+
+        return relevantContent;
+    }
+
+    /**
+     * 构建针对特定章节的提示语
+     */
+    private String buildChapterPrompt(String title, List<String> tenderContent, List<JSONObject> knowledgeContexts) {
+        StringBuilder prompt = new StringBuilder();
+
+        // 基础指令
+        prompt.append("你是一位专业的技术文件撰写专家。请根据以下信息为技术文件章节生成详细内容。\n\n");
+
+        // 章节信息
+        prompt.append("【目标章节】: ").append(title).append("\n\n");
+
+        // 招标文件相关内容
+        if (!tenderContent.isEmpty()) {
+            prompt.append("【招标文件要求】:\n");
+            for (int i = 0; i < tenderContent.size(); i++) {
+                prompt.append(i + 1).append(". ").append(tenderContent.get(i)).append("\n");
+            }
+            prompt.append("\n");
+        }
+
+        // 知识库参考内容
+        if (!knowledgeContexts.isEmpty()) {
+            prompt.append("【参考模板内容】:\n");
+            for (int i = 0; i < knowledgeContexts.size(); i++) {
+                JSONObject context = knowledgeContexts.get(i);
+                prompt.append("参考文件 ").append(i + 1).append(" (").append(context.getString("file_name")).append("):\n");
+                prompt.append(context.getString("content")).append("\n\n");
+            }
+        }
+
+        // 具体要求
+        prompt.append("【撰写要求】:\n");
+        prompt.append("1. 内容必须与招标文件要求高度匹配\n");
+        prompt.append("2. 参考模板内容的结构和表达方式\n");
+        prompt.append("3. 内容要专业、具体、可操作\n");
+        prompt.append("4. 语言要规范、准确，符合技术文件标准\n");
+        prompt.append("5. 内容要完整，包含必要的技术细节\n");
+        prompt.append("6. 避免空洞的套话，要有实质性的技术内容\n\n");
+
+        // 输出格式要求
+        prompt.append("【输出格式】:\n");
+        prompt.append("请直接输出章节的正文内容，不要包含标题。内容应该包括：\n");
+        prompt.append("- 技术方案概述\n");
+        prompt.append("- 具体实施方法\n");
+        prompt.append("- 技术参数和标准\n");
+        prompt.append("- 质量保证措施\n");
+        prompt.append("- 其他相关技术细节\n\n");
+
+        prompt.append("请开始生成 ").append(title).append(" 的详细内容：");
+
+        return prompt.toString();
+    }
+
+    /**
+     * 将生成的内容写入文档
+     */
+    private void writeContentToDocument(Map<String, String> titleContentMap, List<String> titles, String absolutePath) throws IOException {
+        File file = new File(absolutePath);
+        FileInputStream fileInputStream = new FileInputStream(file);
+
+        try (XWPFDocument document = new XWPFDocument(fileInputStream)) {
+            List<XWPFParagraph> paragraphs = document.getParagraphs();
+            List<Integer> titlePositions = new ArrayList<>();
+            List<String> contents = new ArrayList<>();
+
+            // 找到所有标题的位置
+            for (int i = 0; i < paragraphs.size(); i++) {
+                XWPFParagraph paragraph = paragraphs.get(i);
+                String paragraphText = paragraph.getText().trim();
+
+                for (String title : titles) {
+                    if (paragraphText.contains(title)) {
+                        titlePositions.add(i);
+                        contents.add(titleContentMap.getOrDefault(title, ""));
+                        break;
+                    }
+                }
+            }
+
+            // 从后往前插入内容，避免位置偏移
+            for (int i = titlePositions.size() - 1; i >= 0; i--) {
+                int insertPos = titlePositions.get(i) + 1;
+                if (insertPos < paragraphs.size()) {
+                    XmlCursor xmlCursor = paragraphs.get(insertPos).getCTP().newCursor();
+                    XWPFParagraph contentParagraph = document.insertNewParagraph(xmlCursor);
+                    contentParagraph.setStyle("1"); // 正文样式
+
+                    XWPFRun run = contentParagraph.createRun();
+                    String content = contents.get(i);
+                    if (content != null && !content.trim().isEmpty()) {
+                        run.setText(content);
+                    }
+                }
+
+                // 更新进度
+                processValue = "章节内容写入: " + Double.parseDouble(String.format("%.2f%n", (double) (i + 1)  / titles.size() * 100)) + "%";
+
+            }
+
+            // 保存文档
+            try (FileOutputStream out = new FileOutputStream(absolutePath)) {
+                document.write(out);
+            }
+        }
+    }
 
     /**
      * 调用LLM生成回答
@@ -281,7 +532,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             sb.append(requests).append("\n\n");
         }
         //根据招标文件工作大纲要求生成二级标题
-        sb.append("请根据上述招标文件内容，严格按以下格式列出").append(question).append(":\n")
+        sb.append("请基于上述招标文件中提到的工作大纲内容，先列出二级章节标题，严格按以下格式，仅输出标题列表：\n")
                 .append("6.1 XX\n" +
                 "6.2 XX\n" +
                 "6.3 XX");
@@ -306,7 +557,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         for (String chapter2 : chapter2List) {
             String orderNum = chapter2.split(" ")[0];
             StringBuilder sb = new StringBuilder("二级标题如下：\n").append(chapter2)
-                    .append("\n 请根据参考内容编排三级标题，严格按以下格式列出：\n")
+                    .append("\n 请以上述二级标题作为检索词，到技术知识库中检索最相似的片段，结合检索结果编排该二级标题下的三级标题，严格按以下格式，仅输出三级标题列表：\n")
                     .append(orderNum).append(".1 XX\n")
                     .append(orderNum).append(".2 XX\n")
                     .append(orderNum).append(".3 XX\n");
@@ -321,7 +572,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         }
         String sb = "二级标题如下：\n" + chapters2 +
                 "\n 三级标题如下：" + chapter3 +
-                "帮我合并三级标题，严格按以下格式列出：\n" +
+                "请将上述二级与对应的三级标题进行合并，严格按以下格式输出完整大纲，仅输出标题：\n" +
                 "6 技术文件\n" +
                 "6.1 XX\n" +
                 "6.1.1 XX\n" +
@@ -329,7 +580,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                 "6.2 XX\n" +
                 "6.2.1 XX";
         String content = generateAnswer(sb);
-        writeContent(content, templatePath);
+        writeTitles(content, templatePath);
         return content;
     }
 
@@ -355,61 +606,58 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      * @return
      */
     public List<JSONObject> retrieveFromMilvus(String collectionName, String query, int topK) {
-        SearchResultsWrapper wrapper = retrieve(collectionName, query, topK);
-        return wrapper.getRowRecords(0).stream()
-                .map(record -> {
-                    JSONObject result = new JSONObject();
-                    result.put("content", record.get("content"));
-                    return result;
-                })
-                .collect(Collectors.toList());
+        List<JSONObject> resultList = new ArrayList<>();
+        List<List<SearchResp.SearchResult>> searchResultList = retrieve(collectionName, query, topK);
+        searchResultList.forEach(searchResult -> {
+            JSONObject result = new JSONObject();
+            result.put("content", searchResult.get(0).getEntity().get("content"));
+            resultList.add(result);
+        });
+        return resultList;
     }
 
     /**
      * 检索知识库
      */
-    private SearchResultsWrapper retrieve(String collectionName, String query, int topK) {
-        List<List<Float>> queryVector = Collections.singletonList(embeddingModel.embed(query).content().vectorAsList());
+    private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
+        List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合
-        LoadCollectionParam loadParam = LoadCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+        LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-
-        R<RpcStatus> loadResponse = milvusClient.loadCollection(loadParam);
-        if (loadResponse.getStatus() != R.Status.Success.getCode()) {
-            System.err.println("加载Collection失败: " + loadResponse.getMessage());
-            milvusClient.close();
-        }
+        milvusClient.loadCollection(loadCollectionReq);
 
         // 构建SearchParam
-        SearchParam searchParam = SearchParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withVectors(queryVector)
-                .withTopK(topK)
-                .withOutFields(Arrays.asList("content"))
-                .withVectorFieldName("embedding")
-                .withMetricType(MetricType.COSINE)
-                .withParams("{\"nprobe\": 8}")
+        Map<String, Object> searchParams = new HashMap<>();
+        searchParams.put("nprobe", 8);
+        SearchReq searchReq = SearchReq.builder()
+                .collectionName(collectionName)
+                .data(queryVector)
+                .topK(topK)
+                .outputFields(Arrays.asList("file_name", "file_type", "content"))
+                .annsField("embedding")
+                .metricType(IndexParam.MetricType.COSINE)
+                .searchParams(searchParams)
                 .build();
 
-        R<SearchResults> response = milvusClient.search(searchParam);
-        SearchResultsWrapper wrapper = new SearchResultsWrapper(response.getData().getResults());
+        SearchResp searchResp = milvusClient.search(searchReq);
+        List<List<SearchResp.SearchResult>> searchResultList = searchResp.getSearchResults();
 
         // 释放集合
-        ReleaseCollectionParam param = ReleaseCollectionParam.newBuilder()
-                .withCollectionName(collectionName)
+        ReleaseCollectionReq releaseCollectionReq = ReleaseCollectionReq.builder()
+                .collectionName(collectionName)
                 .build();
-        milvusClient.releaseCollection(param);
+        milvusClient.releaseCollection(releaseCollectionReq);
 
-        return wrapper;
+        return searchResultList;
     }
 
     /**
      * 写入章节大纲
      * @return
      */
-    public void writeContent(String content, String templatePath) throws IOException {
+    public void writeTitles(String content, String templatePath) throws IOException {
         List<String> chapters = new ArrayList<>();
         String[] contentLines = content.split("\n");
         for (String line : contentLines) {
@@ -439,6 +687,146 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         }
     }
 
+    /**
+     * 写入章节内容
+     * @return
+     */
+    public void writeContent(String content, List<String> titles, String absolutePath) throws IOException {
+        String[] contentLines = content.split("\n");
+        Map<String, String> map = new HashMap<>();
+        File file = new File(absolutePath);
+        FileInputStream fileInputStream = new FileInputStream(file);
+        try (XWPFDocument document = new XWPFDocument(fileInputStream)) {
+            for (int i = 0; i < titles.size(); i++) {
+                int startIndex = Arrays.asList(contentLines).indexOf(titles.get(i));
+                StringBuilder text = new StringBuilder();
+                if (startIndex >= 0) {
+                    if (i < titles.size() - 1) {
+                        int endIndex = Arrays.asList(contentLines).indexOf(titles.get(i + 1));
+                        for (int c = startIndex + 1; c < endIndex; c++) {
+                            text.append(contentLines[c]).append("\n\n");
+                        }
+                    } else {
+                        if (startIndex + 1 < contentLines.length) {
+                            for (int c = startIndex + 1; c < contentLines.length; c++) {
+                                text.append(contentLines[c]).append("\n\n");
+                            }
+                        }
+                    }
+                }
+                else
+                    text.append(content);
+                map.put(titles.get(i), text.toString());
+            }
+
+            List<Integer> positions = new ArrayList<>();
+            List<String> contents = new ArrayList<>();
+            List<XWPFParagraph> paragraphs = document.getParagraphs();
+
+            for (int i = 0; i < paragraphs.size(); i++) {
+                XWPFParagraph paragraph = paragraphs.get(i);
+                for (String title : titles) {
+                    if (paragraph.getText().contains(title)) {
+                        positions.add(i);
+                        contents.add(map.get(title));
+                    }
+                }
+            }
+
+            for (int i = positions.size() - 1; i >= 0; i--) {
+                int insertPos = positions.get(i) + 1;
+                XmlCursor xmlCursor = paragraphs.get(insertPos).getCTP().newCursor();
+                XWPFParagraph contentParagraph = document.insertNewParagraph(xmlCursor);
+                contentParagraph.setStyle("1");
+                XWPFRun run = contentParagraph.createRun();
+                run.setText(contents.get(i));
+            }
+
+            try (FileOutputStream out = new FileOutputStream(absolutePath)) {
+                document.write(out);
+            }
+        }
+    }
+
+    /**
+     * 获取最低级别子标题列表
+     */
+    public List<String> extractSubTitles(String filename, String question) throws IOException {
+        List<String> subTitles = new ArrayList<>();
+        InputStream fileInputStream = new FileInputStream(filename);
+
+        boolean foundParent = false;
+        int parentLevel = -1;
+        // 用于跟踪当前路径
+        List<XWPFParagraph> currentPath = new ArrayList<>();
+
+        try (XWPFDocument document = new XWPFDocument(fileInputStream)) {
+
+            for (XWPFParagraph  paragraph : document.getParagraphs()) {
+                String text = paragraph.getText();
+                int level = Integer.parseInt(paragraph.getStyle());
+
+                // 维护当前路径
+                while (!currentPath.isEmpty() && Integer.parseInt(currentPath.get(currentPath.size() - 1).getStyle()) >= level) {
+                    currentPath.remove(currentPath.size() - 1);
+                }
+                currentPath.add(paragraph);
+                if (foundParent) {
+                    if (level > parentLevel) { // 是子标题
+                        if (isLeafNode(document, paragraph, level)) {
+                            subTitles.add(text.replace("\n", ""));
+                        }
+                    } else {
+                        // 遇到同级或更高级别的标题，停止搜索
+                        break;
+                    }
+                } else if (text.equals(question)) {
+                    foundParent = true;
+                    parentLevel = level;
+                }
+            }
+
+
+            return subTitles;
+
+        }
+    }
+
+    // 检查一个标题是否是叶子节点（没有更低级别的子标题）
+    private boolean isLeafNode(XWPFDocument doc, XWPFParagraph p, int level) {
+        int index = doc.getPosOfParagraph(p);
+        if (index == -1 || index >= doc.getParagraphs().size()-1) {
+            return true;
+        }
+
+        // 检查后续段落
+        XWPFParagraph nextP = doc.getParagraphs().get(index + 1);
+        int nextLevel = Integer.parseInt(nextP.getStyle());
+        // 遇到同级或更高级别标题，是叶子节点
+        return nextLevel <= level; // 存在更低级别的标题，不是叶子节点
+
+    }
+
+    /**
+     * 获取二、三级标题列表
+     */
+    public String extractTitles(String filename) throws IOException {
+        StringBuilder subTitles = new StringBuilder();
+        InputStream fileInputStream = new FileInputStream(filename);
+        try (XWPFDocument document = new XWPFDocument(fileInputStream)) {
+            for (XWPFParagraph paragraph : document.getParagraphs()) {
+                String text = paragraph.getText().trim();
+                if (paragraph.getStyle() != null) {
+                    // 判断主标题
+                    if (paragraph.getStyle().equals("3") || paragraph.getStyle().equals("4") ) {
+                        subTitles.append(text).append("\n");
+                    }
+                }
+            }
+        }
+        return subTitles.toString();
+    }
+
     /**
      * 分割文档
      */

llm-ui/src/api/llm/agent.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2025-07-17 18:06:24
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-25 14:51:40
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-09-02 16:43:25
  */
 import request from '@/utils/request'
 
@@ -64,6 +64,21 @@ export function uploadFile(file, agentName) {
   })
 }
 
+// 上传单文件
+export function uploadModifyFile(file, agentName) {
+  const formData = new FormData()
+  formData.append('file', file)
+  formData.append('agentName', agentName)
+  return request({
+    url: '/llm/agent/modifyFile',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
 // 上传多文件
 export function uploadFileList(fileList, agentName) {
   const formData = new FormData()

llm-ui/src/views/llm/agent/AgentDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2025-01-01 00:00:00
  * @LastEditors: wrh
- * @LastEditTime: 2025-08-15 17:13:15
+ * @LastEditTime: 2025-09-11 15:58:35
 -->
 <template>
   <div class="agent-detail-container" v-loading="loading">
@@ -89,7 +89,7 @@
                       <el-icon>
                         <Upload />
                       </el-icon>
-                      选择文件
+                      选择招标文件
                     </el-button>
                   </el-upload>
                   <div v-if="chatFileList.length > 0" class="chat-upload-actions">
@@ -138,6 +138,41 @@
               </div>
             </div>
 
+            <!-- 文件上传提示消息 -->
+            <div v-if="techUploadDisplay" class="message-item assistant-message">
+              <div class="message-avatar">
+                <svg-icon icon-class="robot" />
+              </div>
+              <div class="message-content">
+                <div class="message-upload-area">
+                  <p class="upload-tip">请上传大纲修改后的技术文件：</p>
+                  <el-upload class="inline-upload" :action="uploadAction" :multiple="false" :auto-upload="false"
+                    :file-list="chatFileList" :on-change="handleChatFileChange" :before-upload="beforeUpload"
+                    :show-file-list="true" :limit="1">
+                    <el-button type="primary" size="small">
+                      <el-icon>
+                        <Upload />
+                      </el-icon>
+                      选择技术文件
+                    </el-button>
+                  </el-upload>
+                  <div v-if="chatFileList.length > 0" class="chat-upload-actions">
+                    <el-button size="small" type="success" @click="submitFileUpload">
+                      <el-icon>
+                        <Check />
+                      </el-icon>
+                      确认上传
+                    </el-button>
+                  </div>
+                  <div v-if="percentageDisplay">
+                    <el-progress :percentage="percentage" :stroke-width="25" :text-inside="true">
+                      <el-button text>{{ progress }}</el-button>
+                    </el-progress>
+                  </div>
+                </div>
+              </div>
+            </div>
+
             <!-- 正在输入指示器 -->
             <div v-if="isTyping" class="message-item assistant-message">
               <div class="message-avatar">
@@ -180,7 +215,7 @@
 import { ref, reactive, watch, nextTick, computed, getCurrentInstance } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { Delete, Refresh } from '@element-plus/icons-vue';
-import { getAgent, opening, uploadFile, getProcessValue } from '@/api/llm/agent';
+import { getAgent, opening, uploadFile, uploadModifyFile, getProcessValue } from '@/api/llm/agent';
 import { answer } from '@/api/llm/mcp';
 import { listTopic, getTopic, delTopic, addTopic, updateTopic } from "@/api/llm/topic";
 import { listChat, addChat, updateChat } from "@/api/llm/chat";
@@ -213,6 +248,7 @@ const chatTitle = ref('智能体新对话')
 const percentage = ref(0);
 const progress = ref("");
 const percentageDisplay = ref(false);
+const techUploadDisplay = ref(false)
 
 // 聊天内文件上传相关
 const chatFileList = ref([]) // 聊天内的文件列表
@@ -268,6 +304,10 @@ const loadTopic = async () => {
   if (res.rows.length > 0) {
     topicList.value = res.rows
   }
+  else {
+    topicList.value = res.rows
+    techUploadDisplay.value = false
+  }
 }
 
 // 加载指定话题的聊天记录（公共函数）
@@ -569,6 +609,7 @@ const submitChatUpload = async () => {
           isHtml: true // 标记这是HTML内容
         }
         chatMessages.value.push(uploadMessage);
+        techUploadDisplay.value = true;
         // ElMessage.success('文件上传成功');
         let topicRes = await addTopic({ agentId: props.agentId, topic: fileName });
         const topicId = topicRes.msg;
@@ -620,6 +661,80 @@ const submitChatUpload = async () => {
   }
 }
 
+// 聊天内文件上传提交
+const submitFileUpload = async () => {
+  if (chatFileList.value.length === 0) {
+    ElMessage.warning('请先选择文件')
+    return
+  }
+  try {
+    percentageDisplay.value = true;
+    var timer;
+    clearInterval(timer);
+    getProcess()
+    function getProcess() {
+      timer = setInterval(function () { //隔2000毫秒获取进度
+        getProcessValue().then(res => {
+          if (res.code == 200 & res.msg.includes(":")) {
+            progress.value = res.msg;
+            percentage.value = Number(res.msg.split(":")[1].replace("%", ""))
+          }
+        });
+      }, 2000)
+    }
+    const file = chatFileList.value[0].raw // 只取第一个文件
+    const fileName = file.name;
+    try {
+      const response = await uploadModifyFile(file, agentInfo.value.agentName)
+      const chatId = response.data.chatId; //获取保存后的chatId
+      // 解析返回的数据
+      if (response.data && response.data.assistantMessage) {
+        percentageDisplay.value = false;
+        // 格式化链接：在href前加上基础API地址
+        let assistantContent = formatContentLinks(response.data.assistantMessage)
+        clearInterval(timer);
+        // 添加上传成功的消息到聊天记录
+        const uploadMessage = {
+          role: 'assistant',
+          content: assistantContent,
+          timestamp: new Date().toLocaleTimeString(),
+          isHtml: true // 标记这是HTML内容
+        }
+        chatMessages.value.push(uploadMessage);
+        techUploadDisplay.value = false;
+        await updateChat({ userId: userStore.id, chatId, topicId: currentTopicId.value, output: assistantContent, outputTime: proxy.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}') });
+
+        // 清空文件上传列表
+        chatFileList.value = [];
+
+        nextTick(() => {
+          scrollToBottom()
+        })
+      }
+    }
+    catch (error) {
+      clearInterval(timer);
+      console.error('文件上传失败:', error)
+    }
+
+  } catch (error) {
+    console.error('文件上传失败:', error)
+    ElMessage.error('文件上传失败')
+
+    // 添加上传失败的消息到聊天记录
+    const errorMessage = {
+      role: 'assistant',
+      content: '文件上传失败，请检查文件格式或网络连接后重试。',
+      timestamp: new Date().toLocaleTimeString(),
+      isHtml: false
+    }
+    chatMessages.value.push(errorMessage)
+
+    nextTick(() => {
+      scrollToBottom()
+    })
+  }
+}
 // 开始新对话
 const startNewChat = () => {
   currentTopicId.value = null
@@ -1192,4 +1307,5 @@ const formatContentLinks = (content) => {
     margin-top: 16px;
     font-size: 14px;
   }
-}</style>
+}
+</style>

llm-ui/src/views/llm/knowledge/index.vue

@@ -635,7 +635,7 @@ function sendMessage() {
     if (response && Array.isArray(response)) {
       aiMessage.references = response.map(item => ({
         fileName: item.file_name,
-        similarity: item.distance,
+        similarity: item.score,
         content: item.content
       }));
     }