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 | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 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 5bbc64b..587d9bc 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -91,39 +91,43 @@
log.info("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾");
}
- //涓�鏈轰竴妗�
- public void monitorTask() {
- // 涓�鏈轰竴妗ｆ敞鍐岀巼
- // 妗ｆ鑰冩牳姣�
- 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.insertAll(data);
- } else {
- log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
- }
- } 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 monitorQualifyTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
+ // 涓�鏈轰竴妗ｆ敞鍐岀巼
+ // 妗ｆ鑰冩牳姣�
log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
MonitorQualifyParam param = new MonitorQualifyParam();
param.setPageNum(ApiConstants.PageNo);
@@ -200,7 +204,12 @@
log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
RecordMetaDSumParam param = new RecordMetaDSumParam();
param.setTenantId(tenantId);
- param.setStatTime(DateUtils.getDate());
+ 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 (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
--
Gitblit v1.8.0