From ce0fef1c976ede5d77dfba1c285bbd0436d02d04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 14:00:21 +0800
Subject: [PATCH] 优云录像可用接口调通
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 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..6790cac 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,17 @@
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.format.annotation.DateTimeFormat;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import java.util.stream.Collectors;
//浼樹簯瀵规帴鏁版嵁浠诲姟
@Slf4j
@@ -43,6 +45,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 +59,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);
@@ -62,7 +69,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(data);
+ mongoTemplate.insertAll(data);
} else {
log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
}
@@ -84,6 +91,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");
@@ -95,7 +103,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(records);
+ mongoTemplate.insertAll(records);
} else {
log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data);
}
@@ -116,42 +124,42 @@
//褰曞儚鍙敤鐜�
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 (jsonObject.getBoolean("success")) {
- JSONObject data = jsonObject.getJSONObject("data");
- if (data != null) {
- List<RecordMetaDSumResult> records = data.getList("records", 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.insert(records);
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", data);
- }
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
+ 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);
}
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖");
}
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
+
//瑙嗛鏍囨敞
public void OsdMonitorTask() {
//瑙嗛鏍囨敞
log.info("寮�濮嬫墽琛岃棰戞爣娉ㄦ暟鎹悓姝�");
OsdMonitorParam param = new OsdMonitorParam();
- JSONObject jsonObject = uyClient.osdMonitorList(param);
+ JSONObject jsonObject = uyClient.osdMonitorList(param, tenantId);
if (jsonObject != null) {
- if (jsonObject.getBoolean("success")) {
+ log.info("鏁版嵁鏍煎紡" + jsonObject);
+ if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
List<OsdMonitorResult> records = data.getList("records", OsdMonitorResult.class);
@@ -161,7 +169,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, OsdMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(records);
+ mongoTemplate.insertAll(records);
} else {
log.error("瑙嗛鏍囨敞鏁版嵁涓虹┖{}", data);
}
--
Gitblit v1.8.0