u

dsk-module/dsk-biz-api/src/main/java/com/dsk/component/DataAnalysisComponent.java

@@ -48,7 +48,7 @@ public class DataAnalysisComponent {
      * 工料汇总数据解析
      */
     @Async
-    public void quantitySummaryDataAnalysis(CbProjectBaseBo bo) throws Exception {
+    public void quantitySummaryDataAnalysis(CbProjectBaseBo bo){
 
         //查询工料汇总导入文件
         List<CbProjectFile> fileList = projectFileService.selectAnalysisList(bo.getProjectId(), CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY, bo.getCbStage());
@@ -59,17 +59,13 @@ public class DataAnalysisComponent {
                 //文件下载
                 InputStream inputStream = ossService.downFileIO(file.getFileOssId());
                 if (ObjectUtil.isNull(inputStream)) {
-                    file.setFileParseStatus(3);
-                    file.setFailRemark("文件数据不存在");
-                    projectFileService.updateById(file);
+                    addFileErrorMsg(file, "文件数据不存在");
                     break;
                 }
                 //解析数据
                 List<CbQuantitySummary> importList = new ExcelUtils<>(CbQuantitySummary.class).importExcelAllSheet(inputStream, 1);
                 if (importList.isEmpty()) {
-                    file.setFileParseStatus(3);
-                    file.setFailRemark("表格中不存在待导入数据!");
-                    projectFileService.updateById(file);
+                    addFileErrorMsg(file, "表格中不存在待导入数据");
                     break;
                 }
                 List<CbQuantitySummary> quantitySummaryList = importList.stream().parallel()
@@ -80,7 +76,8 @@ public class DataAnalysisComponent {
                             item.setCbProjectFileId(file.getId());
                         }).collect(Collectors.toList());
                 if (quantitySummaryList.isEmpty()) {
-                    throw new ServiceException("表格中不存在有效数据!");
+                    addFileErrorMsg(file, "表格中不存在有效数据");
+                    break;
                 }
 
                 transactionTemplate.execute(status -> {
@@ -114,18 +111,20 @@ public class DataAnalysisComponent {
                         }
                     } catch (Exception e) {
                         status.setRollbackOnly();
-                        file.setFileParseStatus(3);
-                        file.setFailRemark(e.getMessage());
-                        projectFileService.updateById(file);
+                        addFileErrorMsg(file, e.getMessage());
                     }
                     return Boolean.TRUE;
                 });
             } catch (Exception e) {
-                file.setFileParseStatus(3);
-                file.setFailRemark(e.getMessage());
-                projectFileService.updateById(file);
+                addFileErrorMsg(file, e.getMessage());
+            }
         }
+
     }
 
+    private void addFileErrorMsg(CbProjectFile file, String errorMsg) {
+        file.setFileParseStatus(3);
+        file.setFailRemark(errorMsg);
+        projectFileService.updateById(file);
     }
 }