From 2ea3a6e2e9dcbb366d78e675c62b92d407d0e4a0 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 19 五月 2023 10:49:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/IWarningAnalyseService.java | 2 ++
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 20 ++++++++++++++++++++
src/main/java/com/yssh/controller/WarningAnalyseController.java | 3 ++-
3 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index 930e7ae..97bb845 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -82,7 +82,8 @@
if (null != obj) {
map = (Map<String, List<Double>>) obj;
} else {
- map = warningService.selectEachLocationDataChange();
+ //map = warningService.selectEachLocationDataChange();
+ map = warningService.select3Hours();
if (null != map && map.size() > 0) {
CacheUtils.put(key, map);
}
diff --git a/src/main/java/com/yssh/service/IWarningAnalyseService.java b/src/main/java/com/yssh/service/IWarningAnalyseService.java
index d19aa53..0897a48 100644
--- a/src/main/java/com/yssh/service/IWarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/IWarningAnalyseService.java
@@ -28,5 +28,7 @@
List<Qxsh> selectMonthTop10();
+ Map<String, List<Double>> select3Hours();
+
List<WarningVo> getAlarmAndWarnByTime(Date begin, Date end);
}
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 1aff2ff..e21bc2c 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -373,6 +373,26 @@
}
@Override
+ public Map<String, List<Double>> select3Hours() {
+ Map<String, List<Double>> map = new HashMap<>();
+
+ List<String> times = DateUtils.get3Hours();
+ List<Qxsh> list = qxshMapper.select3Hours(times);
+ if (null == list || list.isEmpty()) {
+ return map;
+ }
+
+ for (Qxsh qxsh : list) {
+ String name = qxsh.getName();
+
+ List<Double> values = map.computeIfAbsent(name, k -> new ArrayList<>());
+ values.add(qxsh.getValue());
+ }
+
+ return map;
+ }
+
+ @Override
public List<WarningVo> getAlarmAndWarnByTime(Date begin, Date end) {
List<WarningVo> list = new ArrayList<>();
List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
--
Gitblit v1.9.3