From f8751d6e701e0c3e7d8959449b67db6c35d09ec8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 08 十二月 2024 19:24:07 +0800
Subject: [PATCH] 新增故障类型
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 105 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 36 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 eecd52e..10815fd 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,12 @@
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琛ㄥ湪绾跨姸鎬侊紙鏈夋姄鎷嶉噺瑙嗕綔鍦ㄧ嚎锛�
+ //宸ュ崟
}
/** 浜鸿劯鏁版嵁 */
@@ -145,11 +147,12 @@
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);
- //TODO:鏇存柊point琛ㄥ湪绾跨姸鎬�
+ //TODO:鏇存柊point琛ㄥ湪绾跨姸鎬侊紙鏈夋姄鎷嶉噺瑙嗕綔鍦ㄧ嚎锛�
+ //宸ュ崟
}
log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
@@ -174,7 +177,7 @@
item.setNo(item.getExternalIndexCode());
}
});
- pointService.setDeviceTagByGB(faceList);
+ pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(faceList);
}
@@ -189,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("缁撴潫鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
}
@@ -216,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("缁撴潫鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
}
@@ -244,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("缁撴潫灞炴�ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -283,13 +286,13 @@
.and("dataType").is(ApiConstants.HK_DataType_CAR));
DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
carList.stream().forEach(item -> {
+ item.setDataType(ApiConstants.HK_DataType_CAR);
if (Objects.nonNull(item.getExternalIndexCode())) {
item.setNo(item.getExternalIndexCode());
}
});
- pointService.setDeviceTagByGB(carList);
+ pointService.setDeviceTagByGB(carList,CheckConstants.Rule_Category_Car);
mongoTemplate.insertAll(carList);
}
@@ -308,7 +311,13 @@
.and("dataType").is(ApiConstants.HK_DataType_FACE));
DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
+ faceList.forEach(item -> {
+ item.setDataType(ApiConstants.HK_DataType_FACE);
+ if (Objects.nonNull(item.getExternalIndexCode())) {
+ item.setNo(item.getExternalIndexCode());
+ }
+ });
+ pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
mongoTemplate.insertAll(faceList);
}
log.info("缁撴潫鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉鏁版嵁鍚屾");
@@ -323,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("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
}
@@ -351,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("缁撴潫杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
@@ -390,13 +399,37 @@
item.setNo(item.getExternalIndexCode());
}
});
- pointService.setDeviceTagByGB(faceList);
+ pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(faceList);
}
log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
+ //涓氬姟鏍�
+ public void TreeTask() {
+ log.info("寮�濮嬫墽琛屼笟鍔℃爲鏁版嵁");
+ TreeParam param = new TreeParam();
+ param.setStartDate("2024-12-06");
+ param.setEndDate("2024-12-06");
+ List<HKTreeResult> faceList = HkApiUtil.sendGetAPI(host,appKey,appSecret,"/api/third/timeTree", param, HKTreeResult.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);
+// faceList.stream().forEach(item -> {
+// if (Objects.nonNull(item.getExternalIndexCode())) {
+// item.setNo(item.getExternalIndexCode());
+// }
+// });
+// pointService.setDeviceTagByGB(faceList,CheckConstants.Rule_Category_Face);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(faceList);
+// }
+ log.info("缁撴潫涓氬姟鏍戞暟鎹�");
+ }
+
//瑙ｆ瀽鏁版嵁
private <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass, String message) {
if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) {
--
Gitblit v1.8.0