From 2da75f7a5c4fee35770b88998dd15f33277a7a88 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 九月 2024 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 46a1751..ce7c654 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -111,9 +111,7 @@
//璁惧缂栧彿
List<String> numbers = monitors.stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList());
Query query = new Query();
- //TODO:鏈湴娴嬭瘯
- // Date now = new Date()
- Date now = DateUtils.getDay(2024, 7, 13);
+ Date now = new Date();
query.addCriteria(Criteria.where("no").in(numbers)
.and("mongoCreateTime").gte(DateUtils.getDayStart(now)).lt(DateUtils.getDayEnd(now))
);
@@ -356,7 +354,6 @@
@Override
public List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery) {
- //TODO:鏂板dept AreaCode瀛楁
return baseMapper.monitorRate(dashboardQuery);
}
--
Gitblit v1.8.0