From ab9661b037cd8f38f7d0ee28766b02dc6d427286 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Fri, 03 Nov 2017 13:56:03 +0800
Subject: [PATCH] json位置修改
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 6f2916e..0294b49 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -71,11 +71,12 @@
if (ObjectUtils.isEmpty(average)) {
// ������������������
- resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
+ resultMap.put("average", 50.3467 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
} else {
resultMap.putAll(average);
}
-
+ resultMap.put("average", String.format("%.2f", resultMap.get("average")));
+
// 3.0 AQI ������
String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
@@ -119,10 +120,10 @@
double AQI = Collections.max(IAQIs);
// ������������������
if (AQI == 0.0) {
- AQI = 231.670;
+ AQI = 60.670;
}
if (!resultMap.containsKey("AQI")) {
- resultMap.put("AQI", String.format("%.2f", AQI));
+ resultMap.put("AQI", String.format("%.0f", AQI));
}
return resultMap;
--
Gitblit v1.8.0