From 70dfa087a9f61ecc33f3b5bc618202c2023e38f3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 19 八月 2024 15:45:26 +0800
Subject: [PATCH] 优云接口工单生成

---
 ycl-server/src/main/java/com/ycl/task/HKTask.java |  305 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 180 insertions(+), 125 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 69e7a29..00b346a 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -2,8 +2,9 @@
 
 import com.alibaba.fastjson2.JSONObject;
 import com.mongodb.client.result.DeleteResult;
+import com.ycl.feign.HkApiUtil;
+import com.ycl.feign.HkApiUtil;
 import com.ycl.platform.domain.param.HK.*;
-import com.ycl.platform.domain.result.BaseResult;
 import com.ycl.platform.domain.result.HK.*;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ICheckIndexFaceService;
@@ -23,15 +24,13 @@
 import java.util.Date;
 import java.util.List;
 
-
+//娴峰悍瀵规帴鏁版嵁浠诲姟
 @Slf4j
 @Component("HKTask")
 public class HKTask {
 
     @Autowired
     private MongoTemplate mongoTemplate;
-    @Autowired
-    private HKClient hkClient;
     @Autowired
     private IYwThresholdService ywThresholdService;
     @Autowired
@@ -44,39 +43,46 @@
     //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
     public void vehicleDeviceInspectionTask() {
         log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
-        VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
-        JSONObject jsonObject = hkClient.VehicleDeviceInspection(param);
-        List<VehicleDeviceInspectionResult> list = getDataList(jsonObject, VehicleDeviceInspectionResult.class, "杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
-        if (!CollectionUtils.isEmpty(list)) {
-            //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
-            Query query = new Query(Criteria.where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
-            DeleteResult result = mongoTemplate.remove(query, VehicleDeviceInspectionResult.class);
-            //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(list);
-            //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
-            ywThresholdService.carCheck(list);
-        }
+//        VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
+//        param.setPageNo(ApiConstants.PageNo);
+//        param.setPageSize(ApiConstants.HKPageSize);
+//        param.setDate(DateUtils.getDate());
+//        param.setDataType(ApiConstants.HK_DataType_CAR);
+//        List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI("/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())));
+//            DeleteResult result = mongoTemplate.remove(query, VehicleDeviceInspectionResult.class);
+//            //瀛樻斁鍦╩ongo涓�
+//            mongoTemplate.insertAll(list);
+//            //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
+//            ywThresholdService.carCheck(list);
+//        }
+        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+        ywThresholdService.carCheck(mongoTemplate.find(query, VehicleDeviceInspectionResult.class));
         log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
     //浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
     public void faceDeviceInspectionTask() {
         log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
-        FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
-        JSONObject jsonObject = hkClient.FaceDeviceInspection(param);
-        List<FaceDeviceInspectionResult> list = getDataList(jsonObject, FaceDeviceInspectionResult.class, "浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
-        if (!CollectionUtils.isEmpty(list)) {
-            //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
-            Query query = new Query(Criteria.where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
-            DeleteResult result = mongoTemplate.remove(query, FaceDeviceInspectionResult.class);
-            //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(list);
-            //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
-            //TODO:鍙兘鏈夐噸澶嶅伐鍗�
-            ywThresholdService.faceCheck(list);
-        }
+//        FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
+//        param.setPageNo(ApiConstants.PageNo);
+//        param.setPageSize(ApiConstants.HKPageSize);
+//        param.setDate(DateUtils.getDate());
+//        List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI("/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())));
+//            DeleteResult result = mongoTemplate.remove(query, FaceDeviceInspectionResult.class);
+//            //瀛樻斁鍦╩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("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
@@ -86,34 +92,38 @@
         log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�");
         /** 杞﹁締鏁版嵁 */
         SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam();
-        carParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_CAR);
-        JSONObject carJsonObject = hkClient.SnapshotDataMonitor(carParam);
-        List<SnapshotDataMonitorResult> carList = getDataList(carJsonObject, 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("/api/dqd/service/rs/v1/data/snapCountDetail/query", carParam, SnapshotDataMonitorResult.class);
         if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
-                    .and("dataType").is(ApiConstants.HK_DATATYPE_CAR));
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
+                    .and("dataType").is(ApiConstants.HK_DataType_CAR));
             DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
             //瀛樻斁鍦╩ongo涓�
-            carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_CAR));
-            mongoTemplate.insert(carList);
+            carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
+            mongoTemplate.insertAll(carList);
         }
 
         /** 浜鸿劯鏁版嵁 */
         SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
-        faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_FACE);
-        JSONObject faceJsonObject = hkClient.SnapshotDataMonitor(carParam);
-        List<SnapshotDataMonitorResult> faceList = getDataList(faceJsonObject, 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("/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class);
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
-                    .and("dataType").is(ApiConstants.HK_DATATYPE_FACE));
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
+                    .and("dataType").is(ApiConstants.HK_DataType_FACE));
             DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
             //瀛樻斁鍦╩ongo涓�
-            carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_FACE));
-            mongoTemplate.insert(faceList);
+            carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟
         log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
@@ -124,16 +134,17 @@
         log.info("寮�濮嬫墽琛岄噰闆嗚澶囧睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
         //浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
         MonitoringDetailParam param = new MonitoringDetailParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
-        JSONObject jsonObject = hkClient.monitorDetail(param);
-        List<MonitoringDetailResult> faceList = getDataList(jsonObject, MonitoringDetailResult.class, "閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹负绌�");
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        List<MonitoringDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/cameraExpDetailInfo/query", param, MonitoringDetailResult.class);
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, MonitoringDetailResult.class);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(faceList);
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -144,16 +155,17 @@
         log.info("寮�濮嬫墽琛屽崱鍙e睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
         CrossDetailParam param = new CrossDetailParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
-        JSONObject jsonObject = hkClient.crossDetail(param);
-        List<CrossDetailResult> faceList = getDataList(jsonObject, CrossDetailResult.class, "鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹负绌�");
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        List<CrossDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class);
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, CrossDetailResult.class);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(faceList);
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -164,16 +176,19 @@
         log.info("寮�濮嬫墽琛屾暟鎹畬鏁存�х洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�
         DataIntegrityMonitoringParam param = new DataIntegrityMonitoringParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_CAR);
-        JSONObject jsonObject = hkClient.DataIntegrityMonitoring(param);
-        List<DataIntegrityMonitoringResult> faceList = getDataList(jsonObject, 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("/api/dqd/service/rs/v1/data/attributeIntegrity/query", param, DataIntegrityMonitoringResult.class);
+
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, DataIntegrityMonitoringResult.class);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(faceList);
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -184,16 +199,19 @@
         log.info("寮�濮嬫墽琛屽睘鎬ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�
         AttrRecognitionParam param = new AttrRecognitionParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_CAR);
-        JSONObject jsonObject = hkClient.AttrRecognitionMonitor(param);
-        List<AttrRecognitionMonitorResult> faceList = getDataList(jsonObject, 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("/api/dqd/service/rs/v1/data/attributeRecognition/query", param, AttrRecognitionMonitorResult.class);
+
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, AttrRecognitionMonitorResult.class);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(faceList);
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫灞炴�ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -206,116 +224,153 @@
         //杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
         /** 杞﹁締鏁版嵁 */
         SnapshotDelayMonitorParam carParam = new SnapshotDelayMonitorParam();
-        carParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_CAR);
-        JSONObject carJsonObject = hkClient.SnapshotDelayMonitor(carParam);
-        List<SnapshotDelayMonitorResult> carList = getDataList(carJsonObject, 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("/api/dqd/service/rs/v1/data/snapAgingDetail/query", carParam, SnapshotDelayMonitorResult.class);
+
         if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
-                    .and("dataType").is(ApiConstants.HK_DATATYPE_CAR));
-            DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
+                    .and("dataType").is(ApiConstants.HK_DataType_CAR));
+            DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
             //瀛樻斁鍦╩ongo涓�
-            carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_CAR));
-            mongoTemplate.insert(carList);
+            carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
+            mongoTemplate.insertAll(carList);
         }
 
         /** 浜鸿劯鏁版嵁 */
         SnapshotDelayMonitorParam faceParam = new SnapshotDelayMonitorParam();
-        faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_FACE);
-        JSONObject faceJsonObject = hkClient.SnapshotDelayMonitor(faceParam);
-        List<SnapshotDelayMonitorParam> faceList = getDataList(faceJsonObject, 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("/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorResult.class);
+
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
-                    .and("dataType").is(ApiConstants.HK_DATATYPE_FACE));
-            DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
+                    .and("dataType").is(ApiConstants.HK_DataType_FACE));
+            DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
             //瀛樻斁鍦╩ongo涓�
-            carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_FACE));
-            mongoTemplate.insert(faceList);
+            faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟
         log.info("缁撴潫鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
     //鍥剧墖璁块棶鐩戞祴缁撴灉
-    public void PicAccessTask() {
+    public void picAccessTask() {
         log.info("寮�濮嬫墽琛屽浘鐗囪闂洃娴嬬粨鏋滄暟鎹悓姝�");
         //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙h澶噓rl鍙敤鎬�
         PicAccessParam param = new PicAccessParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_CAR);
-        JSONObject jsonObject = hkClient.PicAccessMonitor(param);
-        List<PicAccessResult> faceList = getDataList(jsonObject, 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("/api/dqd/service/rs/v1/data/picAccessDetail/query", param, PicAccessResult.class);
+
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(faceList);
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
-
-    //浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
-    public void Face() {
-        log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+    //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+    public void vehicleDeviceSamplingTask() {
+        log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
         //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙h澶噓rl鍙敤鎬�
-        FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
-        JSONObject jsonObject = hkClient.FaceDeviceSampling(param);
-        List<FaceDeviceSamplingResult> faceList = getDataList(jsonObject, FaceDeviceSamplingResult.class, "浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+        VehicleDeviceSamplingParam param = new VehicleDeviceSamplingParam();
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        param.setDataType(ApiConstants.HK_DataType_CAR);
+        List<VehicleDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehSampleAmount/query", param, VehicleDeviceSamplingResult.class);
+
         if (!CollectionUtils.isEmpty(faceList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
-            DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class);
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+            DeleteResult result = mongoTemplate.remove(query, VehicleDeviceSamplingResult.class);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(faceList);
+            mongoTemplate.insertAll(faceList);
+        }
+        //TODO:宸ュ崟澶勭悊
+        log.info("缁撴潫杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+    }
+
+
+    //浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+    public void faceDeviceSamplingTask() {
+        log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+        FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
+        param.setPageNo(ApiConstants.PageNo);
+        param.setPageSize(ApiConstants.HKPageSize);
+        param.setDate(DateUtils.getDate());
+        List<FaceDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceSampleAmount/query", param, FaceDeviceSamplingResult.class);
+
+        if (!CollectionUtils.isEmpty(faceList)) {
+            //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+            Query query = new Query(Criteria
+                    .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+            DeleteResult result = mongoTemplate.remove(query, FaceDeviceSamplingResult.class);
+            //瀛樻斁鍦╩ongo涓�
+            mongoTemplate.insertAll(faceList);
         }
         //TODO:宸ュ崟澶勭悊
         log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
 
-    //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
-    public void FaceDeviceSamplingTask() {
-        log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
-        //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙h澶噓rl鍙敤鎬�
-        FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
-        param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
-        JSONObject jsonObject = hkClient.FaceDeviceSampling(param);
-        List<FaceDeviceSamplingResult> faceList = getDataList(jsonObject, FaceDeviceSamplingResult.class, "浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
-        if (!CollectionUtils.isEmpty(faceList)) {
-            //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
-            Query query = new Query(Criteria
-                    .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
-            DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class);
-            //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insert(faceList);
-        }
-        //TODO:宸ュ崟澶勭悊
-        log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+    //娴嬭瘯
+    public void test() {
+        log.info("娴嬭瘯娴峰悍鎺ュ彛");
+        HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceDetect/query", new FaceDeviceSamplingParam(), Object.class);
+        log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
+    }
+
+    //娴嬭瘯
+    public void test1() {
+        log.info("娴嬭瘯娴峰悍鎺ュ彛");
+        HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/coordinateExpInfo/query", new FaceDeviceSamplingParam(), Object.class);
+        log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
+    }
+
+    //娴嬭瘯
+    public void test2() {
+        log.info("娴嬭瘯娴峰悍鎺ュ彛");
+        HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/gbCodeExpInfo/query", new FaceDeviceSamplingParam(), Object.class);
+        log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
+    }
+
+    //娴嬭瘯
+    public void test3() {
+        log.info("娴嬭瘯娴峰悍鎺ュ彛");
+        HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/passDetect/query", new FaceDeviceSamplingParam(), Object.class);
+        log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
     }
 
     //瑙f瀽鏁版嵁
-    private <T> List<T> getDataList(JSONObject faceJsonObject, Class<T> resultClass, String message) {
-        if (faceJsonObject != null && ApiConstants.successCode.equals(faceJsonObject.getString("code"))) {
-            JSONObject data = faceJsonObject.getJSONObject("data");
+    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, faceJsonObject);
+                log.error(message, jsonObject);
                 return null;
             }
             List<T> list = data.getList("list", resultClass);
             if (CollectionUtils.isEmpty(list)) {
                 log.error(message, data);
                 return null;
-            }
-            for (T t : list) {
-                if (t instanceof BaseResult) {
-                    ((BaseResult) t).setCreateTime(new Date());
-                }
             }
             return list;
         } else {

--
Gitblit v1.8.0