From a0f34aef076759923a31b7a36f3ff6c028e7d23c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 7 Aug 2024 20:26:53 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"perf:=2088047=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1e0cf3ab4ebe35431e27352ba96cd51ddaf5abdc.
---
 ...essStandardComplianceCheckServiceImpl.java | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index afa3d026..9aa8c704 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -84,7 +84,6 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import static com.jero.modules.activiti.common.ActivitiCommon.*;
@@ -450,35 +449,25 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
     @Override
     public List<ProcessStandardComplianceCheckDetail> generate(ProcessStandardComplianceCheck scc) throws Exception {
         String splitFileSource = scc.getSplitFileSource();
-        CompletableFuture<List<ProcessStandardComplianceCheckDetail>> detailInfoListFuture;
-        CompletableFuture<List<ModelExcelVO>> modelExcelVOListFuture;
-
+        List<ProcessStandardComplianceCheckDetail> detailInfoList;
         // 找到拆分数据
         if (StrUtil.isBlank(splitFileSource)) {
             MultipartFile splitFile = this.getFileById(scc.getSplitFile());
-            detailInfoListFuture = CompletableFuture.supplyAsync(() -> this.getSplitData(scc, splitFile));
+            detailInfoList = this.getSplitData(scc, splitFile);
         } else {
-            detailInfoListFuture = CompletableFuture.supplyAsync(() -> this.getSplitDataByStandard(scc));
-            // 是否与上一版本一致
+            detailInfoList = this.getSplitDataByStandard(scc);
+            // 是否与上一般一致
             String isSameLastVersion = scc.getIsSameLastVersion();
             if (YesOrNoEnum.NO.getValue().equals(isSameLastVersion)) {
-                detailInfoListFuture = detailInfoListFuture.thenApply(details -> details.stream()
-                        .filter(detail -> YesOrNoEnum.NO.getValue().equals(detail.getIsSameAsPrevVersion()))
-                        .collect(Collectors.toList()));
+                // 过滤出也为否的数据
+                detailInfoList = detailInfoList.stream().filter(detail -> YesOrNoEnum.NO.getValue().equals
+                        (detail.getIsSameAsPrevVersion())).collect(Collectors.toList());
             }
         }
-
-        // 获取模型文件并转换
+        // 获取两个文件
         MultipartFile modelFile = this.getFileById(scc.getModelFile());
-        modelExcelVOListFuture = CompletableFuture.supplyAsync(() -> this.getModelExcelData(modelFile));
-
-        // 等待两个异步操作完成
-        CompletableFuture.allOf(detailInfoListFuture, modelExcelVOListFuture).join();
-
-        // 结合两个文件的数据
-        List<ProcessStandardComplianceCheckDetail> detailInfoList = detailInfoListFuture.get();
-        List<ModelExcelVO> modelExcelVOList = modelExcelVOListFuture.get();
-
+        // 文件内容转换
+        List<ModelExcelVO> modelExcelVOList = this.getModelExcelData(modelFile);
         // 根据主表数据和车型文件生成子表数据并保存
         return this.saveAllDetailData(modelExcelVOList, detailInfoList);
     }
@@ -1127,6 +1116,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             this.transToDictValue(modelExcelVOList, listDict);
         }
         // 转换一下数据
+
         return modelExcelVOList;
     }