From 84b79096372143c9f9ed5d91156a966f7d119c2b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:02 +0800
Subject: [PATCH] 修改获取五分钟数据无站点相关BUG
---
src/main/java/com/moral/util/AQICalculation2.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/moral/util/AQICalculation2.java b/src/main/java/com/moral/util/AQICalculation2.java
index d8cfe99..9797972 100644
--- a/src/main/java/com/moral/util/AQICalculation2.java
+++ b/src/main/java/com/moral/util/AQICalculation2.java
@@ -9,17 +9,23 @@
Map maxMap = new HashMap();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
- if (entry.getValue() instanceof Double){
- Double value = Double.parseDouble(entry.getValue().toString());
- if (key!="O3_8h"){
- maxMap.put(key,value);
- }
- Double PM2_5AQI;
- Double PM10AQI;
- Double SO2AQI;
- Double NO2AQI;
- Double COAQI;
- Double O3AQI;
+ if (entry.getValue().toString().equals("")){
+ continue;
+ }
+ Double value = Double.parseDouble(entry.getValue().toString());
+
+ if (key!="O3_8h"){
+ maxMap.put(key,value);
+ }else {
+ continue;
+ }
+ Double PM2_5AQI;
+ Double PM10AQI;
+ Double SO2AQI;
+ Double NO2AQI;
+ Double COAQI;
+ Double O3AQI;
+
switch (key) {
case "PM2_5":PM2_5AQI = PM2_5AQI(value);
AQIList.add(PM2_5AQI);
@@ -39,24 +45,17 @@
case "maxO3_8h":O3AQI = O3AQI(value);
AQIList.add(O3AQI);
break;
-
default:
break;
}
- }else {
- continue;
}
- }
-
- Double AQIMAX = Collections.max(AQIList);
Map<String, Object> returnMap = new HashMap<>();
-
- Optional<Map.Entry<String, Integer>> max0 = maxMap.entrySet()
- .stream()
- .max(Map.Entry.comparingByValue());
-
- returnMap.put("maxSensor",max0.get().getKey());
- returnMap.put("AQI", AQIMAX);
+ Double AQIMAX = Collections.max(AQIList);
+ Optional<Map.Entry<String, Integer>> max0 = maxMap.entrySet()
+ .stream()
+ .max(Map.Entry.comparingByValue());
+ returnMap.put("maxSensor", max0.get().getKey());
+ returnMap.put("AQI", AQIMAX);
return returnMap;
}
public static Map<String, Object> dayAQI(Map<String, Object> map){
@@ -64,10 +63,14 @@
Map maxMap = new HashMap();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
- if (entry.getValue() instanceof Double){
+ if (entry.getValue().toString().equals("")){
+ continue;
+ }
Double value = Double.parseDouble(entry.getValue().toString());
if (key!="O3_day"){
maxMap.put(key,value);
+ }else {
+ continue;
}
Double PM2_5AQI;
Double PM10AQI;
@@ -97,9 +100,6 @@
default:
break;
}
- }else {
- continue;
- }
}
Map<String, Object> returnMap = new HashMap<>();
if (AQIList.size()>0){
--
Gitblit v1.8.0