From 3364d6efd58eca1d6acf129948265b1e663dae7a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 34 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 7028c1a..587d9bc 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -4,6 +4,9 @@
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
import com.ycl.platform.domain.param.UY.*;
+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;
@@ -51,48 +54,86 @@
@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();
+// param.setOffset(ApiConstants.PageNo);
+// param.setLimit(ApiConstants.PageSize);
+// JSONObject jsonObject = uyClient.oneMachineFile(param);
+// if (jsonObject != null) {
+// JSONObject cameraList = jsonObject.getJSONObject("CameraList");
+// if (cameraList != null) {
+// List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class);
+// if (!CollectionUtils.isEmpty(data)) {
+// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria
+// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(data);
+// } else {
+// log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
+// }
+// } else {
+// log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", jsonObject);
+// }
+// } else {
+// log.error("涓�鏈轰竴妗ｆ暟鎹负绌�");
+// }
+// log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
+// }
+
//涓�鏈轰竴妗�
- public void monitorTask() {
+ public void monitorQualifyTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
// 涓�鏈轰竴妗ｆ敞鍐岀巼
// 妗ｆ鑰冩牳姣�
- 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);
- if (!CollectionUtils.isEmpty(data)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(data);
- } else {
- log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
- }
- } else {
- log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", jsonObject);
- }
- } else {
- log.error("涓�鏈轰竴妗ｆ暟鎹负绌�");
- }
- log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
- }
-
- //涓�鏈轰竴妗ｅ悎鏍肩巼
- public void monitorQualifyTask() {
- //涓�鏈轰竴妗ｅ悎鏍肩巼
log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
MonitorQualifyParam param = new MonitorQualifyParam();
param.setPageNum(ApiConstants.PageNo);
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");
@@ -130,7 +171,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");
@@ -195,9 +235,10 @@
//瑙嗛鏍囨敞
log.info("寮�濮嬫墽琛岃棰戞爣娉ㄦ暟鎹悓姝�");
OsdMonitorParam param = new OsdMonitorParam();
+ param.setPageNum(ApiConstants.PageNo);
+ 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