From 083ac7646ef2ab4a2614678b158a3dce1482e75c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 十二月 2024 02:32:13 +0800
Subject: [PATCH] 省厅标签拆分

---
 ycl-server/src/main/java/com/ycl/task/HKTask.java |   69 +++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 34 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 829671b..993e794 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -8,6 +8,7 @@
 import com.ycl.platform.service.*;
 import com.ycl.utils.DateUtils;
 import constant.ApiConstants;
+import constant.CheckConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,7 +58,7 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(list);
+            pointService.setDeviceTagByGB(list, CheckConstants.Rule_Category_Car);
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(list);
             //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
@@ -86,7 +87,7 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(list);
+            pointService.setDeviceTagByGB(list,CheckConstants.Rule_Category_Face);
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(list);
             //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
@@ -119,11 +120,11 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(carList);
+            pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
             //瀛樻斁鍦╩ongo涓�
             carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
             mongoTemplate.insertAll(carList);
-            //TODO:鏇存柊point琛ㄥ湪绾跨姸鎬侊紙鏈夋姄鎷嶉噺瑙嗕綔鍦ㄧ嚎锛�
+            //TODO锛氭洿鏂皃oint琛ㄥ湪绾跨姸鎬侊紙鏈夋姄鎷嶉噺瑙嗕綔鍦ㄧ嚎锛�
             //宸ュ崟
         }
 
@@ -146,7 +147,7 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
             //瀛樻斁鍦╩ongo涓�
             faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
             mongoTemplate.insertAll(faceList);
@@ -176,7 +177,7 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }
@@ -191,20 +192,20 @@
         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)) {
+        List<CrossDetailResult> carList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class);
+        if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
                     .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, CrossDetailResult.class);
-            faceList.stream().forEach(item -> {
+            carList.stream().forEach(item -> {
                 if (Objects.nonNull(item.getExternalIndexCode())) {
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insertAll(faceList);
+            mongoTemplate.insertAll(carList);
         }
         log.info("缁撴潫鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
     }
@@ -218,21 +219,21 @@
         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);
+        List<DataIntegrityMonitoringResult> carList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/attributeIntegrity/query", param, DataIntegrityMonitoringResult.class);
 
-        if (!CollectionUtils.isEmpty(faceList)) {
+        if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
                     .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, DataIntegrityMonitoringResult.class);
-            faceList.stream().forEach(item -> {
+            carList.stream().forEach(item -> {
                 if (Objects.nonNull(item.getExternalIndexCode())) {
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insertAll(faceList);
+            mongoTemplate.insertAll(carList);
         }
         log.info("缁撴潫鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
     }
@@ -246,21 +247,21 @@
         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);
+        List<AttrRecognitionMonitorResult> carList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/attributeRecognition/query", param, AttrRecognitionMonitorResult.class);
 
-        if (!CollectionUtils.isEmpty(faceList)) {
+        if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
                     .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, AttrRecognitionMonitorResult.class);
-            faceList.stream().forEach(item -> {
+            carList.stream().forEach(item -> {
                 if (Objects.nonNull(item.getExternalIndexCode())) {
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insertAll(faceList);
+            mongoTemplate.insertAll(carList);
         }
         log.info("缁撴潫灞炴�ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
 
@@ -291,7 +292,7 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(carList);
+            pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
             mongoTemplate.insertAll(carList);
         }
 
@@ -316,7 +317,7 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
             mongoTemplate.insertAll(faceList);
         }
         log.info("缁撴潫鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉鏁版嵁鍚屾");
@@ -331,21 +332,21 @@
         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);
+        List<PicAccessResult> carList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v1/data/picAccessDetail/query", param, PicAccessResult.class);
 
-        if (!CollectionUtils.isEmpty(faceList)) {
+        if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
                     .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class);
-            faceList.stream().forEach(item -> {
+            carList.stream().forEach(item -> {
                 if (Objects.nonNull(item.getExternalIndexCode())) {
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insertAll(faceList);
+            mongoTemplate.insertAll(carList);
         }
         log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
@@ -359,21 +360,21 @@
         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);
+        List<VehicleDeviceSamplingResult> carList = HkApiUtil.sendAPI(host,appKey,appSecret,"/api/dqd/service/rs/v2/data/vehSampleAmount/query", param, VehicleDeviceSamplingResult.class);
 
-        if (!CollectionUtils.isEmpty(faceList)) {
+        if (!CollectionUtils.isEmpty(carList)) {
             //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
             Query query = new Query(Criteria
                     .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
             DeleteResult result = mongoTemplate.remove(query, VehicleDeviceSamplingResult.class);
-            faceList.stream().forEach(item -> {
+            carList.stream().forEach(item -> {
                 if (Objects.nonNull(item.getExternalIndexCode())) {
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
             //瀛樻斁鍦╩ongo涓�
-            mongoTemplate.insertAll(faceList);
+            mongoTemplate.insertAll(carList);
         }
         log.info("缁撴潫杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
     }
@@ -398,7 +399,7 @@
                     item.setNo(item.getExternalIndexCode());
                 }
             });
-            pointService.setDeviceTagByGB(faceList);
+            pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
             //瀛樻斁鍦╩ongo涓�
             mongoTemplate.insertAll(faceList);
         }

--
Gitblit v1.8.0