From ea3eb81ef1ae9229dbf736f020fad9847312bd0f Mon Sep 17 00:00:00 2001
From: "583641232@qq.com" <583641232@qq.com>
Date: Wed, 14 Aug 2024 14:40:05 +0800
Subject: [PATCH] :sparkles:  config

---
 cas-common/pom.xml                            |  5 ++++
 .../helper/EsIndexHelper.java                 | 27 ++++++-------------
 .../service/impl/BankServiceImpl.java         |  5 ++--
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/cas-common/pom.xml b/cas-common/pom.xml
index 8d3598f..5c13cae 100644
--- a/cas-common/pom.xml
+++ b/cas-common/pom.xml
@@ -228,6 +228,11 @@
             <artifactId>easy-es-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>3.9.9</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/EsIndexHelper.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/EsIndexHelper.java
index 36e89be..505ee15 100644
--- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/EsIndexHelper.java
+++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/EsIndexHelper.java
@@ -429,26 +429,15 @@ public class EsIndexHelper {
     }
 
     public void delFDBIndex(String caseId) {
-        if (fdbStatementMapper.existsIndex(Constants.ES_INDEX_NAME_FDB_STATEMENT)) {
-            fdbStatementMapper.deleteIndex(Constants.ES_INDEX_NAME_FDB_STATEMENT);
-//            queryCenterService.deleteData(Constants.ES_INDEX_NAME_FDB_STATEMENT,caseId);
-        }else {
-            fdbStatementMapper.createIndex();
-        }
-
-        if (fdbPrivateAccountOpeningInfoMapper.existsIndex(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PRIVATE)) {
-            fdbPrivateAccountOpeningInfoMapper.deleteIndex(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PRIVATE);
-//            queryCenterService.deleteData(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PRIVATE,caseId);
-        }else {
-            fdbPrivateAccountOpeningInfoMapper.createIndex();
-        }
+        fdbStatementMapper.deleteIndex(Constants.ES_INDEX_NAME_FDB_STATEMENT);
+        fdbPrivateAccountOpeningInfoMapper.deleteIndex(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PRIVATE);
+        fdbPublicAccountOpeningInfoMapper.deleteIndex(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PUBLIC);
+    }
 
-        if (fdbPublicAccountOpeningInfoMapper.existsIndex(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PUBLIC)) {
-            fdbPublicAccountOpeningInfoMapper.deleteIndex(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PUBLIC);
-//            queryCenterService.deleteData(Constants.ES_INDEX_NAME_FDB_OPENING_ACCOUNT_PUBLIC,caseId);
-        }else {
-            fdbPublicAccountOpeningInfoMapper.createIndex();
-        }
+    public void createFDBIndex(String caseId) {
+        fdbStatementMapper.createIndex();
+        fdbPrivateAccountOpeningInfoMapper.createIndex();
+        fdbPublicAccountOpeningInfoMapper.createIndex();
     }
 
 
diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java
index ee0e8c8..de81338 100644
--- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java
+++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java
@@ -1717,13 +1717,13 @@ public class BankServiceImpl implements BankService {
                 case Constants.BANK_IMPORT_MODEL_BANK_FDB: // 富滇银行
                     try {
                         esIndexHelper.delFDBIndex(caseId);
+                        esIndexHelper.createFDBIndex(caseId);
                         fdbDataAnalysisHelper.importData(file,caseId);
                         fdbDataAnalysisHelper.analyzeData(caseId);
                     } finally {
                         // 清除ES中的数据
                         esIndexHelper.delFDBIndex(caseId);
                         RedisUtils.incrAtomicValue(completeKey);
-                        long finish = System.currentTimeMillis();
                     }
                     break;
                 case Constants.BANK_IMPORT_MODEL_BOC_BANK: // 中国银行
@@ -1736,7 +1736,6 @@ public class BankServiceImpl implements BankService {
                     } finally {
                         esIndexHelper.delBOCIndex(caseId);
                         RedisUtils.incrAtomicValue(completeKey);
-                        long finish = System.currentTimeMillis();
                     }
                     break;
                 case Constants.BANK_IMPORT_MODEL_CITIC_BANK: // 中信银行
@@ -1750,7 +1749,7 @@ public class BankServiceImpl implements BankService {
                     } finally {
                         esIndexHelper.delCITICIndex(caseId);
                         RedisUtils.incrAtomicValue(completeKey);
-                        long finish = System.currentTimeMillis();
+
                     }
                     break;
                 case Constants.BANK_IMPORT_MODEL_MERCHANTS_BANK: // 招商银行