From 4ac87bb3275667c02bc60012ebb9fc1eeab6da5b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 17:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 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 a1e1be4..4a359d9 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -2,13 +2,17 @@
import com.alibaba.fastjson2.JSONObject;
import com.mongodb.client.result.DeleteResult;
-import com.ycl.platform.domain.param.UY.OnlineParam;
-import com.ycl.platform.domain.param.UY.QueryVqdParam;
-import com.ycl.platform.domain.result.HK.PicAccessResult;
-import com.ycl.platform.domain.result.UY.QueryVqdResult;
-import com.ycl.platform.service.IYwThresholdService;
import com.ycl.feign.UYClient;
+import com.ycl.platform.domain.param.UY.OneMachineFileParam;
+import com.ycl.platform.domain.param.UY.QueryVqdParam;
+import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
+import com.ycl.platform.domain.result.UY.OneMachineFileResult;
+import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.service.ITMonitorService;
+import com.ycl.platform.service.IYwThresholdService;
import com.ycl.utils.DateUtils;
+import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -18,11 +22,11 @@
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
-
+//浼樹簯瀵规帴鏁版嵁浠诲姟
@Slf4j
@Component("UYTask")
public class UYTask {
@@ -33,57 +37,108 @@
private UYClient uyClient;
@Autowired
private IYwThresholdService ywThresholdService;
-
+ @Autowired
+ private ITMonitorService monitorService;
@Value("${youYun.tenantId}")
private String tenantId;
//涓�鏈轰竴妗�
public void monitorTask() {
- log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｆ暟鎹悓姝�");
//涓�鏈轰竴妗ｅ悎鏍肩巼
// 涓�鏈轰竴妗ｆ敞鍐岀巼
// 妗ｆ鑰冩牳姣�
+ log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｆ暟鎹悓姝�");
+ OneMachineFileParam param = new OneMachineFileParam();
+ 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.insert(data);
+ } else {
+ log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
+ }
+ } else {
+ log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", jsonObject);
+ }
+ } else {
+ log.error("涓�鏈轰竴妗ｆ暟鎹负绌�");
+ }
log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
}
//鍥惧儚鐩戞祴璇婃柇缁撴灉
public void queryVqdResultTask() {
//鐐逛綅鍦ㄧ嚎鐜�
+ //瑙嗛鍥惧儚璐ㄩ噺
log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�");
QueryVqdParam param = new QueryVqdParam();
param.setTenantId(tenantId);
JSONObject jsonObject = uyClient.queryVqdResult(param);
if (jsonObject != null) {
- JSONObject cameraList = jsonObject.getJSONObject("CameraList");
- if (cameraList != null) {
- List<QueryVqdResult> data = cameraList.getList("data", QueryVqdResult.class);
- if (!CollectionUtils.isEmpty(data)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(data);
+ 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);
+ 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.insert(records);
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data);
+ }
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", cameraList);
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject);
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉璇锋眰澶辫触{}", jsonObject);
}
} else {
log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖");
}
-
log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾");
}
//褰曞儚鍙敤
- public void task3() {
+ public void recordMetaDSumTask() {
//褰曞儚鍙敤鐜�
- }
-
- //瑙嗛鍥惧儚璐ㄩ噺
- public void task4() {
- //褰曞儚鍙敤鐜�
+ log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
+ RecordMetaDSumParam param = new RecordMetaDSumParam();
+ 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);
+ }
+ } else {
+ log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
+ }
+ } else {
+ log.error("褰曞儚鍙敤鏁版嵁涓虹┖");
+ }
+ log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
}
--
Gitblit v1.8.0