From aa86cb57b09c5300db3c33d75d91d8b51a4b636f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 六月 2023 09:27:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 80f2874..3fef537 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -89,7 +89,8 @@
}
}
list.forEach(s -> {
- result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue()));
+ String time = ymdh.format(s.getCreateTime());
+ result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue(), time));
});
return result;
}
@@ -123,7 +124,8 @@
}
}
list.forEach(s -> {
- result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue()));
+ String time = ymdh.format(s.getCreateTime());
+ result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue(), time));
});
return result;
}
@@ -367,6 +369,24 @@
@Override
public List<WarningVo> getAlarmAndWarnByTime(Date begin, Date end) {
+ String startTime = ymdhms.format(begin);
+ String endTime = ymdhms.format(end);
+
+ List<WarningDetail> rs = warningDetailMapper.selectByTime(startTime, endTime);
+ if (null == rs || rs.isEmpty()) {
+ return null;
+ }
+
+ List<WarningVo> list = new ArrayList<>();
+ for (WarningDetail wd : rs) {
+ String time = ymdh.format(wd.getCreateTime());
+ list.add(new WarningVo(wd.getLocationName(), wd.getSuYuanId(), 0.0, 0.0, wd.getValue(), time));
+ }
+
+ return list;
+ }
+
+ public List<WarningVo> getAlarmAndWarnByTime_old(Date begin, Date end) {
List<WarningVo> list = new ArrayList<>();
List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
if (ids.size() == 0) {
@@ -389,13 +409,15 @@
for (String tab : tables) {
List<WarningDetail> alarmList = getAlarmByTime(tab, ids);
for (WarningDetail s : alarmList) {
- list.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue()));
+ String time = ymdh.format(s.getCreateTime());
+ list.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue(), time));
}
}
for (String tab : tables) {
List<WarningDetail> warnList = getWarnByTime(tab, ids);
for (WarningDetail s : warnList) {
- list.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue()));
+ String time = ymdh.format(s.getCreateTime());
+ list.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue(), time));
}
}
--
Gitblit v1.9.3