From d295c866b8e7a831426abad61d9104ce5a180b33 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Thu, 02 Nov 2017 14:27:30 +0800
Subject: [PATCH] 拼写错误
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 7 +++++--
1 files changed, 5 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 e01d765..6f2916e 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 ���������������
@@ -88,6 +88,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;
--
Gitblit v1.8.0