根据生成内容制作表格

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

@@ -3,7 +3,6 @@ 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.param.dml.DeleteParam;
 import io.milvus.v2.client.ConnectConfig;
 import io.milvus.v2.client.MilvusClientV2;
 import io.milvus.v2.common.DataType;
@@ -11,6 +10,7 @@ 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.DeleteReq;
 import io.milvus.v2.service.vector.request.QueryReq;
 import io.milvus.v2.service.vector.response.QueryResp;
 import org.springframework.stereotype.Service;
@@ -62,7 +62,7 @@ public class MilvusServiceImpl implements IMilvusService {
         schema.addField(AddFieldReq.builder()
                 .fieldName("embedding")
                 .dataType(DataType.FloatVector)
-                .dimension(5)
+                .dimension(dimension)
                 .build());
 
         // 创建索引
@@ -170,11 +170,11 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     public void removeDocument(String collectionName, String fileName) {
         loadCollectionName(collectionName);
-        DeleteParam deleteParam = DeleteParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withExpr(String.format("file_name == \"%s\"", fileName))
+        DeleteReq deleteReq = DeleteReq.builder()
+                .collectionName(collectionName)
+                .filter(String.format("file_name == \"%s\"", fileName))
                 .build();
-//        milvusClient.delete(deleteParam);
+        milvusClient.delete(deleteReq);
     }
 
     /**
@@ -182,11 +182,11 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     public void removeAllDocument(String collectionName) {
         loadCollectionName(collectionName);
-        DeleteParam deleteParam = DeleteParam.newBuilder()
-                .withCollectionName(collectionName)
-                .withExpr("id > 0")
+        DeleteReq deleteReq = DeleteReq.builder()
+                .collectionName(collectionName)
+                .filter("id > 0")
                 .build();
-//        milvusClient.delete(deleteParam);
+        milvusClient.delete(deleteReq);
     }
 
     /**

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

@@ -5,6 +5,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.regex.Pattern;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -37,12 +38,8 @@ 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.poi.xwpf.usermodel.*;
 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;
@@ -475,7 +472,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                 String paragraphText = paragraph.getText().trim();
 
                 for (String title : titles) {
-                    if (paragraphText.contains(title)) {
+                    if (paragraphText.equals(title)) {
                         titlePositions.add(i);
                         contents.add(titleContentMap.getOrDefault(title, ""));
                         break;
@@ -486,18 +483,8 @@ public class CmcAgentServiceImpl implements ICmcAgentService
             // 从后往前插入内容，避免位置偏移
             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);
-                    }
-                }
-
+                String content = contents.get(i);
+                generateWordDocument(content, document, insertPos);
                 // 更新进度
                 processValue = "章节内容写入: " + Double.parseDouble(String.format("%.2f%n", (double) (i + 1)  / titles.size() * 100)) + "%";
 
@@ -578,7 +565,11 @@ public class CmcAgentServiceImpl implements ICmcAgentService
                 "6.1.1 XX\n" +
                 "6.1.2 XX\n" +
                 "6.2 XX\n" +
-                "6.2.1 XX";
+                "6.2.1 XX\n" +
+                "6.2.2 XX\n" +
+                "6.3 XX\n" +
+                "6.3.1 XX\n" +
+                "6.3.2 XX\n";
         String content = generateAnswer(sb);
         writeTitles(content, templatePath);
         return content;
@@ -857,4 +848,245 @@ public class CmcAgentServiceImpl implements ICmcAgentService
         return splitter.split(document);
     }
 
+    public void generateWordDocument(String content, XWPFDocument document, int insertPos) {
+        try {
+            // 规范化锚点：在 insertPos 对应段落之前插入；若越界则附加到末尾
+            List<XWPFParagraph> paragraphs = document.getParagraphs();
+            if (paragraphs.isEmpty()) {
+                document.createParagraph();
+                paragraphs = document.getParagraphs();
+            }
+            if (insertPos < 0) {
+                insertPos = 0;
+            }
+            if (insertPos >= paragraphs.size()) {
+                // 在文末追加一个空段落作为锚点
+                XWPFParagraph tail = document.createParagraph();
+                paragraphs = document.getParagraphs();
+                insertPos = paragraphs.indexOf(tail);
+            }
+
+            String[] lines = content.split("\n");
+            boolean inTable = false;
+            List<String> tableLines = new ArrayList<>();
+
+            // 将内容解析为块（普通段落/表格/标题/列表项等），然后倒序插入，确保顺序正确
+            class Block {
+                String type; // para | table | h4 | list1 | list2 | imageText
+                String text;
+                List<String> table;
+                Integer h4Index;       // 预计算的四级标题编号
+                Integer list1Index;    // 预计算的一级列表编号 1),2),3)
+                Integer list2Index;    // 预计算的二级列表编号 (1),(2),(3)
+                Block(String t, String x) { type = t; text = x; }
+                Block(List<String> tbl) { type = "table"; table = new ArrayList<>(tbl); }
+                Block(String t, String x, Integer h4Idx, Integer l1Idx, Integer l2Idx) {
+                    type = t; text = x; h4Index = h4Idx; list1Index = l1Idx; list2Index = l2Idx;
+                }
+            }
+            List<Block> blocks = new ArrayList<>();
+
+            // 预计算编号（按正序扫描）
+            int h4Counter = 0;
+            int list1Counter = 0;
+            int list2Counter = 0;
+
+            for (String raw : lines) {
+                String line = raw.trim();
+                if (line.isEmpty()) {
+                    blocks.add(new Block("para", "")); // 空段落
+                    continue;
+                }
+
+                if (line.startsWith("#")) {
+                    // 跳过前三级标题
+                    continue;
+                } else if (line.startsWith("####")) {
+                    // 四级标题，编号采用预计算，保证倒序插入后视觉顺序仍递增
+                    String title = line.replace("####", "").trim();
+                    title = title.replaceFirst("^\\d+\\.\\s*", "");
+                    h4Counter++;
+                    // 碰到新小节，重置列表编号
+                    list1Counter = 0;
+                    list2Counter = 0;
+                    blocks.add(new Block("h4", title, h4Counter, null, null));
+                } else if (line.startsWith("|")) {
+                    // 表格模式开始
+                    if (!inTable) {
+                        inTable = true;
+                        tableLines.clear();
+                    }
+                    tableLines.add(line);
+                } else if (inTable && !line.startsWith("|")) {
+                    // 表格结束，收集为一个块
+                    inTable = false;
+                    if (!tableLines.isEmpty()) {
+                        blocks.add(new Block(new ArrayList<>(tableLines)));
+                        tableLines.clear();
+                    }
+                    // 当前行按普通段落处理
+                    blocks.add(new Block("para", line));
+                } else if (inTable) {
+                    tableLines.add(line);
+                } else if (line.startsWith("- **")) {
+                    // 一级加粗列表项，编号为 1),2),3) —— 预计算编号
+                    String listItem = line.replaceFirst("- \\\\*\\\\*", "").replace("**", "");
+                    listItem = listItem.replaceFirst("^\\*\\*", "").replace("**：", "：");
+                    list1Counter++;
+                    // 一级列表开始时，重置二级列表编号
+                    list2Counter = 0;
+                    Block b = new Block("list1", listItem, null, list1Counter, null);
+                    blocks.add(b);
+                } else if (line.startsWith("  - **")) {
+                    // 二级加粗列表项，编号为 (1),(2),(3) —— 预计算编号
+                    String listItem = line.replaceFirst("  - \\\\*\\\\*", "").replace("**", "");
+                    listItem = listItem.replaceFirst("^\\*\\*", "").replace("**：", "：");
+                    list2Counter++;
+                    Block b = new Block("list2", listItem, null, null, list2Counter);
+                    blocks.add(b);
+                } else if (line.startsWith("![") && line.contains("](") && line.contains(")")) {
+                    // 图片 markdown，转成说明文本
+                    String imageText = extractImageDescription(line);
+                    blocks.add(new Block("imageText", imageText));
+                } else if (line.contains("http") && (line.contains(".png") || line.contains(".jpg") || line.contains(".jpeg") || line.contains(".gif"))) {
+                    blocks.add(new Block("imageText", "图片链接: " + line));
+                } else {
+                    blocks.add(new Block("para", line));
+                }
+            }
+            // 收尾：如果文件最后是表格仍未输出
+            if (inTable && !tableLines.isEmpty()) {
+                blocks.add(new Block(new ArrayList<>(tableLines)));
+                tableLines.clear();
+            }
+
+            // 倒序插入到 insertPos 前（即插在 insertPos 之前，从后往前插保证最终顺序）
+            for (int i = blocks.size() - 1; i >= 0; i--) {
+                Block b = blocks.get(i);
+                // 每次获取最新段落列表和锚点，避免索引失效
+                paragraphs = document.getParagraphs();
+                if (insertPos >= paragraphs.size()) {
+                    XWPFParagraph tail = document.createParagraph();
+                    paragraphs = document.getParagraphs();
+                    insertPos = paragraphs.indexOf(tail);
+                }
+                XmlCursor cursor = paragraphs.get(insertPos).getCTP().newCursor();
+
+                switch (b.type) {
+                    case "h4": {
+                        XWPFParagraph p = document.insertNewParagraph(cursor);
+                        XWPFRun run = p.createRun();
+                        int num = (b.h4Index != null ? b.h4Index : 1);
+                        run.setText("6.1.1." + num + " " + b.text);
+                        run.setBold(true);
+                        run.setFontSize(14);
+                        break;
+                    }
+                    case "list1": {
+                        XWPFParagraph p = document.insertNewParagraph(cursor);
+                        XWPFRun run = p.createRun();
+                        int num = (b.list1Index != null ? b.list1Index : 1);
+                        run.setText(num + ") " + b.text);
+                        run.setFontSize(12);
+                        break;
+                    }
+                    case "list2": {
+                        XWPFParagraph p = document.insertNewParagraph(cursor);
+                        XWPFRun run = p.createRun();
+                        int num = (b.list2Index != null ? b.list2Index : 1);
+                        run.setText("   (" + num + ") " + b.text);
+                        run.setFontSize(12);
+                        break;
+                    }
+                    case "imageText": {
+                        XWPFParagraph p = document.insertNewParagraph(cursor);
+                        XWPFRun run = p.createRun();
+                        run.setText(b.text);
+                        run.setFontSize(12);
+                        run.setItalic(true);
+                        run.setColor("808080");
+                        break;
+                    }
+                    case "table": {
+                        // 解析 markdown 表格并插入在 cursor 位置
+                        List<String[]> tableData = new ArrayList<>();
+                        Pattern sep = Pattern.compile("^\\|\\s*(-+\\s*\\|\\s*)*-+\\s*\\|?$");
+                        for (String tl : b.table) {
+                            if (sep.matcher(tl).matches()) continue;
+                            String t = tl.trim();
+                            if (t.startsWith("|")) t = t.substring(1);
+                            if (t.endsWith("|")) t = t.substring(0, t.length() - 1);
+                            String[] cells = t.split("\\|", -1);
+                            for (int c = 0; c < cells.length; c++) cells[c] = cells[c].trim();
+                            tableData.add(cells);
+                        }
+                        if (!tableData.isEmpty()) {
+                            XWPFTable table = document.insertNewTbl(cursor);
+                            table.setStyleID("10");
+                            // 初始化行列
+                            int rows = tableData.size();
+                            int cols = tableData.get(0).length;
+                            while (table.getNumberOfRows() < rows) table.createRow();
+                            for (int r = 0; r < rows; r++) {
+                                XWPFTableRow tr = table.getRow(r);
+                                // 首行已存在的列数可能不足，补齐
+                                while (tr.getTableCells().size() < cols) tr.addNewTableCell();
+                                String[] rowData = tableData.get(r);
+                                for (int c = 0; c < cols; c++) {
+                                    XWPFTableCell cell = tr.getCell(c);
+                                    cell.removeParagraph(0);
+                                    XWPFParagraph cp = cell.addParagraph();
+                                    XWPFRun cr = cp.createRun();
+                                    cr.setText(rowData[c]);
+                                    if (r == 0) {
+                                        cr.setBold(true);
+                                        cp.setAlignment(ParagraphAlignment.CENTER);
+                                    } else {
+                                        cp.setAlignment(ParagraphAlignment.LEFT);
+                                    }
+                                }
+                            }
+                            table.setWidth("100%");
+                        }
+                        break;
+                    }
+                    case "para":
+                    default: {
+                        XWPFParagraph p = document.insertNewParagraph(cursor);
+                        XWPFRun run = p.createRun();
+                        if (b.text != null) {
+                            run.setText(b.text);
+                        }
+                        run.setFontSize(12);
+                        break;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 从图片Markdown格式中提取描述文本
+     */
+    private String extractImageDescription(String imageLine) {
+        // 格式: ![描述](链接)
+        if (imageLine.startsWith("![") && imageLine.contains("](") && imageLine.contains(")")) {
+            int descStart = imageLine.indexOf('[') + 1;
+            int descEnd = imageLine.indexOf(']');
+            int urlStart = imageLine.indexOf('(') + 1;
+            int urlEnd = imageLine.indexOf(')');
+
+            if (descStart > 0 && descEnd > descStart && urlStart > descEnd && urlEnd > urlStart) {
+                String description = imageLine.substring(descStart, descEnd);
+                String url = imageLine.substring(urlStart, urlEnd);
+                return "图: " + description + " (" + url + ")";
+            }
+        }
+        return imageLine; // 如果格式不正确，返回原文本
+    }
+
 }
+
+