From f6f4646b4e6a98374e2358bf956cb519259ab896 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 26 Aug 2019 08:49:22 +0800
Subject: [PATCH] 修改map遍历方式
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index a15b8e5..28515d0 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -538,7 +538,7 @@
@Override
public List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) {
String startTime = parameters.get("startTime").toString();
- Boolean flag = null;
+ Boolean flag = false;
try {
flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());
} catch (ParseException e) {
@@ -565,17 +565,17 @@
Map<String, Object> mapAvg = new LinkedHashMap<>();
Map<String, Object> mapMin = new LinkedHashMap<>();
Map<String, Object> mapMax = new LinkedHashMap<>();
- mapAvg.put("������", map.get("time"));
- mapMin.put("������", map.get("time"));
- mapMax.put("������", map.get("time"));
- for (String key : map.keySet()) {
+ mapAvg.put("time", map.get("time"));
+ mapMin.put("time", map.get("time"));
+ mapMax.put("time", map.get("time"));
+ for (Entry<String,Object> entry : map.entrySet()) {
for (Sensor sensor : sensors) {
- if (sensor.getSensorKey().equals(key)) {
- mapAvg.put(sensor.getDescription(), new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
- } else if (("min" + sensor.getSensorKey()).equals(key)) {
- mapMin.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
- } else if (("max" + sensor.getSensorKey()).equals(key)) {
- mapMax.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ if (sensor.getSensorKey().equals(entry.getKey())) {
+ mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ } else if (("min" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMin.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ } else if (("max" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMax.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
}
}
}
--
Gitblit v1.8.0