From 73548e5d89a79ef1850c03dea162dcf727e2c0b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:32:57 +0800
Subject: [PATCH] 去重
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 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 44c5f48..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))
);
@@ -342,10 +340,10 @@
total.put("title", "璁惧鎬绘暟");
Map<String, Object> normal = new HashMap<>();
normal.put("value", vo.getNormalNum());
- normal.put("title", "璁惧姝ｅ父鏁�");
+ normal.put("title", "姝ｅ父鏁�");
Map<String, Object> error = new HashMap<>();
error.put("value", vo.getErrorNum());
- error.put("title", "璁惧寮傚父鏁�");
+ error.put("title", "寮傚父鏁�");
list.add(total);
list.add(normal);
list.add(error);
@@ -356,7 +354,6 @@
@Override
public List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery) {
- //TODO:鏂板dept AreaCode瀛楁
return baseMapper.monitorRate(dashboardQuery);
}
--
Gitblit v1.8.0