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 uploadModelFile(@RequestBody HttpServletRequest request) { + public Result 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 modelFileFuture = CompletableFuture.supplyAsync(() -> - this.getFileById(scc.getModelFile()) - ); + // 从redis上获取数据,获取不到再去obs上取文件 + List modelExcelVOList; + modelExcelVOList = (List) redisUtil.get(MODEL_EXCEL_VO_LIST_KEY + scc.getModelFile()); + if (CollUtil.isEmpty(modelExcelVOList)) { + CompletableFuture modelFileFuture = CompletableFuture.supplyAsync(() -> + this.getFileById(scc.getModelFile()) + ); + // 等待模型文件获取完成并进行文件内容转换 + MultipartFile modelFile = modelFileFuture.get(); // 等待获取的文件完成 + modelExcelVOList = this.getModelExcelData(modelFile); + } // 获取拆分数据 List detailInfoList; @@ -526,10 +534,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl modelExcelVOList = this.getModelExcelData(modelFile); - // 根据主表数据和车型文件生成子表数据并保存 return this.saveAllDetailData(modelExcelVOList, detailInfoList); } @@ -776,7 +780,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl 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); }