From b22b8f688b31ae7c6e503b787f66ec5fa329127d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 18:23:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 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 78c1ccf..dd81b77 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -2,9 +2,8 @@
import com.alibaba.fastjson2.JSONObject;
import com.mongodb.client.result.DeleteResult;
-import com.ycl.calculate.CalculationStrategy;
-import com.ycl.factory.IndexCalculationFactory;
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;
@@ -20,13 +19,11 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.unit.DataUnit;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
-
+//娴峰悍瀵规帴鏁版嵁浠诲姟
@Slf4j
@Component("HKTask")
public class HKTask {
@@ -53,7 +50,7 @@
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())));
+ 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.insert(list);
@@ -72,7 +69,7 @@
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())));
+ 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.insert(list);
@@ -95,7 +92,7 @@
if (!CollectionUtils.isEmpty(carList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
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()))
.and("dataType").is(ApiConstants.HK_DATATYPE_CAR));
DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
@@ -111,7 +108,7 @@
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()))
.and("dataType").is(ApiConstants.HK_DATATYPE_FACE));
DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
@@ -133,7 +130,7 @@
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);
@@ -153,7 +150,7 @@
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);
@@ -173,7 +170,7 @@
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);
@@ -193,7 +190,7 @@
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);
@@ -215,9 +212,9 @@
if (!CollectionUtils.isEmpty(carList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
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()))
.and("dataType").is(ApiConstants.HK_DATATYPE_CAR));
- DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_CAR));
mongoTemplate.insert(carList);
@@ -231,9 +228,9 @@
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()))
.and("dataType").is(ApiConstants.HK_DATATYPE_FACE));
- DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DATATYPE_FACE));
mongoTemplate.insert(faceList);
@@ -253,7 +250,7 @@
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);
@@ -273,8 +270,8 @@
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, FaceDeviceSamplingResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(faceList);
}
@@ -293,8 +290,8 @@
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, FaceDeviceSamplingResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(faceList);
}
@@ -304,7 +301,7 @@
//瑙ｆ瀽鏁版嵁
private <T> List<T> getDataList(JSONObject faceJsonObject, Class<T> resultClass, String message) {
- if (faceJsonObject != null && ApiConstants.successCode.equals(faceJsonObject.getString("code"))) {
+ if (faceJsonObject != null && ApiConstants.HKSuccessCode.equals(faceJsonObject.getString("code"))) {
JSONObject data = faceJsonObject.getJSONObject("data");
if (data == null) {
log.error(message, faceJsonObject);
@@ -314,11 +311,6 @@
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