From 2e98b9f10ba88e33f4338e7ffa2d887cb11d01a8 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 31 Oct 2017 13:45:08 +0800
Subject: [PATCH] 索引 测试
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 0b0e61b..e01d765 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -54,7 +54,6 @@
resultMap.put("AQI", 236.71 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
- /**
// 2.0 ���������������
Date date = new Date();
@@ -72,7 +71,7 @@
if (ObjectUtils.isEmpty(average)) {
// ������������������
- resultMap.put("average", 0);
+ resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
} else {
resultMap.putAll(average);
}
@@ -116,11 +115,13 @@
double AQI = Collections.max(IAQIs);
// ������������������
+ if (AQI == 0.0) {
+ AQI = 231.670;
+ }
if (!resultMap.containsKey("AQI")) {
resultMap.put("AQI", String.format("%.2f", AQI));
}
- */
return resultMap;
}
--
Gitblit v1.8.0