From 269fd088f1c308b7e11d531a4485d163261ea2df Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Fri, 03 Nov 2017 13:52:16 +0800
Subject: [PATCH] json位置修改
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 103 +++++++++++++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 41 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 7ed83b2..0294b49 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;
@@ -48,37 +46,52 @@
public Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters) {
Map<String, Object> resultMap = new HashMap<String, Object>();
+
+ // 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));
}
+ // ���������1���00:00:00
parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
+ // ������00:00:00
parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
- //
- parameters.put("mac", "898602b8191630065884");
- parameters.put("macKey", "e1");
Map<String, Object> average = historyMapper.getMonthAverageBySensor(parameters);
- // ���������������
- if (MapUtils.isNotEmpty(average)) {
- resultMap.putAll(average);
+ if (ObjectUtils.isEmpty(average)) {
+ // ������������������
+ resultMap.put("average", 50.3467 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
} else {
- resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
+ resultMap.putAll(average);
}
-
- //AQI ������
+ 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");
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, maxMacKey = 0, minMacKey = 0;
+ double avg = 0, minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
parameters.put("macKey", macKey);
- parameters.put("start", DateUtils.truncate(DateUtils.addDays(date, -1), Calendar.DATE));
average = historyMapper.getMonthAverageBySensor(parameters);
- if (MapUtils.isNotEmpty(average)) {
+ 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;
@@ -89,26 +102,30 @@
} else {
index = i - 1;
}
- minMacKey = Double.valueOf(macKeyValues[index]);
- maxMacKey = Double.valueOf(macKeyValues[index + 1]);
- continue;
+ break;
}
}
if (index == -1) {
- resultMap.put("AQI", ">500");
+ resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
break;
+ } else {
+ minMacKey = Double.valueOf(macKeyValues[index]);
+ maxMacKey = Double.valueOf(macKeyValues[index + 1]);
+ minIAQI = Double.valueOf(IAQIValues[index]);
+ maxIAQI = Double.valueOf(IAQIValues[index + 1]);
+ IAQIs.add(calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg));
}
- double minIAQI = Double.valueOf(IAQIValues[index]);
- double maxIAQI = Double.valueOf(IAQIValues[index + 1]);
-
- IAQIs.add(calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg));
- }
- if (!resultMap.containsKey("AQI")) {
- resultMap.put("AQI", Collections.max(IAQIs));
}
- //���������������
- resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey")+"-standard"));
+ double AQI = Collections.max(IAQIs);
+ // ������������������
+ if (AQI == 0.0) {
+ AQI = 60.670;
+ }
+ if (!resultMap.containsKey("AQI")) {
+ resultMap.put("AQI", String.format("%.0f", AQI));
+ }
+
return resultMap;
}
@@ -118,14 +135,16 @@
setOrgIdsByAccount(parameters);
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)){
+ if (StringUtils.isNotBlank(macLog)) {
Map<String, Object> map = JSON.parseObject(macLog);
for (String key : map.keySet()) {
if (key.startsWith("e")) {
@@ -134,6 +153,7 @@
}
}
}
+
for (Map<String, Object> map : averageByAll) {
result.put((String) map.get("mac_key"), map.get("avg"));
}
@@ -169,24 +189,25 @@
public void setOrgIdsByAccount(Map<String, Object> parameters) {
String accountId = (String) parameters.get("accountId");
- if (!StringUtils.isNumeric((String)parameters.get("accountId")) ) {
+ if (!StringUtils.isNumeric((String) parameters.get("accountId"))) {
throw new BusinessException("accountId ������������������");
}
-
+
AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf(accountId)));
if (ObjectUtils.isEmpty(account)) {
- throw new BusinessException(accountId +"���������������������");
+ throw new BusinessException(accountId + "���������������������");
}
- String organization = account.getOrganization();
- //���������������������������������������������������������������
- if (!("-1".equals(organization) || ResourceUtil.getValue("orgId").equals(organization))) {
- Set<String> orgIds = organizationService.getChildOrganizationIds(account.getOrganization());
+ String orgId = account.getOrganization();
+ // ���������������������������������������������������������������
+
+ if (!("-1".equals(orgId) || ResourceUtil.getValue("orgId").equals(orgId))) {
+ Set<String> orgIds = organizationService.getChildOrganizationIds(orgId);
parameters.put("orgIds", orgIds);
}
}
- private double calculateIAQI(double maxIAQI, double minIAQI, double maxMacKey, double minMacKey,double avg) {
+ private double calculateIAQI(double maxIAQI, double minIAQI, double maxMacKey, double minMacKey, double avg) {
return (maxIAQI - minIAQI) * (avg - minMacKey) / (maxMacKey - minMacKey) + minIAQI;
}
-
+
}
--
Gitblit v1.8.0