From e6a8f8388901749b66a36c0b5e5f2984efcea7e6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:03:46 +0800
Subject: [PATCH] 增加新的websocket，取消中文转化参数功能。
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 8007e0a..08137c7 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -406,14 +406,17 @@
String timeUnits = startTime.substring(0, 10).replace("-", "");
Map<String, Object> map = historyMapper.getAVGValueByMacAndTimeslot(mac, startTime, endTime, timeUnits);
Map<String, Object> returnMap = new HashMap<>();
- if (map.isEmpty()) {
- returnMap.put("AQI", "N/V");
+ if (ObjectUtils.isEmpty(map) || map.isEmpty()) {
+ returnMap.put("AQI", "N/V");
+ return returnMap;
} else {
Map<String, Double> AQIMap = new HashMap<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
- Double value = Double.parseDouble(entry.getValue().toString());
- AQIMap.put(key, value);
+ if (entry.getValue() != null) {
+ Double value = Double.parseDouble(entry.getValue().toString());
+ AQIMap.put(key, value);
+ }
}
returnMap = AQICalculation.hourlyAQI(AQIMap);
}
--
Gitblit v1.8.0