From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/util/AQICalculation2.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/util/AQICalculation2.java b/src/main/java/com/moral/util/AQICalculation2.java
index 8b28856..9797972 100644
--- a/src/main/java/com/moral/util/AQICalculation2.java
+++ b/src/main/java/com/moral/util/AQICalculation2.java
@@ -63,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;
@@ -96,9 +100,6 @@
default:
break;
}
- }else {
- continue;
- }
}
Map<String, Object> returnMap = new HashMap<>();
if (AQIList.size()>0){
--
Gitblit v1.8.0