From 4ef0635ed723addb6cf03a9aff6b89414f58df4e Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 15 六月 2023 16:07:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 12 ++++++++----
1 files changed, 8 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..f8e1830 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;
}
@@ -389,13 +391,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