From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 f301921..09e43f3 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;
@@ -88,8 +91,8 @@
//涓�鏈轰竴妗ｅ悎鏍肩巼
log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
MonitorQualifyParam param = new MonitorQualifyParam();
- param.setPageNum(ApiConstants.pageNo);
- param.setPageSize(ApiConstants.pageSize);
+ param.setPageNum(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.PageSize);
JSONObject jsonObject = uyClient.monitorQualify(param);
if (jsonObject != null) {
log.info("鏁版嵁鏍煎紡" + jsonObject);
@@ -118,43 +121,44 @@
log.info("缁撴潫涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
}
- //鍥惧儚鐩戞祴璇婃柇缁撴灉
- public void queryVqdResultTask() {
- //鐐逛綅鍦ㄧ嚎鐜�
+ //鐐逛綅鍦ㄧ嚎鐜�
+ public void videoOnlineTask() {
//瑙嗛鍥惧儚璐ㄩ噺
- log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�");
- QueryVqdParam param = new QueryVqdParam();
- param.setTenantId(tenantId);
- param.setApikey(apikey);
- param.setAccesskey(accesskey);
- JSONObject jsonObject = uyClient.queryVqdResult(param);
+ log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�");
+ VideoOnlineParam param = new VideoOnlineParam();
+ param.setPageNum(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.PageSize);
+ param.setArealayerno(ApiConstants.AreaNo);
+ param.setStatus(ApiConstants.UY_OnlineStatus_All);
+ 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");
if (data != null) {
- List<QueryVqdResult> records = data.getList("records", QueryVqdResult.class);
+ List<VideoOnlineResult> records = data.getList("records", VideoOnlineResult.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);
+ DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", jsonObject);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉璇锋眰澶辫触{}", jsonObject);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉璇锋眰澶辫触{}", jsonObject);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖");
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖");
}
- log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾");
+ log.info("缁撴潫鎵ц鐐逛綅鍦ㄧ嚎鏁版嵁鍚屾");
}
//褰曞儚鍙敤
@@ -194,6 +198,8 @@
//瑙嗛鏍囨敞
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);
--
Gitblit v1.8.0