From 999d8a80d9a1c1f20033c29e7e2a08951766bee8 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 13 Nov 2017 16:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 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 fffbeac..eb35a0d 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -10,8 +10,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,30 +54,41 @@
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));
}
- parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
+ // ������00:00:00
parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
- Map<String, Object> average = historyMapper.getMonthAverageBySensor(parameters);
+ Map<String, Object> average = null;
+ average = historyMapper.getMonthAverageBySensor(parameters);
- if (MapUtils.isNotEmpty(average)) {
- resultMap.putAll(average);
- } else {
+ 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);
+ resultMap.put("average", "N/A");
+ } else {
+ //resultMap.putAll(average);
+ //resultMap.put("average", String.format("%.2f", resultMap.get("average")));
+ resultMap.put("average", String.format("%.2f", average.get("average")));
}
-
+
// 3.0 AQI ������
String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
List<Double> IAQIs = new ArrayList<Double>();
+ // ������00:00:00
parameters.put("start", DateUtils.truncate(DateUtils.addDays(date, -1), Calendar.DATE));
for (String macKey : macKeys) {
double avg = 0, minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
parameters.put("macKey", macKey);
average = historyMapper.getMonthAverageBySensor(parameters);
- if (MapUtils.isNotEmpty(average)) {
+ if (ObjectUtils.isEmpty(average)) {
+ continue;
+ } else {
avg = (Double) average.get("average");
}
String[] macKeyValues = ResourceUtil.getArrValue(macKey);
@@ -106,14 +115,19 @@
}
}
- double AQI = Collections.max(IAQIs);
- if (AQI == 0.0) {
- AQI = 231.670;
- }
if (!resultMap.containsKey("AQI")) {
- resultMap.put("AQI", AQI);
+ if (ObjectUtils.isEmpty(IAQIs)) {
+ resultMap.put("AQI", "N/A");
+ }else {
+ double AQI = Collections.max(IAQIs);
+ // ������������������
+ /*if (AQI == 0.0) {
+ AQI = 60.670;
+ }*/
+ resultMap.put("AQI", String.format("%.0f", AQI));
+ }
}
-
+
return resultMap;
}
@@ -121,14 +135,16 @@
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));
+ // ������������ -5������
parameters.put("end", DateUtils.addMinutes(date, -5));
List<Map<String, Object>> averageByAll = historyMapper.getAverageByAll(parameters);
// ���������������������������
- if (CollectionUtils.isEmpty(averageByAll)) {
+ /*if (ObjectUtils.isEmpty(averageByAll)) {
String macLog = historyMapper.getMacLogByLast();
if (StringUtils.isNotBlank(macLog)) {
Map<String, Object> map = JSON.parseObject(macLog);
@@ -138,7 +154,7 @@
}
}
}
- }
+ }*/
for (Map<String, Object> map : averageByAll) {
result.put((String) map.get("mac_key"), map.get("avg"));
@@ -183,10 +199,11 @@
if (ObjectUtils.isEmpty(account)) {
throw new BusinessException(accountId + "���������������������");
}
- String organization = account.getOrganization();
+ String orgId = account.getOrganization();
// ���������������������������������������������������������������
- if (!("-1".equals(organization) || ResourceUtil.getValue("orgId").equals(organization))) {
- Set<String> orgIds = organizationService.getChildOrganizationIds(account.getOrganization());
+
+ if (!("-1".equals(orgId) || ResourceUtil.getValue("orgId").equals(orgId))) {
+ Set<String> orgIds = organizationService.getChildOrganizationIds(orgId);
parameters.put("orgIds", orgIds);
}
}
@@ -195,4 +212,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