From 1ffc844e3483cd3ac7cc73b5fb17c62e09d1ff2f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 10:54:34 +0800
Subject: [PATCH] 工单取图像查询工单范围调整、分页图片查询

---
 ycl-server/src/main/java/com/ycl/task/HKTask.java |  138 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 98 insertions(+), 40 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index f37f81f..34ac13b 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -15,6 +15,7 @@
 import com.ycl.feign.HKClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -29,6 +30,12 @@
 @Component("HKTask")
 public class HKTask {
 
+    @Value("${HK.host}")
+    public String host;
+    @Value("${HK.appKey}")
+    public String appKey;
+    @Value("${HK.appSecret}")
+    public String appSecret;
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
@@ -44,8 +51,11 @@
     public void vehicleDeviceInspectionTask() {
         log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
         VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
-        List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehFullAmount/query", param, VehicleDeviceInspectionResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        param.setDataType(ApiConstants.HK_DataType_CAR);
+        List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v2/data/vehFullAmount/query", param, VehicleDeviceInspectionResult.class);
         if (!CollectionUtils.isEmpty(list)) {
             //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -55,6 +65,9 @@
             //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
             ywThresholdService.carCheck(list);
         }
+        // 鏈湴娴嬭瘯
+//        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+//        ywThresholdService.carCheck(mongoTemplate.find(query, VehicleDeviceInspectionResult.class));
         log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
@@ -62,8 +75,10 @@
     public void faceDeviceInspectionTask() {
         log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
         FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
-        List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceFullAmount/query", param, FaceDeviceInspectionResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v2/data/faceFullAmount/query", param, FaceDeviceInspectionResult.class);
         if (!CollectionUtils.isEmpty(list)) {
             //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -71,20 +86,24 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(list);
             //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
-            //TODO:鍙兘鏈夐噸澶嶅伐鍗�
             ywThresholdService.faceCheck(list);
         }
+//        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+//        ywThresholdService.faceCheck(mongoTemplate.find(query, FaceDeviceInspectionResult.class));
         log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
 
-    //鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
+    // 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
     public void snapshotDataMonitorTask() {
         log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�");
         /** 杞﹁締鏁版嵁 */
         SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam();
-        carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
-        List<SnapshotDataMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", carParam, SnapshotDataMonitorResult.class);
+        carParam.setPageNo(ApiConstants.PageNo);
+        carParam.setPageSize(ApiConstants.HKPageSize);
+        carParam.setDate(DateUtils.getDate());
+        carParam.setDataType(ApiConstants.HK_DataType_CAR);
+        List<SnapshotDataMonitorResult> carList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/snapCountDetail/query", carParam, SnapshotDataMonitorResult.class);
         if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
@@ -98,8 +117,11 @@
 
         /** 浜鸿劯鏁版嵁 */
         SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
-        faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
-        List<SnapshotDataMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class);
+        faceParam.setPageNo(ApiConstants.PageNo);
+        faceParam.setPageSize(ApiConstants.HKPageSize);
+        faceParam.setDate(DateUtils.getDate());
+        faceParam.setDataType(ApiConstants.HK_DataType_FACE);
+        List<SnapshotDataMonitorResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class);
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
@@ -110,7 +132,6 @@
             carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟
         log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
     }
 
@@ -119,8 +140,10 @@
         log.info("寮�濮嬫墽琛岄噰闆嗚澶囧睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
         //浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
         MonitoringDetailParam param = new MonitoringDetailParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
-        List<MonitoringDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/cameraExpDetailInfo/query", param, MonitoringDetailResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        List<MonitoringDetailResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/device/cameraExpDetailInfo/query", param, MonitoringDetailResult.class);
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
@@ -129,7 +152,6 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
     }
 
@@ -138,8 +160,10 @@
         log.info("寮�濮嬫墽琛屽崱鍙ｅ睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
         CrossDetailParam param = new CrossDetailParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
-        List<CrossDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        List<CrossDetailResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class);
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
@@ -148,7 +172,6 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
     }
 
@@ -157,8 +180,11 @@
         log.info("寮�濮嬫墽琛屾暟鎹畬鏁存�х洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�
         DataIntegrityMonitoringParam param = new DataIntegrityMonitoringParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
-        List<DataIntegrityMonitoringResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeIntegrity/query", param, DataIntegrityMonitoringResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        param.setDataType(ApiConstants.HK_DataType_CAR);
+        List<DataIntegrityMonitoringResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/attributeIntegrity/query", param, DataIntegrityMonitoringResult.class);
 
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -168,7 +194,6 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
     }
 
@@ -177,8 +202,11 @@
         log.info("寮�濮嬫墽琛屽睘鎬ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�
         AttrRecognitionParam param = new AttrRecognitionParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
-        List<AttrRecognitionMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeRecognition/query", param, AttrRecognitionMonitorResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        param.setDataType(ApiConstants.HK_DataType_CAR);
+        List<AttrRecognitionMonitorResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/attributeRecognition/query", param, AttrRecognitionMonitorResult.class);
 
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -188,7 +216,6 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫灞炴�ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
 
     }
@@ -199,15 +226,18 @@
         //杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
         /** 杞﹁締鏁版嵁 */
         SnapshotDelayMonitorParam carParam = new SnapshotDelayMonitorParam();
-        carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
-        List<SnapshotDelayMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", carParam, SnapshotDelayMonitorResult.class);
+        carParam.setPageNo(ApiConstants.PageNo);
+        carParam.setPageSize(ApiConstants.HKPageSize);
+        carParam.setDate(DateUtils.getDate());
+        carParam.setDataType(ApiConstants.HK_DataType_CAR);
+        List<SnapshotDelayMonitorResult> carList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/snapAgingDetail/query", carParam, SnapshotDelayMonitorResult.class);
 
         if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
                     .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
                     .and("dataType").is(ApiConstants.HK_DataType_CAR));
-            DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
+            DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
             //瀛樻斁鍦╩ongo涓�
             carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
             mongoTemplate.insertAll(carList);
@@ -215,20 +245,22 @@
 
         /** 浜鸿劯鏁版嵁 */
         SnapshotDelayMonitorParam faceParam = new SnapshotDelayMonitorParam();
-        faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
-        List<SnapshotDelayMonitorParam> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorParam.class);
+        faceParam.setPageNo(ApiConstants.PageNo);
+        faceParam.setPageSize(ApiConstants.HKPageSize);
+        faceParam.setDate(DateUtils.getDate());
+        faceParam.setDataType(ApiConstants.HK_DataType_FACE);
+        List<SnapshotDelayMonitorResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorResult.class);
 
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
                     .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
                     .and("dataType").is(ApiConstants.HK_DataType_FACE));
-            DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
+            DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
             //瀛樻斁鍦╩ongo涓�
-            carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
+            faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟
         log.info("缁撴潫鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
@@ -237,8 +269,11 @@
         log.info("寮�濮嬫墽琛屽浘鐗囪闂洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
         PicAccessParam param = new PicAccessParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
-        List<PicAccessResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/picAccessDetail/query", param, PicAccessResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        param.setDataType(ApiConstants.HK_DataType_CAR);
+        List<PicAccessResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/picAccessDetail/query", param, PicAccessResult.class);
 
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -248,16 +283,19 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
+
     //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
     public void vehicleDeviceSamplingTask() {
         log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
         //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
         VehicleDeviceSamplingParam param = new VehicleDeviceSamplingParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
-        List<VehicleDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehSampleAmount/query", param, VehicleDeviceSamplingResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        param.setDataType(ApiConstants.HK_DataType_CAR);
+        List<VehicleDeviceSamplingResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v2/data/vehSampleAmount/query", param, VehicleDeviceSamplingResult.class);
 
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -267,7 +305,6 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
@@ -276,8 +313,10 @@
     public void faceDeviceSamplingTask() {
         log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
         FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
-        param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
-        List<FaceDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceSampleAmount/query", param, FaceDeviceSamplingResult.class);
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        List<FaceDeviceSamplingResult> faceList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v2/data/faceSampleAmount/query", param, FaceDeviceSamplingResult.class);
 
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -287,8 +326,27 @@
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
-        //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
+    //瑙ｆ瀽鏁版嵁
+    private <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass, String message) {
+        if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) {
+            log.info("鏁版嵁鏍煎紡"+jsonObject);
+            JSONObject data = jsonObject.getJSONObject("data");
+            if (data == null) {
+                log.error(message, jsonObject);
+                return null;
+            }
+            List<T> list = data.getList("list", resultClass);
+            if (CollectionUtils.isEmpty(list)) {
+                log.error(message, data);
+                return null;
+            }
+            return list;
+        } else {
+            log.error(message);
+        }
+        return null;
+    }
 }

--
Gitblit v1.8.0