From 3dc21e8893d17e2a25f50efeb7eec100c8e882ee Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 26 四月 2023 13:32:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 02ca1d7..eccd472 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -229,7 +229,7 @@
@Override
public Map<String, List<Double>> selectEachLocationDataChange() {
- Map<String, List<Double>> result = new LinkedHashMap<>();
+ /*Map<String, List<Double>> result = new LinkedHashMap<>();
List<MonitorPointPosition> checkPoints = commonService.getCheckPoints3d();
Date nowDate = DateUtils.getNowDate();
Long endTime = Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate));
@@ -249,6 +249,34 @@
result.put(c.getName(), values);
}
});
+ return result;*/
+
+ Map<String, List<Double>> result = new LinkedHashMap<>();
+ List<MonitorPointPosition> checkPoints = commonService.getCheckPoints3d();
+
+ Date nowDate = DateUtils.getNowDate();
+ Long endTime = Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate));
+ Long startTime = Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, DateUtils.getAPeriodOfTime(nowDate, -3, Calendar.HOUR_OF_DAY)));
+ List<DictRecord> recordList = dictRecordMapper.selectByTimeDictRecordList(startTime, endTime);
+
+ List<String> tableNames = new ArrayList<>();
+ for(DictRecord dr : recordList){
+ if (suYuanMapper.isTableExists(dr.getTableName())>0){
+ tableNames.add(dr.getTableName());
+ }
+ }
+ if (tableNames.isEmpty()){
+ return result;
+ }
+
+ for(MonitorPointPosition c : checkPoints){
+ List<Double> values = new ArrayList<>();
+ List<SuYuanMonitorData> data = suYuanMapper.getMonitorData(tableNames, c.getId());
+ data.forEach(v -> {
+ values.add(v.getValue());
+ });
+ result.put(c.getName(), values);
+ }
return result;
}
--
Gitblit v1.9.3