标书智能体修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java

@@ -117,8 +117,7 @@ public class CmcContractController extends BaseController
                             yearAmountI = yearAmountI.add(contract.getAmount());
                             if (contract.getPaidAmount() != null) {
                                 paidAmountI = paidAmountI.add(contract.getPaidAmount());
-                                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                                    paidYearCountI++;
+                                paidYearCountI++;
                             }
                         }
                     }
@@ -156,8 +155,7 @@ public class CmcContractController extends BaseController
                             monthAmount = monthAmount.add(contract.getAmount());
                             if (contract.getPaidAmount() != null) {
                                 paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
-                                if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                                    paidMonthCount++;
+                                paidMonthCount++;
                             }
                         }
                     }
@@ -198,8 +196,7 @@ public class CmcContractController extends BaseController
                         monthAmount = monthAmount.add(contract.getAmount());
                         if (contract.getPaidAmount() != null) {
                             paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
-                            if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                                paidMonthCount++;
+                            paidMonthCount++;
                         }
                     }
                 }
@@ -213,8 +210,7 @@ public class CmcContractController extends BaseController
                     totalAmount = totalAmount.add(contract.getAmount());
                     if (contract.getPaidAmount() != null) {
                         paidTotalAmount = paidTotalAmount.add(contract.getPaidAmount());
-                        if (contract.getPaidAmount().compareTo(contract.getAmount()) >= 0)
-                            paidTotalCount++;
+                        paidTotalCount++;
                     }
                 }
             }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSubContractController.java

@@ -137,8 +137,7 @@ public class CmcSubContractController extends BaseController
                             yearAmountI = yearAmountI.add(contract.getSubAmount());
                             if (contract.getPaidAmount() != null) {
                                 paidAmountI = paidAmountI.add(contract.getPaidAmount());
-                                if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
-                                    paidYearCountI++;
+                                paidYearCountI++;
                             }
                         }
                     }
@@ -176,8 +175,7 @@ public class CmcSubContractController extends BaseController
                             monthAmount = monthAmount.add(contract.getSubAmount());
                             if (contract.getPaidAmount() != null) {
                                 paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
-                                if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
-                                    paidMonthCount++;
+                                paidMonthCount++;
                             }
                         }
                     }
@@ -218,8 +216,7 @@ public class CmcSubContractController extends BaseController
                         monthAmount = monthAmount.add(contract.getSubAmount());
                         if (contract.getPaidAmount() != null) {
                             paidMonthAmount = paidMonthAmount.add(contract.getPaidAmount());
-                            if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
-                                paidMonthCount++;
+                            paidMonthCount++;
                         }
                     }
                 }
@@ -233,8 +230,7 @@ public class CmcSubContractController extends BaseController
                     totalAmount = totalAmount.add(contract.getSubAmount());
                     if (contract.getPaidAmount() != null) {
                         paidTotalAmount = paidTotalAmount.add(contract.getPaidAmount());
-                        if (contract.getPaidAmount().compareTo(contract.getSubAmount()) >= 0)
-                            paidTotalCount++;
+                        paidTotalCount++;
                     }
                 }
             }

oa-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -57,6 +57,24 @@ public class RyTask
         }
     }
 
+    public void winDump(String dir, String username, String password, String databaseName) throws Exception {
+        File file = new File(dir);
+        if (!file.exists()) {
+            file.mkdir();
+        }
+        String sqlName = new SimpleDateFormat("yyyyMMdd").format(new Date());
+        File datafile = new File(file + File.separator + sqlName + ".sql");
+        if (datafile.exists()) {
+            System.out.println(sqlName + "文件名已存在，请更换");
+            return;
+        }
+        String mysqldump = "mysqldump -u " + username + " -p" + password + " " + databaseName;
+        Process exec = Runtime.getRuntime().exec(new String[]{"cmd", "/c", mysqldump + " > " + datafile.getAbsolutePath()});
+        if (exec.waitFor() == 0) {
+            System.out.println("数据库备份成功,备份路径为：" + datafile);
+        }
+    }
+
     public void deleteSysOperLog() {
         sysOperLogService.deleteOperLogJob();
         sysLogininforService.deleteLoginInfoJob();

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/domain/Block.java

@@ -0,0 +1,103 @@
+package com.ruoyi.llm.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 文档块类型，用于解析 markdown 内容并转换为 Word 格式
+ */
+public class Block {
+    private String type; // para | table | heading | list1 | list2 | imageText | boldOnly | numberedBold
+    private String text;
+    private List<String> table;
+    private Integer headingLevel; // 标题级别（4、5、6 对应 h4、h5、h6）
+    private String boldText; // 加粗文本部分
+    private String suffixText; // 后缀文本（如冒号及后续内容）
+    private String numberPrefix; // 数字前缀，如 "1. "
+
+    public Block(String t, String x) {
+        type = t;
+        text = x;
+    }
+
+    public Block(List<String> tbl) {
+        type = "table";
+        table = new ArrayList<>(tbl);
+    }
+
+    public Block(String t, String x, Integer level) {
+        type = t;
+        text = x;
+        headingLevel = level;
+    }
+
+    public Block(String t, String bold, String suffix) {
+        type = t;
+        boldText = bold;
+        suffixText = suffix;
+    }
+
+    public Block(String t, String numPrefix, String bold, String suffix) {
+        type = t;
+        numberPrefix = numPrefix;
+        boldText = bold;
+        suffixText = suffix;
+    }
+    
+    // Getters and Setters
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+    
+    public List<String> getTable() {
+        return table;
+    }
+
+    public void setTable(List<String> table) {
+        this.table = table;
+    }
+    
+    public Integer getHeadingLevel() {
+        return headingLevel;
+    }
+
+    public void setHeadingLevel(Integer headingLevel) {
+        this.headingLevel = headingLevel;
+    }
+
+    public String getBoldText() {
+        return boldText;
+    }
+
+    public void setBoldText(String boldText) {
+        this.boldText = boldText;
+    }
+
+    public String getSuffixText() {
+        return suffixText;
+    }
+
+    public void setSuffixText(String suffixText) {
+        this.suffixText = suffixText;
+    }
+
+    public String getNumberPrefix() {
+        return numberPrefix;
+    }
+
+    public void setNumberPrefix(String numberPrefix) {
+        this.numberPrefix = numberPrefix;
+    }
+}

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

@@ -58,6 +58,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.llm.domain.Block;
 import com.ruoyi.llm.domain.ChapterStreamResponse;
 
 import java.io.*;
@@ -201,7 +202,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
 
             // 提取输出文件名（不含路径）
             String outputFileNameOnly = new File(outputFilename).getName();
-            
+
             // 生成详细目录结构（包含二三级标题）并写入文件
             JSONArray detailedDirectoryTree = generateDetailedDirectory(outputFileNameOnly, agentName, segments);
             String detailedDirectory = buildDirectoryText(detailedDirectoryTree);
@@ -324,7 +325,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
 
         // 保存文档到本地文件系统
         try (InputStream fileInputStream = new FileInputStream(profilePath + "/" + file.getOriginalFilename());
-             XWPFDocument doc = new XWPFDocument(fileInputStream)) {
+                XWPFDocument doc = new XWPFDocument(fileInputStream)) {
             try (FileOutputStream out = new FileOutputStream(profilePath + "/" + file.getOriginalFilename())) {
                 doc.write(out);
             }
@@ -732,14 +733,17 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
 
         // 输出格式要求
         prompt.append("【输出格式】:\n");
-        prompt.append("请直接输出章节的正文内容（不要包含标题），正文内容为总-分结构，别写成总-分-总结构。");
+        prompt.append("请直接输出章节的正文内容（不要包含三级标题），正文内容为总-分结构，别写成总-分-总结构。");
         prompt.append("【标题编号规范】:\n");
-        prompt.append("如果需要在章节内添加子标题，必须严格遵循层级编号格式（如当前章节为6.1.1，则子标题应为6.1.1.1、6.1.1.2、6.1.1.3等）。\n");
-        // prompt.append("严禁使用以下编号格式：\n");
-        // prompt.append("- 阿拉伯数字加点或顿号（如 1. 2. 3. 或 1、2、3、）\n");
-        // prompt.append("- 带括号的数字（如 1）2）3）或 (1)(2)(3)）\n");
-        // prompt.append("- 中文数字（如 一、二、三 或 第一、第二、第三）\n");
-        // prompt.append("- 字母编号（如 A. B. C. 或 a) b) c)）\n");
+        prompt.append("如果需要在章节内添加子标题，必须严格遵循层级编号格式，最多到第六级标题（如6.1,6.1.1,6.1.1.1,6.1.1.1.1,6.1.1.1.1.1,6.1.1.1.1.1.1），且子标题后应添加换行符。\n");
+        prompt.append("各级标题下，正文文字叙述部份的分点说明序号分为六级，\n");
+        prompt.append("第一级按阿拉伯数字序号编排，如1,2,3\n");
+        prompt.append("第二级按带右圆括号的阿拉伯数字序号编排，如1）,2）,3）\n");
+        prompt.append("第三级按带圆括号的英文小写字母顺序编排（1）,（2）,（3）\n");
+        prompt.append("第四级按英文小写字母顺序编排，如a,b,c\n");
+        prompt.append("第五级按带右圆括号的英文小写字母顺序编排，如a）,b）,c）\n");
+        prompt.append("第六级按带圆括号的英文小写字母顺序编排，如（a）,（b）,（c）\n");
+        prompt.append("分点序号前均空两个汉字，无括号后空一个汉字，有括号的紧挨编写内容，所有的括号均为全角符号。\n");
         prompt.append("所有子标题必须基于父标题编号逐级递增，保持编号体系的一致性。\n\n");
 
         prompt.append("请开始生成当前章节 ").append(title).append(" 的详细内容：");
@@ -802,8 +806,24 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                 }
             }
 
-            // 从后往前处理，避免位置偏移
-            for (int i = titlePositions.size() - 1; i >= 0; i--) {
+            // 按标题在文档中的位置降序排序（与 contents 同步排序），确保从后往前处理避免索引偏移
+            if (titlePositions.size() > 1) {
+                for (int i = 0; i < titlePositions.size() - 1; i++) {
+                    for (int j = i + 1; j < titlePositions.size(); j++) {
+                        if (titlePositions.get(i) < titlePositions.get(j)) {
+                            int tmpPos = titlePositions.get(i);
+                            titlePositions.set(i, titlePositions.get(j));
+                            titlePositions.set(j, tmpPos);
+                            String tmpContent = contents.get(i);
+                            contents.set(i, contents.get(j));
+                            contents.set(j, tmpContent);
+                        }
+                    }
+                }
+            }
+
+            // 统一处理所有匹配到的标题：先删除旧内容，再插入新内容
+            for (int i = 0; i < titlePositions.size(); i++) {
                 int titlePos = titlePositions.get(i);
                 String content = contents.get(i);
 
@@ -825,15 +845,12 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                 // 在标题后面插入新内容
                 int insertPos = titlePos + 1;
                 generateWordDocument(content, document, insertPos);
-
-                // 更新进度
             }
-
             // 保存文档（此时输入流已关闭）
             try (FileOutputStream out = new FileOutputStream(absolutePath)) {
                 document.write(out);
             }
-            
+
             // 标记写入完成
             processValue = "文档写入完成:100%";
         } finally {
@@ -846,12 +863,13 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
     /**
      * 调用LLM生成目录结构
      */
-    public JSONArray generateDetailedDirectory(String fileName, String agentName, List<TextSegment> segments) throws IOException {
+    public JSONArray generateDetailedDirectory(String fileName, String agentName, List<TextSegment> segments)
+            throws IOException {
         StringBuilder sb = new StringBuilder("招标文件内容：\n\n");
         InMemoryEmbeddingStore<TextSegment> embeddingStore = new InMemoryEmbeddingStore<>();
         List<Embedding> embeddings = embeddingModel.embedAll(segments).content();
         embeddingStore.addAll(embeddings, segments);
-        Embedding queryEmbedding = embeddingModel.embed("工作大纲/工作范围/招标范围/服务范围").content();
+        Embedding queryEmbedding = embeddingModel.embed("技术文件工作大纲要求").content();
         EmbeddingSearchRequest embeddingSearchRequest = EmbeddingSearchRequest.builder()
                 .queryEmbedding(queryEmbedding)
                 .maxResults(5)
@@ -865,7 +883,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
         }
         // 根据招标文件工作大纲要求生成二级标题
         sb.append("请基于上述招标文件中提到的")
-                .append("工作大纲/工作范围/招标范围/服务范围")
+                .append("技术文件工作大纲要求")
                 .append("，先列出二级章节标题，严格按以下格式，仅输出标题列表：\n")
                 .append("6.1 XX\n" +
                         "6.2 XX\n" +
@@ -1106,25 +1124,27 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
     }
 
     // /**
-    //  * 调用LLM生成回答
-    //  *
-    //  * @return
-    //  */
+    // * 调用LLM生成回答
+    // *
+    // * @return
+    // */
     // public String generateAnswer(String prompt) throws IOException {
-    //     ChatModel chatModel = ChatModel.of("https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions")
-    //             .model("qwen3-vl-32b-instruct")
-    //             .apiKey("sk-750a17cc723847f28b31fa1bc17c255c")
-    //             .timeout(Duration.ofSeconds(240))
-    //             .build();
-
-    //     List<ChatMessage> messages = new ArrayList<>();
-    //     messages.add(ChatMessage.ofUser(prompt));
-    //     ChatSession chatSession = InMemoryChatSession.builder().messages(messages).build();
-
-    //     Prompt prompt1 = Prompt.of(prompt).attrPut("session", chatSession);
-    //     ChatResponse response = chatModel.prompt(prompt1).call();
-    //     String content = response.lastChoice().getMessage().getContent();
-    //     return content;
+    // ChatModel chatModel =
+    // ChatModel.of("https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions")
+    // .model("qwen3-vl-32b-instruct")
+    // .apiKey("sk-750a17cc723847f28b31fa1bc17c255c")
+    // .timeout(Duration.ofSeconds(240))
+    // .build();
+
+    // List<ChatMessage> messages = new ArrayList<>();
+    // messages.add(ChatMessage.ofUser(prompt));
+    // ChatSession chatSession =
+    // InMemoryChatSession.builder().messages(messages).build();
+
+    // Prompt prompt1 = Prompt.of(prompt).attrPut("session", chatSession);
+    // ChatResponse response = chatModel.prompt(prompt1).call();
+    // String content = response.lastChoice().getMessage().getContent();
+    // return content;
     // }
 
     /**
@@ -1172,8 +1192,9 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
     /**
      * 流式调用LLM生成回答 - 使用Flux（包含usage信息）
      * 
-     * @param prompt 提示词
-     * @param tokenUsage 用于收集token用量的数组 [promptTokens, completionTokens, totalTokens]
+     * @param prompt     提示词
+     * @param tokenUsage 用于收集token用量的数组 [promptTokens, completionTokens,
+     *                   totalTokens]
      * @return Flux<String> 流式输出（包含内容）
      */
     public Flux<String> generateAnswerFluxWithUsage(String prompt, AtomicLong[] tokenUsage) {
@@ -1186,26 +1207,29 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
         ChatSession chatSession = InMemoryChatSession.builder().messages(messages).build();
 
         Prompt prompt1 = Prompt.of(prompt).attrPut("session", chatSession);
-        
+
         // 估算prompt的token数量（中文大约1个字符=1个token）
         if (tokenUsage != null && tokenUsage.length >= 3 && tokenUsage[0].get() == 0) {
             tokenUsage[0].set((long) prompt.length());
         }
-        
+
         return chatModel.prompt(prompt1).stream()
                 .doOnNext(resp -> {
                     if (tokenUsage != null && tokenUsage.length >= 3) {
                         try {
                             // 优先使用vLLM返回的usage信息（在最后一个chunk中）
                             AiUsage usage = resp.getUsage();
-                            if (usage != null) {                                
+                            if (usage != null) {
                                 Long pt = usage.promptTokens();
                                 Long ct = usage.completionTokens();
                                 Long tt = usage.totalTokens();
-                                
-                                if (pt > 0) tokenUsage[0].set(pt);
-                                if (ct > 0) tokenUsage[1].set(ct);
-                                if (tt > 0) tokenUsage[2].set(tt);
+
+                                if (pt > 0)
+                                    tokenUsage[0].set(pt);
+                                if (ct > 0)
+                                    tokenUsage[1].set(ct);
+                                if (tt > 0)
+                                    tokenUsage[2].set(tt);
                             } else {
                                 // 如果没有usage信息（中间chunk），估算completion tokens
                                 String content = resp.getContent();
@@ -1348,69 +1372,6 @@ 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);
-        try (FileInputStream fileInputStream = new FileInputStream(file);
-             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);
-                String paragraphText = paragraph.getText().trim();
-                for (String title : titles) {
-                    if (paragraphText.equals(toParagraphText(title))) {
-                        positions.add(i);
-                        contents.add(map.get(title));
-                        break;
-                    }
-                }
-            }
-
-            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);
-            }
-        }
-    }
-
     /**
      * 将带编号的标题转为 Word 段落文本（自动编号模板下段落 text 不含编号前缀）
      */
@@ -1552,7 +1513,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
         List<XWPFParagraph> currentPath = new ArrayList<>();
 
         try (InputStream fileInputStream = new FileInputStream(filename);
-             XWPFDocument document = new XWPFDocument(fileInputStream)) {
+                XWPFDocument document = new XWPFDocument(fileInputStream)) {
 
             for (XWPFParagraph paragraph : document.getParagraphs()) {
                 String text = paragraph.getText();
@@ -1619,7 +1580,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
     public String extractTitles(String filename) throws IOException {
         StringBuilder subTitles = new StringBuilder();
         try (InputStream fileInputStream = new FileInputStream(filename);
-             XWPFDocument document = new XWPFDocument(fileInputStream)) {
+                XWPFDocument document = new XWPFDocument(fileInputStream)) {
             for (XWPFParagraph paragraph : document.getParagraphs()) {
                 String text = paragraph.getText().trim();
                 int level = getDocxOutlineLevel(paragraph, document);
@@ -2027,94 +1988,27 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
             List<String> tableLines = new ArrayList<>();
 
             // 将内容解析为块（普通段落/表格/标题/列表项等），然后倒序插入，确保顺序正确
-            class Block {
-                String type; // para | table | h4 | list1 | list2 | imageText | boldOnly | numberedBold
-                String text;
-                List<String> table;
-                Integer h4Index; // 预计算的四级标题编号
-                Integer list1Index; // 预计算的一级列表编号 1),2),3)
-                Integer list2Index; // 预计算的二级列表编号 (1),(2),(3)
-                String boldText; // 加粗文本部分
-                String suffixText; // 后缀文本（如冒号及后续内容）
-                String numberPrefix; // 数字前缀，如 "1. "
-
-                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;
-                }
-
-                Block(String t, String bold, String suffix) {
-                    type = t;
-                    boldText = bold;
-                    suffixText = suffix;
-                }
-
-                Block(String t, String numPrefix, String bold, String suffix) {
-                    type = t;
-                    numberPrefix = numPrefix;
-                    boldText = bold;
-                    suffixText = suffix;
-                }
-            }
             List<Block> blocks = new ArrayList<>();
 
-            // 预计算编号（按正序扫描）
-            int h4Counter = 0;
-            int list1Counter = 0;
-            int list2Counter = 0;
-            String previousLine = ""; // 记录上一行内容
-            boolean wasListItem = false; // 记录上一行是否是列表项
-
             for (String raw : lines) {
                 String line = raw.trim();
-                boolean isCurrentListItem = false;
                 if (line.isEmpty()) {
                     blocks.add(new Block("para", "")); // 空段落
-                    // 空行后重置列表编号
-                    if (!wasListItem) {
-                        list1Counter = 0;
-                        list2Counter = 0;
-                    }
-                    previousLine = line;
-                    wasListItem = false;
                     continue;
                 }
 
-                // 检查上一行是否以中文冒号结尾，如果是则重置列表编号
-                if (previousLine.endsWith("：") || previousLine.endsWith(":")) {
-                    list1Counter = 0;
-                    list2Counter = 0;
-                }
-
-                if (line.startsWith("#")) {
-                    // 跳过前三级标题
-                    previousLine = line;
-                    wasListItem = false;
+                if (line.matches("^#{4,6}\\s+.*")) {
+                    // 四、五、六级标题（####/#####/######），去掉编号前缀，由Word自动编号
+                    int hashCount = 0;
+                    while (hashCount < line.length() && line.charAt(hashCount) == '#') {
+                        hashCount++;
+                    }
+                    String title = line.substring(hashCount).trim();
+                    title = title.replaceFirst("^\\d+(\\.\\d+)*\\.?\\s*", "");
+                    blocks.add(new Block("heading", title, hashCount));
+                } else 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));
-                    previousLine = line;
-                    wasListItem = false;
                 } else if (line.startsWith("|")) {
                     // 表格模式开始
                     if (!inTable) {
@@ -2131,102 +2025,9 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                     }
                     // 当前行按普通段落处理
                     blocks.add(new Block("para", line));
-                    // 非列表项，重置计数器
-                    if (wasListItem) {
-                        list1Counter = 0;
-                        list2Counter = 0;
-                    }
-                    wasListItem = false;
                 } else if (inTable) {
-                    tableLines.add(line);
-                } else if (line.startsWith("- **")) {
-                    // 一级加粗列表项，编号为 1),2),3) —— 预计算编号
-                    if (!wasListItem) {
-                        list1Counter = 0;
-                        list2Counter = 0;
-                    }
-                    String listItem = line.replaceFirst("- \\*\\*", "").replace("**", "");
-                    listItem = listItem.replaceFirst("^\\*\\*", "").replace("**：", "：");
-                    list1Counter++;
-                    // 一级列表开始时，重置二级列表编号
-                    list2Counter = 0;
-                    Block b = new Block("list1", listItem, null, list1Counter, null);
-                    blocks.add(b);
-                    isCurrentListItem = true;
-                } else if (line.matches("^\\s+-\\s+\\*\\*.*")) {
-                    // 二级加粗列表项，编号为 (1),(2),(3) —— 预计算编号
-                    String listItem = line.replaceFirst("^\\s+-\\s+\\*\\*", "").replace("**", "");
-                    listItem = listItem.replaceFirst("^\\*\\*", "").replace("**：", "：");
-                    list2Counter++;
-                    Block b = new Block("list2", listItem, null, null, list2Counter);
-                    blocks.add(b);
-                    isCurrentListItem = true;
-                } else if (line.matches("^\\*\\s+.*") && line.contains("**")) {
-                    // 列表项格式：* **文本** 或 *   **文本**（*后跟一个或多个空格，然后加粗）
-                    if (!wasListItem) {
-                        list1Counter = 0;
-                        list2Counter = 0;
-                    }
-                    // 提取 ** 之间的内容
-                    Pattern starBoldPattern = Pattern.compile("^\\*\\s+\\*\\*([^*]+)\\*\\*(.*)$");
-                    Matcher sbm = starBoldPattern.matcher(line);
-                    if (sbm.matches()) {
-                        String bold = sbm.group(1);
-                        String suf = sbm.group(2);
-                        if (suf == null) suf = "";
-                        list1Counter++;
-                        list2Counter = 0;
-                        Block b = new Block("list1", bold + suf, null, list1Counter, null);
-                        blocks.add(b);
-                        isCurrentListItem = true;
-                    } else {
-                        // 不匹配 * **文本** 格式，按普通列表项处理
-                        String listItem = line.replaceFirst("^\\*\\s+", "");
-                        list1Counter++;
-                        list2Counter = 0;
-                        Block b = new Block("list1", listItem, null, list1Counter, null);
-                        blocks.add(b);
-                        isCurrentListItem = true;
-                    }
-                } else if (line.matches("^\\*\\s+.*")) {
-                    // 普通列表项，以 "* " 开头（不带加粗）
-                    if (!wasListItem) {
-                        list1Counter = 0;
-                        list2Counter = 0;
-                    }
-                    String listItem = line.replaceFirst("^\\*\\s+", "");
-                    list1Counter++;
-                    list2Counter = 0;
-                    Block b = new Block("list1", listItem, null, list1Counter, null);
-                    blocks.add(b);
-                    isCurrentListItem = true;
-                } else if (line.matches("^\\s+\\*\\s+.*")) {
-                    // 缩进的普通列表项，以 "  * " 开头（二级列表）
-                    String listItem = line.replaceFirst("^\\s+\\*\\s+", "");
-                    list2Counter++;
-                    Block b = new Block("list2", listItem, null, null, list2Counter);
-                    blocks.add(b);
-                    isCurrentListItem = true;
-                } else if (line.matches("^-\\s+.*") && !line.matches("^-\\s+\\*\\*.*")) {
-                    // 普通列表项，以 "- " 开头（不带加粗）
-                    if (!wasListItem) {
-                        list1Counter = 0;
-                        list2Counter = 0;
-                    }
-                    String listItem = line.replaceFirst("^-\\s+", "");
-                    list1Counter++;
-                    list2Counter = 0;
-                    Block b = new Block("list1", listItem, null, list1Counter, null);
-                    blocks.add(b);
-                    isCurrentListItem = true;
+                    tableLines.add(line);                
                 } else {
-                    // 非列表项，重置计数器
-                    if (wasListItem) {
-                        list1Counter = 0;
-                        list2Counter = 0;
-                    }
-                    wasListItem = false;
-                    // 匹配格式：1. **文本**（数字前缀+加粗）
                     // 匹配格式：1. **文本**（数字前缀+加粗）
                     Pattern numberedBoldPattern = Pattern.compile("^(\\d+\\.\\s+)\\*\\*([^*]+)\\*\\*(.*)$");
                     Matcher nbm = numberedBoldPattern.matcher(line);
@@ -2237,11 +2038,10 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                         if (suf == null)
                             suf = "";
                         blocks.add(new Block("numberedBold", numPrefix, bold, suf));
-                        previousLine = line;
                         continue;
                     }
                     // 匹配格式：**文本**
-                    Pattern boldOnlyPattern = Pattern.compile("^\\*\\*([^*]+)\\*\\*(.*)$");
+                    Pattern boldOnlyPattern = Pattern.compile("\\*\\*([^*]+)\\*\\*(.*)");
                     Matcher boldMatcher = boldOnlyPattern.matcher(line);
                     if (boldMatcher.matches()) {
                         String boldText = boldMatcher.group(1); // "数据校验"
@@ -2249,7 +2049,6 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                         if (suffix == null)
                             suffix = "";
                         blocks.add(new Block("boldOnly", boldText, suffix));
-                        previousLine = line;
                         continue;
                     }
                     // 如果不是 boldOnly 格式，继续后续处理
@@ -2264,10 +2063,6 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                         blocks.add(new Block("para", line));
                     }
                 }
-
-                // 更新上一行记录
-                previousLine = line;
-                wasListItem = isCurrentListItem;
             }
             // 收尾：如果文件最后是表格仍未输出
             if (inTable && !tableLines.isEmpty()) {
@@ -2287,48 +2082,34 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                 }
                 XmlCursor cursor = paragraphs.get(insertPos).getCTP().newCursor();
 
-                switch (b.type) {
-                    case "h4": {
-                        XWPFParagraph p = document.insertNewParagraph(cursor);
-                        XWPFRun run = p.createRun();
-                        run.setText(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": {
+                switch (b.getType()) {
+                    case "heading": {
                         XWPFParagraph p = document.insertNewParagraph(cursor);
+                        // 使用模板文件的对应等级标题样式，由Word自动编号
+                        if (b.getHeadingLevel() != null) {
+                            p.setStyle(String.valueOf(b.getHeadingLevel() + 1));
+                        }
                         XWPFRun run = p.createRun();
-                        int num = (b.list2Index != null ? b.list2Index : 1);
-                        run.setText("   (" + num + ") " + b.text);
-                        run.setFontSize(12);
+                        run.setText(b.getText());
                         break;
                     }
                     case "numberedBold": {
                         XWPFParagraph p = document.insertNewParagraph(cursor);
                         // 数字前缀（不加粗）
-                        if (b.numberPrefix != null) {
+                        if (b.getNumberPrefix() != null) {
                             XWPFRun r1 = p.createRun();
-                            r1.setText(b.numberPrefix);
+                            r1.setText(b.getNumberPrefix());
                             r1.setFontSize(12);
                         }
                         // 加粗文本
                         XWPFRun r2 = p.createRun();
-                        r2.setText(b.boldText != null ? b.boldText : "");
+                        r2.setText(b.getBoldText() != null ? b.getBoldText() : "");
                         r2.setFontSize(12);
                         r2.setBold(true);
                         // 后缀（不加粗）
-                        if (b.suffixText != null && !b.suffixText.isEmpty()) {
+                        if (b.getSuffixText() != null && !b.getSuffixText().isEmpty()) {
                             XWPFRun r3 = p.createRun();
-                            r3.setText(b.suffixText);
+                            r3.setText(b.getSuffixText());
                             r3.setFontSize(12);
                         }
                         break;
@@ -2339,14 +2120,14 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
 
                         // 加粗文本部分
                         XWPFRun run1 = p.createRun();
-                        run1.setText(b.boldText);
+                        run1.setText(b.getBoldText());
                         run1.setFontSize(12);
                         run1.setBold(true);
 
                         // 后缀部分（不加粗，如冒号及后续内容，如果有的话）
-                        if (b.suffixText != null && !b.suffixText.isEmpty()) {
+                        if (b.getSuffixText() != null && !b.getSuffixText().isEmpty()) {
                             XWPFRun run2 = p.createRun();
-                            run2.setText(b.suffixText);
+                            run2.setText(b.getSuffixText());
                             run2.setFontSize(12);
                         }
                         break;
@@ -2354,7 +2135,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                     case "imageText": {
                         XWPFParagraph p = document.insertNewParagraph(cursor);
                         XWPFRun run = p.createRun();
-                        run.setText(b.text);
+                        run.setText(b.getText());
                         run.setFontSize(12);
                         run.setItalic(true);
                         run.setColor("808080");
@@ -2364,7 +2145,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                         // 解析 markdown 表格并插入在 cursor 位置
                         List<String[]> tableData = new ArrayList<>();
                         Pattern sep = Pattern.compile("^\\|\\s*(-+\\s*\\|\\s*)*-+\\s*\\|?$");
-                        for (String tl : b.table) {
+                        for (String tl : b.getTable()) {
                             if (sep.matcher(tl).matches())
                                 continue;
                             String t = tl.trim();
@@ -2395,6 +2176,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                                     XWPFTableCell cell = tr.getCell(c);
                                     cell.removeParagraph(0);
                                     XWPFParagraph cp = cell.addParagraph();
+                                    cp.setIndentationFirstLine(0);
                                     String cellText = rowData[c];
                                     if (r == 0) {
                                         // 表头行整体加粗
@@ -2435,15 +2217,15 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                     case "para":
                     default: {
                         XWPFParagraph p = document.insertNewParagraph(cursor);
-                        if (b.text != null && b.text.contains("**")) {
+                        if (b.getText() != null && b.getText().contains("**")) {
                             // 解析行内 **文本** 加粗
-                            Matcher m = Pattern.compile("\\*\\*([^*]+)\\*\\*").matcher(b.text);
+                            Matcher m = Pattern.compile("\\*\\*([^*]+)\\*\\*").matcher(b.getText());
                             int lastEnd = 0;
                             while (m.find()) {
                                 // 加粗前的普通文本
                                 if (m.start() > lastEnd) {
                                     XWPFRun run = p.createRun();
-                                    run.setText(b.text.substring(lastEnd, m.start()));
+                                    run.setText(b.getText().substring(lastEnd, m.start()));
                                     run.setFontSize(12);
                                 }
                                 // 加粗文本
@@ -2454,15 +2236,15 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                                 lastEnd = m.end();
                             }
                             // 剩余文本
-                            if (lastEnd < b.text.length()) {
+                            if (lastEnd < b.getText().length()) {
                                 XWPFRun run = p.createRun();
-                                run.setText(b.text.substring(lastEnd));
+                                run.setText(b.getText().substring(lastEnd));
                                 run.setFontSize(12);
                             }
                         } else {
                             XWPFRun run = p.createRun();
-                            if (b.text != null) {
-                                run.setText(b.text);
+                            if (b.getText() != null) {
+                                run.setText(b.getText());
                             }
                             run.setFontSize(12);
                         }
@@ -2505,14 +2287,15 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
         SseEmitter emitter = new SseEmitter(600000L);
 
         // 设置回调
-        emitter.onCompletion(() -> {});
+        emitter.onCompletion(() -> {
+        });
         emitter.onTimeout(() -> {
             emitter.complete();
         });
         emitter.onError(e -> System.err.println("SSE连接错误: " + e.getMessage()));
 
         // 在主线程中预先获取用户ID，避免异步线程中丢失SecurityContext
-        
+
         Long userId = SecurityUtils.getUserId();
 
         // 使用独立线程池处理，避免阻塞主线程
@@ -2626,7 +2409,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                                     try {
                                         if (content != null && !content.isEmpty()) {
                                             fullContent.append(content);
-                                            
+
                                             // 逐字发送到前端，并带上当前已累计的 token 用量
                                             ChapterStreamResponse response = ChapterStreamResponse.content(
                                                     title, content, false, finalChapterIndex, totalChapters);
@@ -2667,7 +2450,7 @@ public class CmcAgentServiceImpl implements ICmcAgentService {
                                         completeResponse.setPromptTokens(tokenUsage[0].get());
                                         completeResponse.setCompletionTokens(tokenUsage[1].get());
                                         completeResponse.setTotalTokens(tokenUsage[2].get());
-                                        
+
                                         emitter.send(SseEmitter.event()
                                                 .name("chapter")
                                                 .data(objectMapper.writeValueAsString(completeResponse)));

oa-ui/src/utils/deleteResource.js

@@ -162,6 +162,12 @@ const apiEndpoints = [
       '/oa/transfer/:id',
     ]
   },
+  {
+    procDefName: '招聘审批',
+    apiUrl: [
+      '/oa/recruit/:id',
+    ]
+  },
 ]
 
 // 编写一个方法来处理删除请求，并同时发送所有API请求