From 22f6ac0aad383ca3dc0bd4638f8e0fcec0898756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 6 Sep 2024 17:41:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=88=86=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=BC=96=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/split/service/impl/FileSpiltService.java  |  7 +++++--
 .../java/com/jero/modules/split/util/AsposeUtil.java  | 11 +++++++++--
 .../java/com/jero/modules/split/vo/TitleNumberVO.java |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
index bb14150..e2ae51a 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
@@ -256,7 +256,7 @@ public class FileSpiltService {
             }
             //获得序号标题和无标题序号
             TitleNumberVO titleNumberVO = AsposeUtil.getNumber(is1);
-            Map<String, String> titleNumberMap = titleNumberVO.getTitleNumberMap();
+            Map<String, List<String>> titleNumberMap = titleNumberVO.getTitleNumberMap();
             List<String> emptyTitleList = titleNumberVO.getEmptyTitleList();
             //  记录拆分后的每一段文字
             List<IBodyElement> elements = doc.getBodyElements();
@@ -401,8 +401,11 @@ public class FileSpiltService {
                             emptyTitleList.remove(0);
                         }else if (StringUtils.isNotBlank(paragraphString) && titleNumberMap.containsKey(paragraphString)){
                             replaceNumberFlag = true;
-                            replaceNumber = titleNumberMap.get(paragraphString);
+                            List<String> stringList = titleNumberMap.get(paragraphString);
+                            replaceNumber = stringList.get(0);
+                            //replaceNumber = titleNumberMap.get(paragraphString);
                             paragraphString = replaceNumber + paragraphString;
+                            stringList.remove(0);
                         }
                         String startDigit;
                         if (replaceNumberFlag){
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java
index 35a4485..14ff9fc 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/util/AsposeUtil.java
@@ -22,7 +22,7 @@ public class AsposeUtil {
      */
     public static TitleNumberVO getNumber(InputStream is) {
         TitleNumberVO titleNumberVO = new TitleNumberVO();
-        Map<String, String> titleNumberMap = new HashMap<>();
+        Map<String, List<String>> titleNumberMap = new HashMap<>();
         List<String> emptyTitleList = new ArrayList<>();
         try {
             Document doc = new Document(is);
@@ -59,7 +59,14 @@ public class AsposeUtil {
 
                         System.out.println("Text:" + labelString + text);
                         if (StringUtils.isNotBlank(text)) {
-                            titleNumberMap.put(text, labelString);
+                            if (titleNumberMap.containsKey(text)) {
+                                List<String> strings = titleNumberMap.get(text);
+                                strings.add(labelString);
+                            }else {
+                                List<String> strings = new ArrayList<>();
+                                strings.add(labelString);
+                                titleNumberMap.put(text, strings);
+                            }
                         } else {
                             emptyTitleList.add(labelString);
                         }
diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/vo/TitleNumberVO.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/vo/TitleNumberVO.java
index ad812d6..c397937 100644
--- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/vo/TitleNumberVO.java
+++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/vo/TitleNumberVO.java
@@ -11,6 +11,6 @@ import java.util.Map;
  */
 @Data
 public class TitleNumberVO {
-    private Map<String, String> titleNumberMap;
+    private Map<String, List<String>> titleNumberMap;
     private List<String> emptyTitleList;
 }