From 9f3be5b6012529dcc233a9bafa1e1a66641665e8 Mon Sep 17 00:00:00 2001
From: "583641232@qq.com" <583641232@qq.com>
Date: Tue, 30 Jul 2024 17:57:44 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=97=A5=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=A1=88=E4=BB=B6=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datacenter/dataStatisticsController.java    | 16 +++++++++++++++-
 .../datacenter/service/QueryCenterService.java  | 17 ++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/dataStatisticsController.java b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/dataStatisticsController.java
index 3848d39..9adcefc 100644
--- a/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/dataStatisticsController.java
+++ b/cas-admin/src/main/java/com/inscloudtech/web/controller/datacenter/dataStatisticsController.java
@@ -60,7 +60,11 @@ public class dataStatisticsController extends BaseController {
     }
 
 
-    //"案件合并")
+    /**
+     *案件合并
+     * @param bo
+     * @return
+     */
     @RepeatSubmit()
     @PostMapping("/caseMerge")
     public R add( @RequestBody AnalysisDto bo) {
@@ -68,6 +72,16 @@ public class dataStatisticsController extends BaseController {
         return R.ok();
     }
 
+    /**
+     *案件合并 模块列表
+     * @return
+     */
+    @GetMapping("/caseMergeModuleList")
+    public R caseMergeModuleList() {
+        queryCenterService.caseMergeModuleList();
+        return R.ok();
+    }
+
 
 //    /**
 //     * 压缩文件并响应给浏览器
diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java
index 631ea60..5e992f6 100644
--- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java
+++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java
@@ -142,6 +142,8 @@ public class QueryCenterService {
     private final ICarInfoService carInfoService;
 
     private final PlateNumberService plateNumberService;
+    private final CollectionInformationService collectionInformationService;
+
     private final BankService bankService;
 
     private Map<String,List<Class<?>>> importMapperMap = new HashMap();
@@ -561,6 +563,10 @@ public class QueryCenterService {
                 PlateNumberInfo plateNumberInfo = JSONUtil.toBean(json.toString(), PlateNumberInfo.class);
                 searchSourceBuilder = plateNumberService.getSearchSourceBuilder(plateNumberInfo);
                 break;
+            case "dc_collection_information":
+                CollectionInformation collectionInformation = JSONUtil.toBean(json.toString(), CollectionInformation.class);
+                searchSourceBuilder = collectionInformationService.getSearchSourceBuilder(collectionInformation);
+                break;
             default:
                 break;
         }
@@ -1357,13 +1363,10 @@ public class QueryCenterService {
 
     private static final List<Class> CLASS_LIST = Arrays.asList(BankStatement.class, OpeningAccountInfo.class,TransactionPartner.class, PublicFamily.class,
             RealEstate.class, CarInfo.class, OtherAssets.class, OtherInformation.class);
-    private static final List<Class> SERVICE_LIST = Arrays.asList(BankService.class, OpeningAccountInfoService.class,ITransactionPartnerService.class, IPublicFamilyService.class,
-            IRealEstateService.class, ICarInfoService.class);
 
     private static final List<String> CLASS_NAME = Arrays.asList("银行流水","开户信息","所在单位交易客户","职工及家属名册","不动产信息","车辆信息");
 
     @SneakyThrows
-
     public void excelExport(HttpServletResponse response,AnalysisResult bo) {
         Map<String,Class> classMap = new HashMap<>();
         for (Class classItem : CLASS_LIST) {
@@ -1413,11 +1416,11 @@ public class QueryCenterService {
 
     }
 
-    private final IAnalysisResultService iAnalysisResultService;
 
     private static final List<Class> SERVICE_LIST_MERGE = Arrays.asList(BankService.class, OpeningAccountInfoService.class,ITransactionPartnerService.class, IPublicFamilyService.class,
             IRealEstateService.class, ICarInfoService.class,IOtherAssetsService.class,IOtherInformationService.class, IAnalysisResultService.class,
-            IAnalysisReportService.class);
+        IAnalysisReportService.class,
+         PlateNumberInfo.class,  CollectionInformation.class);
 
     public void caseMerge(AnalysisDto bo) {
 
@@ -1448,4 +1451,8 @@ public class QueryCenterService {
         }
 
     }
+
+    public void caseMergeModuleList() {
+
+    }
 }