✨ 央地系统-新模板

cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CGSAnalysisHelper.java

@@ -65,12 +65,13 @@ public class CGSAnalysisHelper {
 
 
         for (File excelFile : excelFileList) {
+            String bankName = "";
             try {
             String excelFileName = excelFile.getAbsolutePath();
             if(excelFileName.contains("金融理财")){
                 continue;
             }
-            String bankName = "";
+
 
             if(excelFileName.contains("_")){
                 int count = countString(excelFileName, "_");
@@ -89,7 +90,7 @@ public class CGSAnalysisHelper {
                         Worksheet worksheet = wb.getWorksheets().get(sheetNo);
                         String worksheetName = worksheet.getName();
                         if(worksheetName.equals("交易流水信息")){
-                    saveBS(wb,sheetNo,excelFileName,bankName,caseId);
+                            saveBS(wb,sheetNo,excelFileName,bankName,caseId,sourceFile);
                         } else if(worksheetName.equals("客户基本信息")){
                             getBaseInfo(wb,sheetNo,excelFileName,baseInfoList);
                         } else if(worksheetName.equals("账户基本信息")){
@@ -101,11 +102,11 @@ public class CGSAnalysisHelper {
                             throw new TemplateNotFindException(sourceFile + BankStatementConstants.NAME_WITH_SHEET_NAME+ worksheetName);
                         }
                     }catch (Exception e){
-                importResultService.record(caseId,BANK_NAME,e);
+                        importResultService.record(caseId,bankName,e);
                     }
                 }
             }catch (Exception e){
-            importResultService.record(caseId,BANK_NAME,e);
+                importResultService.record(caseId,bankName,e);
             }
         }
     }
@@ -203,27 +204,26 @@ public class CGSAnalysisHelper {
         }
     }
 
-    void saveBS(Workbook wb,int sheetNo, String excelFileName,String bankName,String caseId){
+    void saveBS(Workbook wb,int sheetNo, String excelFileName,String bankName,String caseId,String sourceFile){
         Cells cells = wb.getWorksheets().get(sheetNo).getCells();
         Cell cell = AsposeUtil.getCell(cells, "交易时间");
         if (cell == null) {
             return;
         }
-
          int headRowNum = cell.getRow() + 1;
         List<CGSBankStatement> bsList = new ArrayList<>();
         try (ExcelReader reader = EasyExcel.read(excelFileName).build()) {
             ReadSheet sheet = EasyExcel.readSheet(sheetNo)
                     .headRowNumber(headRowNum)
                     .head(CGSBankStatement.class)
-                    .registerReadListener(getBSReadListener(bsList,bankName,caseId))
+                    .registerReadListener(getBSReadListener(bsList,bankName,caseId,sourceFile))
                     .build();
             reader.read(sheet);
 
 
         } catch (Exception e) {
             log.error("读取央地系统数据失败", e);
-            throw new ImportDataFailedException(e.getMessage(), excelFileName);
+            throw new ImportDataFailedException(e.getMessage(), sourceFile);
         }
     }
 
@@ -242,7 +242,7 @@ public class CGSAnalysisHelper {
         };
     }
 
-    private ReadListener<CGSBankStatement> getBSReadListener(List<CGSBankStatement> bsList,String bankName,String caseId) {
+    private ReadListener<CGSBankStatement> getBSReadListener(List<CGSBankStatement> bsList,String bankName,String caseId,String sourceFile) {
         return new ReadListener<CGSBankStatement>() {
             @Override
             public void invoke(CGSBankStatement data, AnalysisContext context) {
@@ -265,8 +265,9 @@ public class CGSAnalysisHelper {
                             String.format("解析交易时间错误，无法将【%s】格式化为【%s】", transTime, format), new Exception());
                     }
                 }catch (Exception e){
-                    importResultService.record(caseId,bankName,e);
+                    importResultService.record(caseId,bankName,e,sourceFile);
                 }
+                data.setSourceFile(sourceFile);
                 data.setBankName(bankName);
                 data.setId(IdUtil.objectId());
                 bsList.add(data);
@@ -444,7 +445,6 @@ public class CGSAnalysisHelper {
                 bsList.add(bs);
                 HelperUtil.extractPlateNumber(bs,plateNumberInfoList);
 
-
                 if (bsList.size() >= batchSize) {
                     List<BankStatement> dest = HelperUtil.getDest(bsList);
                     HelperUtil.batchInsert2Es(dest, caseId);
@@ -452,7 +452,7 @@ public class CGSAnalysisHelper {
                     bsList = ListUtils.newArrayListWithExpectedSize(batchSize);
                 }
             } catch (Exception e) {
-            importResultService.record(caseId, BANK_NAME, e,sourceFile);
+                importResultService.record(caseId, entity.getBankName(), e,sourceFile);
             }
         }