From 5e1b6a8624f63116b7e0750b0760557c4bfd2f5b Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Tue, 31 Oct 2017 09:02:36 +0800
Subject: [PATCH] 三级阀值

---
 src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
index deb992a..fffbeac 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -91,7 +91,7 @@
 					} else {
 						index = i - 1;
 					}
-					continue;
+					break;
 				}
 			}
 			if (index == -1) {
@@ -105,8 +105,13 @@
 				IAQIs.add(calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg));
 			}
 		}
+		
+		double AQI = Collections.max(IAQIs);
+		if (AQI == 0.0) {
+			AQI = 231.670;
+		}
 		if (!resultMap.containsKey("AQI")) {
-			resultMap.put("AQI", Collections.max(IAQIs));
+			resultMap.put("AQI", AQI);
 		}
 
 		return resultMap;

--
Gitblit v1.8.0