From 9a4549c0c2dbe44c9568fe56fb4df8d6fbb44d4f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 19 八月 2024 16:33:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 185 +++++++++++++++++++++++++--------------------
1 files changed, 103 insertions(+), 82 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index 1c0d8af..1313214 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -4,12 +4,14 @@
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
import com.ycl.platform.domain.param.UY.*;
+import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.OsdMonitorResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
@@ -43,6 +45,9 @@
private IYwThresholdService ywThresholdService;
@Autowired
private ITMonitorService monitorService;
+ @Autowired
+ private UYErrorTypeCheckService uyErrorTypeCheckService;
+
@Value("${youYun.tenantId}")
private String tenantId;
@Value("${youYun.apikey}")
@@ -57,37 +62,41 @@
// 鍥惧儚妫�娴�
public void imageDetection() {
log.info("寮�濮嬫墽琛屽浘鍍忔娴嬫暟鎹悓姝�");
- ImageDetectionParam param = new ImageDetectionParam();
- param.setPageNum(ApiConstants.PageNo);
- param.setPageSize(ApiConstants.PageSize);
- param.setArealayerno(ApiConstants.AreaNo);
- JSONObject jsonObject = uyClient.imageDetection(param);
- if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡" + jsonObject);
- Integer statusCode = jsonObject.getInteger("statusCode");
- if (ApiConstants.UYSuccessCode.equals(statusCode)) {
- JSONObject data = jsonObject.getJSONObject("data");
- if (data != null) {
- List<ImageDetectionResult> records = data.getList("records", ImageDetectionResult.class);
- if (!CollectionUtils.isEmpty(records)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(records);
- } else {
- log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", data);
- }
- } else {
- log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", jsonObject);
- }
- } else {
- log.error("鍥惧儚鐩戞祴璇锋眰澶辫触{}", jsonObject);
- }
- } else {
- log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖");
- }
+// ImageDetectionParam param = new ImageDetectionParam();
+// param.setPageNum(ApiConstants.PageNo);
+// param.setPageSize(ApiConstants.PageSize);
+// param.setArealayerno(ApiConstants.AreaNo);
+// JSONObject jsonObject = uyClient.imageDetection(param);
+// if (jsonObject != null) {
+// log.info("鏁版嵁鏍煎紡" + jsonObject);
+// Integer statusCode = jsonObject.getInteger("statusCode");
+// if (ApiConstants.UYSuccessCode.equals(statusCode)) {
+// JSONObject data = jsonObject.getJSONObject("data");
+// if (data != null) {
+// List<ImageDetectionResult> records = data.getList("records", ImageDetectionResult.class);
+// if (!CollectionUtils.isEmpty(records)) {
+// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria
+// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, ImageDetectionResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(records);
+// // 宸ュ崟鐢熸垚
+// uyErrorTypeCheckService.imageDetectionCheck(records);
+// } else {
+// log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", data);
+// }
+// } else {
+// log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖{}", jsonObject);
+// }
+// } else {
+// log.error("鍥惧儚鐩戞祴璇锋眰澶辫触{}", jsonObject);
+// }
+// } else {
+// log.error("鍥惧儚鐩戞祴鏁版嵁涓虹┖");
+// }
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ uyErrorTypeCheckService.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class));
log.info("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾");
}
@@ -97,33 +106,37 @@
// 涓�鏈轰竴妗ｆ敞鍐岀巼
// 妗ｆ鑰冩牳姣�
log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
- MonitorQualifyParam param = new MonitorQualifyParam();
- param.setPageNum(ApiConstants.PageNo);
- param.setPageSize(ApiConstants.PageSize);
- JSONObject jsonObject = uyClient.monitorQualify(param);
- if (jsonObject != null) {
- String code = jsonObject.getString("code");
- if (ApiConstants.UYSuccessCodeStr.equals(code)) {
- JSONObject data = jsonObject.getJSONObject("data");
- if (data != null) {
- List<MonitorQualifyResult> records = data.getList("records", MonitorQualifyResult.class);
- if (!CollectionUtils.isEmpty(records)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, MonitorQualifyResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(records);
- } else {
- log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", data);
- }
- }
- } else {
- log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", jsonObject);
- }
- } else {
- log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖");
- }
+// MonitorQualifyParam param = new MonitorQualifyParam();
+// param.setPageNum(ApiConstants.PageNo);
+// param.setPageSize(ApiConstants.PageSize);
+// JSONObject jsonObject = uyClient.monitorQualify(param);
+// if (jsonObject != null) {
+// String code = jsonObject.getString("code");
+// if (ApiConstants.UYSuccessCodeStr.equals(code)) {
+// JSONObject data = jsonObject.getJSONObject("data");
+// if (data != null) {
+// List<MonitorQualifyResult> records = data.getList("records", MonitorQualifyResult.class);
+// if (!CollectionUtils.isEmpty(records)) {
+// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria
+// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, MonitorQualifyResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(records);
+// // 宸ュ崟鐢熸垚
+// uyErrorTypeCheckService.monitorQualifyCheck(records);
+// } else {
+// log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", data);
+// }
+// }
+// } else {
+// log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", jsonObject);
+// }
+// } else {
+// log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖");
+// }
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ uyErrorTypeCheckService.monitorQualifyCheck(mongoTemplate.find(query, MonitorQualifyResult.class));
log.info("缁撴潫涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
}
@@ -151,6 +164,8 @@
DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
+ // 宸ュ崟鐢熸垚
+ uyErrorTypeCheckService.videoOnlineCheck(records);
} else {
log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data);
}
@@ -163,6 +178,8 @@
} else {
log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖");
}
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ uyErrorTypeCheckService.videoOnlineCheck(mongoTemplate.find(query, VideoOnlineResult.class));
log.info("缁撴潫鎵ц鐐逛綅鍦ㄧ嚎鏁版嵁鍚屾");
}
@@ -170,30 +187,34 @@
public void recordMetaDSumTask() {
//褰曞儚鍙敤鐜�
log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
- RecordMetaDSumParam param = new RecordMetaDSumParam();
- param.setTenantId(tenantId);
- Calendar instance = Calendar.getInstance();
- instance.setTime(new Date());
- instance.add(Calendar.DAY_OF_MONTH, -1);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- String yesterday = format.format(instance.getTime());
- param.setStatTime(yesterday);
- JSONObject jsonObject = uyClient.recordMetaDSumList(param);
- if (jsonObject != null) {
- if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
- List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
- if (!CollectionUtils.isEmpty(records)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(records);
- }
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
- }
- }
+// RecordMetaDSumParam param = new RecordMetaDSumParam();
+// param.setTenantId(tenantId);
+// Calendar instance = Calendar.getInstance();
+// instance.setTime(new Date());
+// instance.add(Calendar.DAY_OF_MONTH, -1);
+// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+// String yesterday = format.format(instance.getTime());
+// param.setStatTime(yesterday);
+// JSONObject jsonObject = uyClient.recordMetaDSumList(param);
+// if (jsonObject != null) {
+// if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
+// List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
+// if (!CollectionUtils.isEmpty(records)) {
+// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria
+// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(records);
+// // 宸ュ崟鐢熸垚
+// uyErrorTypeCheckService.recordMetaDSumCheck(records);
+// }
+// } else {
+// log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
+// }
+// }
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
--
Gitblit v1.8.0