From 891a0a7c52c25a31f318b7ff256aa45f0600512a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 09 八月 2024 17:37:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 129fc53..e51c2a6 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -54,16 +54,51 @@
@Value("${youYun.passwd}")
private String passwd;
+ // 鍥惧儚妫�娴�
+ 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("鍥惧儚鐩戞祴鏁版嵁涓虹┖");
+ }
+ log.info("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾");
+ }
+
//涓�鏈轰竴妗�
public void monitorTask() {
- //涓�鏈轰竴妗ｅ悎鏍肩巼
// 涓�鏈轰竴妗ｆ敞鍐岀巼
// 妗ｆ鑰冩牳姣�
log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｆ暟鎹悓姝�");
OneMachineFileParam param = new OneMachineFileParam();
JSONObject jsonObject = uyClient.oneMachineFile(param);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡" + jsonObject);
JSONObject cameraList = jsonObject.getJSONObject("CameraList");
if (cameraList != null) {
List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class);
@@ -95,7 +130,6 @@
param.setPageSize(ApiConstants.PageSize);
JSONObject jsonObject = uyClient.monitorQualify(param);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡" + jsonObject);
String code = jsonObject.getString("code");
if (ApiConstants.UYSuccessCodeStr.equals(code)) {
JSONObject data = jsonObject.getJSONObject("data");
@@ -133,7 +167,6 @@
param.setIcmpStatus(ApiConstants.UY_OnlineStatus_All);
JSONObject jsonObject = uyClient.videoOnline(param);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡" + jsonObject);
Integer statusCode = jsonObject.getInteger("statusCode");
if (ApiConstants.UYSuccessCode.equals(statusCode)) {
JSONObject data = jsonObject.getJSONObject("data");
@@ -180,7 +213,7 @@
if (!CollectionUtils.isEmpty(records)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(instance.getTime())).lt(DateUtils.getDayEnd(instance.getTime())));
DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
@@ -202,7 +235,6 @@
param.setPageSize(ApiConstants.PageSize);
JSONObject jsonObject = uyClient.osdMonitorList(param, tenantId);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡" + jsonObject);
if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
--
Gitblit v1.8.0