From d08cc65395f2a5ea96f5608cde82ff60e7de4143 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 9 Aug 2024 21:02:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86)?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=91=E5=B8=83=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DocumentSplitMapper.java           |  7 +++
 .../mapper/xml/DocumentSplitMapper.xml        | 14 +++++
 .../impl/DocumentSplitServiceImpl.java        | 53 +++++++++++--------
 3 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java
index 33f98206..482b9855 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java
@@ -172,6 +172,13 @@ public interface DocumentSplitMapper extends BaseMapper<LawsDocumentSplit> {
      */
     List<SarFileSplitItemsVal> querySarFileSplitItemsValByItemId(@Param("itemId") String itemId);
 
+    /**
+     * 条目信息根据itemIds查询
+     * @param itemIds
+     * @return
+     */
+    List<SarFileSplitItemsVal> querySarFileSplitItemsValByItemIds(@Param("itemIds") String itemIds);
+
     /**
      * 条目信息批量新增
      * @param sarFileSplitItemsVal
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
index cf301733..40d64acf 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
@@ -200,6 +200,20 @@
         where valid_flag = 0 and item_id = #{itemId}
     </select>
 
+    <select id="querySarFileSplitItemsValByItemIds"
+            resultType="com.jero.modules.laws.documenttool.entity.SarFileSplitItemsVal">
+        select id, sys_org_code, item_id, type, item_content, display_seq, valid_flag,
+        img_name, index_item, creation_time, modify_user, modify_time, creation_user
+        from sar_file_split_items_val
+        where valid_flag = 0
+        <if test="itemIds != null and itemIds != ''">
+            and item_id in
+            <foreach collection="itemIds.split(',')" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
     <select id="queryLawsDocumentSplitInId" resultType="java.util.Map">
         select *
         from laws_document_split
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index 31d0ca4b..92f118ee 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -190,6 +190,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     @Autowired
     private PlatformTransactionManager dataSourceTransactionManager;
 
+    private static final int NUMBER = 500;
+
     @Value("${jero.path.exportExcelTempPath}")
     private String exportExcelTempPath;
     @Value("#{'${adminRoleCode}'.split(',')}")
@@ -1147,6 +1149,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     }
 
     private void publishs(Map<String, Object> parameter, boolean b) {
+        long l = System.currentTimeMillis();
         String id = (String) parameter.get(ID);
         if (b){
             // 水平越权
@@ -1204,22 +1207,16 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
 
         // 文档拆分详情(旧)
         List<Map<String, Object>> oldLawsDocumentSplitList = documentSplitMapper.queryLawsDocumentSplitByInfoId(id);
-        /**
-         * List<String> oldLawsDocumentSplitIdList = new ArrayList<>();
-         * List<String> newLawsDocumentSplitIdList = new ArrayList<>();
-         */
+
+        // 旧新id映射（k:旧id v:新id）
+        HashMap<String, String> oldNewMap = new HashMap<>();
         for (Map<String, Object> map : oldLawsDocumentSplitList) {
             String oldId = (String) map.get(ID);
-            /**
-             * oldLawsDocumentSplitIdList.add(oldId);
-             */
             String newId = UUID.randomUUID().toString().replace("-", "");
             map.put(ID, newId);
-            /**
-             * newLawsDocumentSplitIdList.add(newId);
-             */
             map.put(INFO_ID, newInfo.getId());
-
+            // 记录映射关系
+            oldNewMap.put(oldId, newId);
             // 旧目录id替换
             Optional<String> optionalS = oldMenuIdList.stream().filter(v -> v.equals(map.get(MENU_ID))).findFirst();
             optionalS.ifPresent(v -> {
@@ -1228,21 +1225,31 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             });
 
             List<String> keyList = new ArrayList<>(map.keySet());
-            List<String> valueList = map.values().stream().map(o -> (String.valueOf(o))).collect(Collectors.toList());
-            // 新增数据
+            List<String> valueList = map.values().stream().map(o ->(String.valueOf(o))).collect(Collectors.toList());
             String insertField = String.join(",", keyList);
             documentSplitMapper.insertLawsDocumentSplit(insertField, valueList);
+        }
+        // 条目信息 批量新增
+        Set<String> oldIdList = oldNewMap.keySet();
+        List<SarFileSplitItemsVal> sarFileSplitItemsVal =
+                documentSplitMapper.querySarFileSplitItemsValByItemIds(String.join(",", oldIdList));
+        for (SarFileSplitItemsVal fileSplitItemsVal : sarFileSplitItemsVal) {
+            fileSplitItemsVal.setId(UUID.randomUUID().toString().replace("-", ""));
+            fileSplitItemsVal.setItemId(oldNewMap.get(fileSplitItemsVal.getItemId()));
+        }
+        batchSaveItemsVal(sarFileSplitItemsVal);
+        log.info("===================================耗时："+(System.currentTimeMillis() - l));
+    }
 
-            // 条目信息(旧)
-            List<SarFileSplitItemsVal> sarFileSplitItemsVal = documentSplitMapper.querySarFileSplitItemsValByItemId(oldId);
-            for (SarFileSplitItemsVal fileSplitItemsVal : sarFileSplitItemsVal) {
-                fileSplitItemsVal.setId(UUID.randomUUID().toString().replace("-", ""));
-                fileSplitItemsVal.setItemId(newId);
-            }
-            // 新增数据
-            if (!sarFileSplitItemsVal.isEmpty()){
-                documentSplitMapper.insertSarFileSplitItemsVal(sarFileSplitItemsVal);
-            }
+    private void batchSaveItemsVal(List<SarFileSplitItemsVal> allvItemsValList) {
+        int size = allvItemsValList.size();
+        int count = (int)Math.ceil((double) size / NUMBER);
+        for (int i = 1; i <= count; i++) {
+            List<SarFileSplitItemsVal> list = allvItemsValList.stream()
+                    .skip((long) (Math.max(i, 1) - 1) * NUMBER)
+                    .limit(NUMBER)
+                    .collect(Collectors.toList());
+            documentSplitMapper.insertSarFileSplitItemsVal(list);
         }
     }