获取上传解析进度

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

@@ -33,7 +33,6 @@ import org.noear.solon.ai.annotation.ToolMapping;
 import org.noear.solon.ai.chat.ChatModel;
 import org.noear.solon.ai.chat.ChatResponse;
 import org.noear.solon.ai.chat.ChatSession;
-import org.noear.solon.ai.chat.ChatSessionDefault;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.noear.solon.ai.chat.message.ChatMessage;
 import org.noear.solon.ai.chat.session.InMemoryChatSession;
@@ -70,10 +69,10 @@ public class McpServiceImpl implements IMcpService {
     {
             try {
                 templatePath = templatePath.replace("/dev-api/profile", Solon.cfg().getProperty("cmc.profile"));
-                title = String.join(",", extractSubTitles(templatePath, title));
+                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, title, new ArrayList<>(), llmServiceUrl);
+                return generateAnswerWithDocumentAndCollection(embeddingModel, agentName, templatePath, subTitles, new ArrayList<>());
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -98,7 +97,7 @@ public class McpServiceImpl implements IMcpService {
     /**
      * 调用LLM生成回答
      */
-    public AssistantMessage generateAnswerWithDocumentAndCollection(EmbeddingModel embeddingModel, String agentName, String templatePath, String question, List<JSONObject> contexts, String llmServiceUrl) throws IOException {
+    public AssistantMessage generateAnswerWithDocumentAndCollection(EmbeddingModel embeddingModel, 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);
@@ -110,68 +109,74 @@ public class McpServiceImpl implements IMcpService {
         List<TextSegment> segments = splitDocument(profilePath);
         List<Embedding> embeddings = embeddingModel.embedAll(segments).content();
         embeddingStore.addAll(embeddings, segments);
-        Embedding queryEmbedding = embeddingModel.embed(question).content();
-        EmbeddingSearchRequest embeddingSearchRequest = EmbeddingSearchRequest.builder()
-                .queryEmbedding(queryEmbedding)
-                .minScore(0.7)
-                .build();
-        List<EmbeddingMatch<TextSegment>> results = embeddingStore.search(embeddingSearchRequest).matches();
-        results.sort(Comparator.comparingDouble(EmbeddingMatch<TextSegment>::score).reversed());
-        for (EmbeddingMatch<TextSegment> embeddingMatch : results) {
-            String requests = embeddingMatch.embedded().toString();
-            sb.append(requests).append("\n\n");
+        StringBuilder content = new StringBuilder();
+        for (String title : titles) {
+            Embedding queryEmbedding = embeddingModel.embed(title).content();
+            EmbeddingSearchRequest embeddingSearchRequest = EmbeddingSearchRequest.builder()
+                    .queryEmbedding(queryEmbedding)
+                    .minScore(0.7)
+                    .build();
+            List<EmbeddingMatch<TextSegment>> results = embeddingStore.search(embeddingSearchRequest).matches();
+            results.sort(Comparator.comparingDouble(EmbeddingMatch<TextSegment>::score).reversed());
+            for (EmbeddingMatch<TextSegment> embeddingMatch : results) {
+                String requests = embeddingMatch.embedded().toString();
+                sb.append(requests).append("\n\n");
 
+            }
+            sb.append("针对本项目招标文件内容，补全以下章节部分：\n\n").append(title);
+            content.append(generateAnswer(sb.toString()));
         }
-        sb.append("针对本项目招标文件内容，补全以下章节部分：\n\n").append(question);
+        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");
 //        }
-        return generateAnswer(sb.toString(), question, templatePath, llmServiceUrl);
+        content.append( "招标文件分析完成，章节内容已写入【<a href='")
+                .append(templatePath.replace(Solon.cfg().getProperty("cmc.profile"), "/dev-api/profile"))
+                .append("'> 技术文件" + "</a>】，请查阅\n\n")
+                .append("如需修改，请输入技术文件已有内容的章节标题\n\n")
+                .append(extractTitles(templatePath));
+        return ChatMessage.ofAssistant(content.toString());
     }
 
     /**
      * 调用LLM生成回答
      * @return
      */
-    public AssistantMessage generateAnswer(String prompt, String question, String templatePath, String llmServiceUrl) throws IOException {
+    public String generateAnswer(String prompt) throws IOException {
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                
                 .model("Qwen2.5-1.5B-Instruct")
                 .build();
 
+
         List<ChatMessage> messages = new ArrayList<>();
         messages.add(ChatMessage.ofUser(prompt));
         ChatSession chatSession =  InMemoryChatSession.builder().messages(messages).build();
+        chatSession.addMessage(messages);
         ChatResponse response = chatModel.prompt(chatSession).call();
-        String content = response.lastChoice().getMessage().getContent() + "\n\n" +
-                "招标文件分析完成，章节内容已写入【<a href='" + templatePath.replace(Solon.cfg().getProperty("cmc.profile"), "/dev-api/profile") + "'> 技术文件" + "</a>】，请查阅\n\n" +
-                "如需修改，请输入技术文件已有内容的章节标题\n\n" +
-                extractTitles(templatePath);
-        String absolutePath = templatePath.replace("/dev-api/profile", Solon.cfg().getProperty("cmc.profile"));
-        writeContent(response.lastChoice().getMessage().getContent(), question, absolutePath);
-        return ChatMessage.ofAssistant(content);
+
+        return response.lastChoice().getMessage().getContent();
     }
 
     /**
      * 写入章节内容
      * @return
      */
-    public void writeContent(String content, String question, String absolutePath) throws IOException {
+    public void writeContent(String content, List<String> titles, String absolutePath) throws IOException {
         String[] contentLines = content.split("\n");
         Map<String, String> map = new HashMap<>();
-        String[] titles = question.split(",");
         File file = new File(absolutePath);
         FileInputStream fileInputStream = new FileInputStream(file);
         try (XWPFDocument document = new XWPFDocument(fileInputStream)) {
-            for (int i = 0; i < titles.length; i++) {
-                int startIndex = Arrays.asList(contentLines).indexOf(titles[i]);
+            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.length - 1) {
-                        int endIndex = Arrays.asList(contentLines).indexOf(titles[i + 1]);
+                    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");
                         }
@@ -185,7 +190,7 @@ public class McpServiceImpl implements IMcpService {
                 }
                 else
                     text.append(content);
-                map.put(titles[i], text.toString());
+                map.put(titles.get(i), text.toString());
             }
 
             List<Integer> positions = new ArrayList<>();
@@ -218,41 +223,63 @@ public class McpServiceImpl implements IMcpService {
     }
 
     /**
-     * 获取二级标题下三级标题列表
+     * 获取最低级别子标题列表
      */
     public List<String> extractSubTitles(String filename, String question) throws IOException {
         List<String> subTitles = new ArrayList<>();
-        boolean inTargetSection = false;
         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().trim();
-                if (paragraph.getStyle() != null) {
-                    // 判断主标题
-                    if (paragraph.getStyle().equals("3") &&
-                            text.contains(question)) {
-                        inTargetSection = true;
-                        continue;
-                    }
 
-                    // 如果已经在目标节中，收集标题3级别的子标题
-                    if (inTargetSection) {
-                        if (paragraph.getStyle().equals("4")) {
+            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);
                         }
-                        // 遇到下一个Heading1则退出
-                        else if (paragraph.getStyle().equals("3")) {
-                            break;
-                        }
+                    } else {
+                        // 遇到同级或更高级别的标题，停止搜索
+                        break;
                     }
+                } else if (text.equals(question)) {
+                    foundParent = true;
+                    parentLevel = level;
                 }
             }
+
+
+            return subTitles;
+
         }
-        if (subTitles.size() == 0)
-            subTitles.add(question);
-        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; // 存在更低级别的标题，不是叶子节点
+
+    }
     /**
      * 获取二、三级标题列表
      */

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

@@ -99,6 +99,14 @@ public class CmcAgentController extends BaseController
         return success(cmcAgentService.uploadDocumentList(fileList, agentName));
     }
 
+    /**
+     * 获取上传进度
+     */
+    @GetMapping(value = "/getProcess")
+    public AjaxResult getProcess() {
+        return success(cmcAgentService.getProcess());
+    }
+
     /**
      * 新增智能体
      */

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

@@ -61,33 +61,6 @@ public class McpController extends BaseController
                     .withHost("192.168.28.188")
                     .withPort(19530)
                     .build());
-//
-//    /**
-//     * 同步问答
-//     * @return
-//     */
-//    @GetMapping("/answer")
-//    public AssistantMessage answer(String question) throws IOException {
-//        McpClientProvider clientProvider = McpClientProvider.builder()
-//                .apiUrl("http://localhost:8080/llm/mcp/sse")
-//                .build();
-//        ChatModel chatModel = ChatModel.of(llmServiceUrl)
-//                .model("Qwen2.5-1.5B-Instruct")
-//                .defaultToolsAdd(clientProvider)
-//                .build();
-//        ChatResponse response = chatModel.prompt(question).call();
-//        String resultContent = response.lastChoice().getMessage().getResultContent();
-//        AssistantMessage assistantMessage = new AssistantMessage(resultContent);
-//        if (resultContent.startsWith("<tool_call>")) {
-//            String content = resultContent.replace("<tool_call>\n", "").replace("\n</tool_call>", "");
-//            JSONObject jsonObject = JSONObject.parseObject(content);
-//            String name = jsonObject.getString("name");
-//            JSONObject arguments = jsonObject.getJSONObject("arguments");
-//            resultContent = clientProvider.callToolAsText(name, arguments).getContent();
-//            assistantMessage = new AssistantMessage(resultContent);
-//        }
-//        return assistantMessage;
-//    }
 
     /**
      * 自动调用mcp工具问答
@@ -125,6 +98,13 @@ public class McpController extends BaseController
                 arguments.put("collectionName", "technical");
                 String agentName = cmcAgentService.selectCmcAgentByAgentId(cmcTopicService.selectCmcTopicByTopicId(topicId).getAgentId()).getAgentName();
                 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);
@@ -134,42 +114,5 @@ public class McpController extends BaseController
         return assistantMessage;
     }
 
-    /**
-     * 调用LLM+RAG（外部文件+知识库）生成回答
-     */
-    @GetMapping("/answerWithDocument")
-    public Flux<AssistantMessage> answerWithDocumentAndCollection(String collectionName, String topicId, String question) throws IOException
-    {
-        question = String.join(",", langChainMilvusService.extractSubTitles(RuoYiConfig.getProfile() + "/upload/agent/template/technical.docx", question));
-        List<JSONObject> requests = langChainMilvusService.retrieveFromMilvus(milvusClient, embeddingModel, collectionName, question, 10);
-        return langChainMilvusService.generateAnswerWithDocumentAndCollection(embeddingModel, topicId, question, requests, llmServiceUrl);
-    }
-
-    /**
-     * 根据招标文件要求编写投标文件技术方案
-     * @return
-     */
-    @GetMapping("/tech")
-    public AssistantMessage tech(MultipartFile file) throws IOException {
-        McpClientProvider clientProvider = McpClientProvider.builder()
-                    .apiUrl("http://localhost:8080/llm/mcp/sse")
-                    .build();
-        ChatModel chatModel = ChatModel.of(llmServiceUrl)
-                
-                .model("DeepSeek-R1-Distill-Qwen-1.5B")
-                .defaultToolsAdd(clientProvider)
-                .build();
-        Map<String,Object> path = new HashMap<>();
-        String content = clientProvider.callToolAsText("openDocument", path).getContent();
-        Map<String,Object> request = new HashMap<>();
-        request.put("request", content);
-        List<ChatMessage> messages = clientProvider.getPromptAsMessages("askQuestion", request);
-        ChatResponse response = chatModel.prompt(messages).call();
-        System.out.println(response.getChoices().get(0).getMessage());
-        Map<String,Object> write = new HashMap<>();
-        write.put("resultContent", response.getChoices().get(0).getMessage().getResultContent());
-        String res = clientProvider.callToolAsText("writeTechnicalPlan", write).getContent();
-        return response.getChoices().get(0).getMessage();
-    }
 
 }

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

@@ -55,6 +55,13 @@ public interface ICmcAgentService
      */
     public String uploadDocumentList(MultipartFile[] fileList, String agentName) throws IOException;
 
+    /**
+     * 获取进度
+     *
+     * @return 结果
+     */
+    public String getProcess();
+
     /**
      * 新增智能体
      * 

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

@@ -1,6 +1,9 @@
 package com.ruoyi.llm.service.impl;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -70,6 +73,8 @@ public class CmcAgentServiceImpl implements ICmcAgentService
     @Autowired
     private CmcChatMapper cmcChatMapper;
 
+    private String processValue = "";
+
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
     private static final String llmServiceUrl = "http://192.168.28.188:8000/v1/chat/completions";
@@ -136,6 +141,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         File transferFile = new File(profilePath + "/" + file.getOriginalFilename());
         if (!transferFile.exists())
             file.transferTo(transferFile);
+        processValue = "上传完成:100%";
         CmcDocument cmcDocument = new CmcDocument();
         cmcDocument.setDocumentId(new SnowFlake().generateId());
         cmcDocument.setChatId(chatId);
@@ -154,6 +160,8 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                     .replace(filenameSplit[filenameSplit.length - 2], filenameSplit[filenameSplit.length - 2] + "_" + agentName);
             if (file.getOriginalFilename().endsWith(".doc"))
                 outputFilename = outputFilename.replace(".doc", ".docx");
+            Path outputFilePath = Paths.get(RuoYiConfig.getProfile() + outputFilename);
+            Files.deleteIfExists(outputFilePath);
             InputStream fileInputStream = new FileInputStream(RuoYiConfig.getProfile() + "/upload/agent/template/technical.docx");
             try (XWPFDocument doc = new XWPFDocument(fileInputStream)) {
                 // 保存文档到本地文件系统
@@ -163,10 +171,11 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             }
             String chapters = generateAnswerWithDocument(profilePath + "/" + file.getOriginalFilename(),
                     RuoYiConfig.getProfile() + outputFilename, "工作大纲");
-            message = "好的，我已经收到您上传的招标文件，我将给您提供技术文件模板，您可点击进行预览：" +
-                    "【<a href='/profile" + outputFilename + "'> 模版 " + "</a>】\n\n" +
-                    chapters + "\n\n" +
-                    "请问您需要哪个章节撰写的帮助？";
+            message = "好的，我已经收到您上传的招标文件。\n\n"+ chapters + "\n\n" +
+                    "若您对章节标题有异议，请打开" + "【<a href='/profile" + outputFilename + "'> 技术文件 " + "</a>】" + "进行修改，后续将根据修改后的章节标题，帮您生成对应章节内容。\n\n" +
+                    "请问您需要哪个章节撰写的帮助？\n" +
+                    "如需单个章节，您可以复制章节标题名称至对话输入框，发送给我；如需全部章节，请输入 技术文件 。\n\n" +
+                    "思考时间可能较长，请耐心等待，若提示未检测工具，麻烦重新发送，谢谢！\n";
         }
         jsonObject.put("assistantMessage", message);
         return jsonObject;
@@ -191,6 +200,15 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         return "上传成功";
     }
 
+    /**
+     * 上传多文件
+     *
+     * @return 结果
+     */
+    public String getProcess() {
+        return processValue;
+    }
+
     /**
      * 新增智能体
      * 
@@ -262,6 +280,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             String requests = embeddingMatch.embedded().toString();
             sb.append(requests).append("\n\n");
         }
+        //根据招标文件工作大纲要求生成二级标题
         sb.append("请根据上述招标文件内容，严格按以下格式列出").append(question).append(":\n")
                 .append("6.1 XX\n" +
                 "6.2 XX\n" +
@@ -274,25 +293,42 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      * @return
      */
     public String writeChapters(String prompt, String templatePath) throws IOException {
-        String chapter2 = generateAnswer(prompt);
-
-        StringBuilder sb = new StringBuilder("二级标题如下：\n" + chapter2 + "\n 请根据参考内容编排三级标题，严格按以下格式列出")
-                .append(":\n").append("6.1.1 XX\n" +
-                        "6.1.2 XX\n" +
-                        "6.1.3 XX");
-        List<JSONObject> contexts = retrieveFromMilvus("technical", chapter2, 10);
-        for (JSONObject context : contexts) {
-            sb.append("参考内容").append(": ")
-                    .append(context.getString("content")).append("\n\n");
+        String chapters2 = generateAnswer(prompt);
+
+        //根据技术文档知识库生成二级标题下三级标题
+        StringBuilder chapter3 = new StringBuilder();
+        List<String> chapter2List = new ArrayList<>();
+        String[] contentLines = chapters2.split("\n");
+        for (String line : contentLines) {
+            if (line.contains("6."))
+                chapter2List.add(line.replace("*", "").replace("#", "").replace("-", ""));
+        }
+        for (String chapter2 : chapter2List) {
+            String orderNum = chapter2.split(" ")[0];
+            StringBuilder sb = new StringBuilder("二级标题如下：\n").append(chapter2)
+                    .append("\n 请根据参考内容编排三级标题，严格按以下格式列出：\n")
+                    .append(orderNum).append(".1 XX\n")
+                    .append(orderNum).append(".2 XX\n")
+                    .append(orderNum).append(".3 XX\n");
+
+            List<JSONObject> contexts = retrieveFromMilvus("technical", chapter2, 10);
+            for (JSONObject context : contexts) {
+                sb.append("参考内容").append(": ")
+                        .append(context.getString("content")).append("\n\n");
+            }
+            chapter3.append(generateAnswer(sb.toString()));
+            processValue = "分析中:" + Double.parseDouble(String.format("%.2f%n", (double) (chapter2List.indexOf(chapter2) + 1)  / chapter2List.size() * 100)) + "%";
         }
-        String chapter3 = generateAnswer(sb.toString());
-        sb = new StringBuilder("二级标题如下：\n" + chapter2 + "\n 三级标题如下：" + chapter3 + "帮我合并二三级标题，严格按以下格式列出")
-                .append(":\n").append("6.1 XX\n" +
-                        "6.1.1 XX\n" +
-                        "6.1.2 XX\n"+
-                        "6.2 XX\n" +
-                        "6.3 XX");
-        String content = generateAnswer(sb.toString());
+        String sb = "二级标题如下：\n" + chapters2 +
+                "\n 三级标题如下：" + chapter3 +
+                "帮我合并三级标题，严格按以下格式列出：\n" +
+                "6 技术文件\n" +
+                "6.1 XX\n" +
+                "6.1.1 XX\n" +
+                "6.1.2 XX\n" +
+                "6.2 XX\n" +
+                "6.2.1 XX";
+        String content = generateAnswer(sb);
         writeContent(content, templatePath);
         return content;
     }
@@ -302,7 +338,9 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      * @return
      */
     public String generateAnswer(String prompt) throws IOException {
-        ChatModel chatModel = ChatModel.of(llmServiceUrl).model("Qwen2.5-1.5B-Instruct").build();
+        ChatModel chatModel = ChatModel.of(llmServiceUrl)
+                .model("Qwen2.5-1.5B-Instruct")
+                .build();
 
         List<ChatMessage> messages = new ArrayList<>();
         messages.add(ChatMessage.ofUser(prompt));
@@ -383,15 +421,14 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         try (XWPFDocument document = new XWPFDocument(fileInputStream)) {
            for (int i = 0; i < chapters.size(); i++) {
                XWPFParagraph contentParagraph = document.createParagraph();
-               contentParagraph.setStyle("3");
-               boolean title2 = chapters.get(i).indexOf(".") == chapters.get(i).lastIndexOf(".");
-               if (!title2)
-                   contentParagraph.setStyle("4");
+               int dotNum = chapters.get(i).split("\\.").length - 1;
+               contentParagraph.setStyle(String.valueOf(dotNum + 2));
 
                XWPFRun run = contentParagraph.createRun();
-               if (chapters.get(i).contains(" "))
+               if (chapters.get(i).split(" ").length > 1)
                    run.setText(chapters.get(i).split(" ")[1]);
-               run.addBreak();
+               if (dotNum > 1)
+                   run.addBreak();
                if (i < chapters.size() - 1 && chapters.get(i + 1).indexOf(".") == chapters.get(i + 1).lastIndexOf("."))
                    run.addBreak(BreakType.PAGE);
            }
@@ -403,7 +440,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
     }
 
     /**
-     * 检索知识库
+     * 分割文档
      */
     private List<TextSegment> splitDocument(File transferFile) throws IOException {
         // 加载文档

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

@@ -81,6 +81,14 @@ export function uploadFileList(fileList, agentName) {
   })
 }
 
+// 获取上传进度
+export function getProcessValue() {
+  return request({
+    url: '/llm/agent/getProcess',
+    method: 'get'
+  })
+}
+
 //获取开场白, agentName：智能体名称
 export function opening(agentName) {
   return request({

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2025-01-01 00:00:00
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-01 14:33:27
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-08-15 17:13:15
 -->
 <template>
   <div class="agent-detail-container" v-loading="loading">
@@ -100,6 +100,11 @@
                       确认上传
                     </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>
@@ -122,8 +127,11 @@
                 <div v-else class="message-text">{{ message.content }}</div>
                 <div class="message-actions">
                   <span class="message-time">{{ message.timestamp }}</span>
-                  <el-button v-if="message.canRetry" type="text" size="small" @click="retryMessage(message)" class="retry-btn">
-                    <el-icon><Refresh /></el-icon>
+                  <el-button v-if="message.canRetry" type="text" size="small" @click="retryMessage(message)"
+                    class="retry-btn">
+                    <el-icon>
+                      <Refresh />
+                    </el-icon>
                     重新发送
                   </el-button>
                 </div>
@@ -172,7 +180,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 } from '@/api/llm/agent';
+import { getAgent, opening, uploadFile, 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";
@@ -202,6 +210,9 @@ const messagesContainer = ref(null)
 const topicList = ref([])
 const currentTopicId = ref(null)
 const chatTitle = ref('智能体新对话')
+const percentage = ref(0);
+const progress = ref("");
+const percentageDisplay = ref(false);
 
 // 聊天内文件上传相关
 const chatFileList = ref([]) // 聊天内的文件列表
@@ -409,12 +420,12 @@ const sendMessage = async (retryContent = null) => {
     canRetry: false // 初始时不显示重试按钮
   }
   chatMessages.value.push(userMessage)
-  
+
   // 只有在非重试模式下才清空输入框
   if (!retryContent) {
     inputMessage.value = ''
   }
-  
+
   isTyping.value = true
 
   nextTick(() => {
@@ -429,11 +440,11 @@ const sendMessage = async (retryContent = null) => {
     })
     let content = JSON.parse(response.resultContent).content;
     console.log(content);
-    
+
     // 检查是否是默认的失败回复
     const defaultFailureMessage = '抱歉，我暂时无法回答这个问题。';
-    const finalContent = content || defaultFailureMessage;
-    
+    const finalContent = formatContentLinks(content) || defaultFailureMessage;
+
     // 添加助手回复
     const assistantMessage = {
       role: 'assistant',
@@ -442,7 +453,7 @@ const sendMessage = async (retryContent = null) => {
       isHtml: true // 普通聊天消息使用HTML渲染
     }
     chatMessages.value.push(assistantMessage)
-    
+
     // 如果是默认失败回复，为用户消息添加重试按钮
     if (finalContent === defaultFailureMessage) {
       userMessage.canRetry = true
@@ -459,7 +470,7 @@ const sendMessage = async (retryContent = null) => {
       isHtml: false
     }
     chatMessages.value.push(errorMessage)
-    
+
     // 为用户消息添加重试按钮
     userMessage.canRetry = true
   } finally {
@@ -475,18 +486,18 @@ const retryMessage = async (message) => {
   // 找到当前消息在数组中的索引
   const messageIndex = chatMessages.value.findIndex(msg => msg === message)
   if (messageIndex === -1) return
-  
+
   // 获取原始消息内容
   const originalContent = message.originalContent || message.content
   if (!originalContent || typeof originalContent !== 'string') {
     ElMessage.error('无法获取原始消息内容')
     return
   }
-  
+
   // 移除从当前用户消息开始的所有消息（包括后续的助手回复）
   const messagesToKeep = chatMessages.value.slice(0, messageIndex)
   chatMessages.value = messagesToKeep
-  
+
   // 重新发送原始消息
   await sendMessage(originalContent)
 }
@@ -525,50 +536,71 @@ const submitChatUpload = async () => {
     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;
-    const response = await uploadFile(file, agentInfo.value.agentName)
-    const chatId = response.data.chatId; //获取保存后的chatId
-    // 解析返回的数据
-    let assistantContent = '文件上传成功！'
-    if (response.data && response.data.assistantMessage) {
-      // 格式化链接：在href前加上基础API地址
-      assistantContent = formatContentLinks(response.data.assistantMessage)
-    }
-
-    // 添加上传成功的消息到聊天记录
-    const uploadMessage = {
-      role: 'assistant',
-      content: assistantContent,
-      timestamp: new Date().toLocaleTimeString(),
-      isHtml: true // 标记这是HTML内容
-    }
-    chatMessages.value.push(uploadMessage);
-    ElMessage.success('文件上传成功');
-    let topicRes = await addTopic({ agentId: props.agentId, topic: fileName });
-    const topicId = topicRes.msg;
-    await updateChat({ userId: userStore.id, chatId, topicId, output: assistantContent, outputTime: proxy.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}') });
-
-    // 刷新话题列表
-    await loadTopic();
+    try {
+      const response = await uploadFile(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);
+        // ElMessage.success('文件上传成功');
+        let topicRes = await addTopic({ agentId: props.agentId, topic: fileName });
+        const topicId = topicRes.msg;
+        await updateChat({ userId: userStore.id, chatId, topicId, output: assistantContent, outputTime: proxy.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}') });
+
+        // 刷新话题列表
+        await loadTopic();
+
+        // 激活当前话题并加载聊天记录
+        currentTopicId.value = topicId;
+        chatTitle.value = fileName;
+
+        // 重新加载该话题的聊天记录以显示文件相关内容
+        try {
+          await loadChatMessages(topicId)
+        } catch (error) {
+          console.error('加载话题聊天记录失败:', error)
+        }
 
-    // 激活当前话题并加载聊天记录
-    currentTopicId.value = topicId;
-    chatTitle.value = fileName;
+        // 清空文件上传列表
+        chatFileList.value = [];
 
-    // 重新加载该话题的聊天记录以显示文件相关内容
-    try {
-      await loadChatMessages(topicId)
-    } catch (error) {
-      console.error('加载话题聊天记录失败:', error)
+        nextTick(() => {
+          scrollToBottom()
+        })
+      }
+    }
+    catch (error) {
+      clearInterval(timer);
+      console.error('文件上传失败:', error)
     }
 
-    // 清空文件上传列表
-    chatFileList.value = [];
-
-    nextTick(() => {
-      scrollToBottom()
-    })
   } catch (error) {
     console.error('文件上传失败:', error)
     ElMessage.error('文件上传失败')
@@ -905,7 +937,7 @@ const formatContentLinks = (content) => {
       flex: 1;
       padding: 16px 20px;
       overflow-y: auto;
-      max-height: 475px;
+      max-height: 900px;
 
       .message-item {
         display: flex;
@@ -929,17 +961,17 @@ const formatContentLinks = (content) => {
               background: #1890ff;
               color: white;
             }
-            
+
             .message-actions {
               justify-content: flex-end;
-              
+
               .retry-btn {
                 order: -1; // 将重试按钮放在时间前面
                 margin-left: 0;
                 margin-right: 8px;
                 color: #1890ff;
                 background-color: rgba(255, 255, 255, 0.9);
-                
+
                 &:hover {
                   background-color: white;
                 }
@@ -1030,22 +1062,22 @@ const formatContentLinks = (content) => {
             align-items: center;
             justify-content: space-between;
             margin-top: 4px;
-            
+
             .message-time {
               font-size: 11px;
               color: #999;
             }
-            
+
             .retry-btn {
               font-size: 11px;
               color: #1890ff;
               padding: 2px 6px;
               margin-left: 8px;
-              
+
               &:hover {
                 background-color: #f0f8ff;
               }
-              
+
               .el-icon {
                 font-size: 12px;
                 margin-right: 2px;
@@ -1160,5 +1192,4 @@ const formatContentLinks = (content) => {
     margin-top: 16px;
     font-size: 14px;
   }
-}
-</style>
+}</style>