QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: 88047 法规符合性排查性能优化

Browse Source
This commit is contained in:
mzaxd
2024-08-05 16:18:25 +08:00
parent 981d94520e
commit 1e0cf3ab4e
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+21 -11
View File
@@ -84,6 +84,7 @@ import java.io.InputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.jero.modules.activiti.common.ActivitiCommon.*; import static com.jero.modules.activiti.common.ActivitiCommon.*;
@@ -446,25 +447,35 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
@Override @Override
public List<ProcessStandardComplianceCheckDetail> generate(ProcessStandardComplianceCheck scc) throws Exception { public List<ProcessStandardComplianceCheckDetail> generate(ProcessStandardComplianceCheck scc) throws Exception {
String splitFileSource = scc.getSplitFileSource(); String splitFileSource = scc.getSplitFileSource();
List<ProcessStandardComplianceCheckDetail> detailInfoList; CompletableFuture<List<ProcessStandardComplianceCheckDetail>> detailInfoListFuture;
CompletableFuture<List<ModelExcelVO>> modelExcelVOListFuture;
// 找到拆分数据 // 找到拆分数据
if (StrUtil.isBlank(splitFileSource)) { if (StrUtil.isBlank(splitFileSource)) {
MultipartFile splitFile = this.getFileById(scc.getSplitFile()); MultipartFile splitFile = this.getFileById(scc.getSplitFile());
detailInfoList = this.getSplitData(scc, splitFile); detailInfoListFuture = CompletableFuture.supplyAsync(() -> this.getSplitData(scc, splitFile));
} else { } else {
detailInfoList = this.getSplitDataByStandard(scc); detailInfoListFuture = CompletableFuture.supplyAsync(() -> this.getSplitDataByStandard(scc));
// 是否与上一般一致 // 是否与上一版本一致
String isSameLastVersion = scc.getIsSameLastVersion(); String isSameLastVersion = scc.getIsSameLastVersion();
if (YesOrNoEnum.NO.getValue().equals(isSameLastVersion)) { if (YesOrNoEnum.NO.getValue().equals(isSameLastVersion)) {
// 过滤出也为否的数据 detailInfoListFuture = detailInfoListFuture.thenApply(details -> details.stream()
detailInfoList = detailInfoList.stream().filter(detail -> YesOrNoEnum.NO.getValue().equals .filter(detail -> YesOrNoEnum.NO.getValue().equals(detail.getIsSameAsPrevVersion()))
(detail.getIsSameAsPrevVersion())).collect(Collectors.toList()); .collect(Collectors.toList()));
} }
} }
// 获取两个文件
// 获取模型文件并转换
MultipartFile modelFile = this.getFileById(scc.getModelFile()); MultipartFile modelFile = this.getFileById(scc.getModelFile());
// 文件内容转换 modelExcelVOListFuture = CompletableFuture.supplyAsync(() -> this.getModelExcelData(modelFile));
List<ModelExcelVO> modelExcelVOList = this.getModelExcelData(modelFile);
// 等待两个异步操作完成
CompletableFuture.allOf(detailInfoListFuture, modelExcelVOListFuture).join();
// 结合两个文件的数据
List<ProcessStandardComplianceCheckDetail> detailInfoList = detailInfoListFuture.get();
List<ModelExcelVO> modelExcelVOList = modelExcelVOListFuture.get();
// 根据主表数据和车型文件生成子表数据并保存 // 根据主表数据和车型文件生成子表数据并保存
return this.saveAllDetailData(modelExcelVOList, detailInfoList); return this.saveAllDetailData(modelExcelVOList, detailInfoList);
} }
@@ -1105,7 +1116,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
this.transToDictValue(modelExcelVOList, listDict); this.transToDictValue(modelExcelVOList, listDict);
} }
// 转换一下数据 // 转换一下数据
return modelExcelVOList; return modelExcelVOList;
} }