From 628b80d0452602c5c02cec9ddbbee266f89d60c8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 18:12:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index c22d088..5b153b7 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -61,19 +61,18 @@
@Autowired
private RedisTemplate redisTemplate;
- //鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo
- //TODO锛氬姞瀹氭椂浠诲姟12.杩囧紑濮�
+ //鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo(寮冪敤)
public void siteOnline() {
- log.info("寮�濮嬪悓姝ョ偣浣嶅湪绾跨巼鍒癿ongo");
- List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(null,null);
- if (!CollectionUtils.isEmpty(tMonitorResults)) {
- //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(tMonitorResults);
- log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
- }
+// log.info("寮�濮嬪悓姝ョ偣浣嶅湪绾跨巼鍒癿ongo");
+// List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(null);
+// if (!CollectionUtils.isEmpty(tMonitorResults)) {
+// //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(tMonitorResults);
+// log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
+// }
}
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
@@ -81,7 +80,7 @@
public void synchronize() {
log.info("寮�濮嬪悓姝ongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
Date yesterday = DateUtils.addDays(new Date(), -1);
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
//mongo鍝佺墝鏁版嵁
Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
--
Gitblit v1.8.0