From 74a0bd255a7e971b12625944df7f821a63956dda Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Fri, 10 Nov 2017 14:25:06 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 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 0294b49..b2e4123 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -50,20 +50,16 @@
// 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("AQI", 236.71 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
-
-
// 2.0 ���������������
Date date = new Date();
// ���������������������������������������
if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
// ���������1���00:00:00
parameters.put("start", DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH));
+ } else {
+ // ���������1���00:00:00
+ parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
}
- // ���������1���00:00:00
- parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
// ������00:00:00
parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
@@ -117,12 +113,12 @@
}
}
- double AQI = Collections.max(IAQIs);
- // ������������������
- if (AQI == 0.0) {
- AQI = 60.670;
- }
if (!resultMap.containsKey("AQI")) {
+ double AQI = Collections.max(IAQIs);
+ // ������������������
+ if (AQI == 0.0) {
+ AQI = 60.670;
+ }
resultMap.put("AQI", String.format("%.0f", AQI));
}
@@ -133,7 +129,7 @@
Map<String, Object> result = new LinkedHashMap<String, Object>();
setOrgIdsByAccount(parameters);
-
+ parameters.put("macKey", "all");
Date date = new Date();
// ������������ -10������
parameters.put("start", DateUtils.addMinutes(date, -10));
@@ -210,4 +206,21 @@
return (maxIAQI - minIAQI) * (avg - minMacKey) / (maxMacKey - minMacKey) + minIAQI;
}
+ @Override
+ public Map<String, Object> getAverageBySensor(Map<String, Object> parameters) {
+ Map<String, Object> result = new LinkedHashMap<String, Object>();
+
+ setOrgIdsByAccount(parameters);
+ Date date = new Date();
+ // ������������ -1������
+ parameters.put("start", DateUtils.addHours(date, -1));
+ parameters.put("end", date);
+ List<Map<String, Object>> averageByAll = historyMapper.getAverageByAll(parameters);
+
+ for (Map<String, Object> map : averageByAll) {
+ result.put((String) map.get("name"), map.get("avg"));
+ }
+ return result;
+ }
+
}
--
Gitblit v1.8.0