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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 e01d765..0294b49 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -50,9 +50,9 @@
// 1.0 ���������������
resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey") + "-standard"));
- resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
+ //resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
- resultMap.put("AQI", 236.71 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
+ //resultMap.put("AQI", 236.71 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
// 2.0 ���������������
@@ -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");
@@ -88,6 +89,9 @@
average = historyMapper.getMonthAverageBySensor(parameters);
if (!ObjectUtils.isEmpty(average)) {
avg = (Double) average.get("average");
+ if ("e11".equals(macKey) || "e15".equals(macKey) || "e16".equals(macKey)) {
+ avg *= 1000.0;
+ }
}
String[] macKeyValues = ResourceUtil.getArrValue(macKey);
int index = -1;
@@ -116,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