From 5476f8bcf411ce654c02fbd34b9086518adbd917 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 10 Sep 2020 14:25:41 +0800
Subject: [PATCH] 三天数据对比
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 42c7456..f46c6ea 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -383,7 +383,8 @@
}
returnMap = AQICalculation.hourlyAQI(AQIMap);
}
-
+ long aqi = Math.round(Double.valueOf(returnMap.get("AQI").toString()));
+ returnMap.put("AQI",aqi);
return returnMap;
}
@@ -520,7 +521,9 @@
for (Map.Entry<String, Object> entry : map.entrySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(entry.getKey())) {
- mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ if (entry.getValue() != null) {
+ mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).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())) {
--
Gitblit v1.8.0