From 1f4fd31eaed8f70a4a03f2493abe17eea774c15b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 17:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 7fa70ba..7534569 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -3,10 +3,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
-import com.ycl.platform.domain.param.UY.OneMachineFileParam;
-import com.ycl.platform.domain.param.UY.OsdMonitorParam;
-import com.ycl.platform.domain.param.UY.QueryVqdParam;
-import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
+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.QueryVqdResult;
@@ -21,12 +18,12 @@
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
-import java.util.stream.Collectors;
//浼樹簯瀵规帴鏁版嵁浠诲姟
@Slf4j
@@ -43,7 +40,10 @@
private ITMonitorService monitorService;
@Value("${youYun.tenantId}")
private String tenantId;
-
+ @Value("${youYun.email}")
+ private String email;
+ @Value("${youYun.passwd}")
+ private String passwd;
//涓�鏈轰竴妗�
public void monitorTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
@@ -53,6 +53,7 @@
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);
@@ -84,6 +85,7 @@
param.setTenantId(tenantId);
JSONObject jsonObject = uyClient.queryVqdResult(param);
if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
Integer statusCode = jsonObject.getInteger("statusCode");
if (ApiConstants.UYSuccessCode.equals(statusCode)) {
JSONObject data = jsonObject.getJSONObject("data");
@@ -116,8 +118,10 @@
//褰曞儚鍙敤鐜�
log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
RecordMetaDSumParam param = new RecordMetaDSumParam();
+ param.setTenantId(tenantId);
JSONObject jsonObject = uyClient.recordMetaDSumList(param);
if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
if (jsonObject.getBoolean("success")) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
@@ -149,8 +153,9 @@
//瑙嗛鏍囨敞
log.info("寮�濮嬫墽琛岃棰戞爣娉ㄦ暟鎹悓姝�");
OsdMonitorParam param = new OsdMonitorParam();
- JSONObject jsonObject = uyClient.osdMonitorList(param);
+ JSONObject jsonObject = uyClient.osdMonitorList(param,tenantId);
if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
if (jsonObject.getBoolean("success")) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
--
Gitblit v1.8.0