From 20bceefa06933101dadaa12ba1e840c51fd472b0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 20 Aug 2024 09:30:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E4=BC=98=E5=8C=96=E5=88=B02=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...cessStandardComplianceCheckController.java |  2 +-
 ...essStandardComplianceCheckServiceImpl.java | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
index 0bb5e4d7..cf86d26f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
@@ -133,7 +133,7 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
     @AutoLog(value = "法规符合性排查流程-上传车型文件")
     @ApiOperation(value = "法规符合性排查流程-上传车型文件", notes = "法规符合性排查流程-上传车型文件")
     @PostMapping("/uploadModelFile")
-    public Result<OSSFile> uploadModelFile(@RequestBody HttpServletRequest request) {
+    public Result<OSSFile> uploadModelFile(HttpServletRequest request) {
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK), sccService.uploadModelFile(request));
     }
 
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 02a87f5d..b25a7ee8 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
@@ -503,9 +503,17 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             return null;
         });
 
-        CompletableFuture<MultipartFile> modelFileFuture = CompletableFuture.supplyAsync(() ->
-                this.getFileById(scc.getModelFile())
-        );
+        // 从redis上获取数据，获取不到再去obs上取文件
+        List<ModelExcelVO> modelExcelVOList;
+        modelExcelVOList = (List<ModelExcelVO>) redisUtil.get(MODEL_EXCEL_VO_LIST_KEY + scc.getModelFile());
+        if (CollUtil.isEmpty(modelExcelVOList)) {
+            CompletableFuture<MultipartFile> modelFileFuture = CompletableFuture.supplyAsync(() ->
+                    this.getFileById(scc.getModelFile())
+            );
+            // 等待模型文件获取完成并进行文件内容转换
+            MultipartFile modelFile = modelFileFuture.get();  // 等待获取的文件完成
+            modelExcelVOList = this.getModelExcelData(modelFile);
+        }
 
         // 获取拆分数据
         List<ProcessStandardComplianceCheckDetail> detailInfoList;
@@ -526,10 +534,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             }
         }
 
-        // 等待模型文件获取完成并进行文件内容转换
-        MultipartFile modelFile = modelFileFuture.get();  // 等待获取的文件完成
-        List<ModelExcelVO> modelExcelVOList = this.getModelExcelData(modelFile);
-
         // 根据主表数据和车型文件生成子表数据并保存
         return this.saveAllDetailData(modelExcelVOList, detailInfoList);
     }
@@ -776,7 +780,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         OSSFile result = ossFileService.outUpload(request).getResult();
         // 等待模型文件获取完成并进行文件内容转换
         List<ModelExcelVO> modelExcelVOList = this.getModelExcelData(modelFile);
-        if (CollUtil.isEmpty(modelExcelVOList)) {
+        if (CollUtil.isNotEmpty(modelExcelVOList)) {
             // 存入Redis
             redisUtil.set(MODEL_EXCEL_VO_LIST_KEY + result.getId(), modelExcelVOList, 60 * 60 * 24 * 7);
         }