From f22a631422f3045a06aad627e6e83c802be2760d Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 01 Dec 2020 11:07:29 +0800
Subject: [PATCH] 站点平均值数据导出

---
 src/main/java/com/moral/util/AQICalculation2.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/moral/util/AQICalculation2.java b/src/main/java/com/moral/util/AQICalculation2.java
index 050afdd..d8cfe99 100644
--- a/src/main/java/com/moral/util/AQICalculation2.java
+++ b/src/main/java/com/moral/util/AQICalculation2.java
@@ -101,15 +101,18 @@
 				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);
+		if (AQIList.size()>0){
+			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);
+		}else {
+			returnMap.put("maxSensor","");
+			returnMap.put("AQI", "");
+		}
 		return returnMap;
 	}
 	static double PM2_5AQI(Double value) {

--
Gitblit v1.8.0