From c4e74acf7f33065d6da449f4f51d178225695fa5 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 30 Oct 2017 14:40:00 +0800
Subject: [PATCH] 更新 空值临时方案处理
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 55 ++++++++++++++-------------
src/main/resources/mapper/HistoryEntityMapper.xml | 27 -------------
src/main/resources/sysConfig.properties | 2
3 files changed, 29 insertions(+), 55 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..deb992a 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -48,34 +48,36 @@
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"));
+
+ // 2.0 ���������������
Date date = new Date();
- //���������������������������������������
+ // ���������������������������������������
if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
parameters.put("start", DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH));
}
parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
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);
} else {
+ // ������������������
resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
}
- //AQI ������
+ // 3.0 AQI ������
String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
List<Double> IAQIs = new ArrayList<Double>();
+ 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)) {
avg = (Double) average.get("average");
@@ -89,26 +91,24 @@
} else {
index = i - 1;
}
- minMacKey = Double.valueOf(macKeyValues[index]);
- maxMacKey = Double.valueOf(macKeyValues[index + 1]);
continue;
}
}
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"));
+
return resultMap;
}
@@ -121,11 +121,11 @@
parameters.put("start", DateUtils.addMinutes(date, -10));
parameters.put("end", DateUtils.addMinutes(date, -5));
List<Map<String, Object>> averageByAll = historyMapper.getAverageByAll(parameters);
-
- //���������������������������
+
+ // ���������������������������
if (CollectionUtils.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 +134,7 @@
}
}
}
+
for (Map<String, Object> map : averageByAll) {
result.put((String) map.get("mac_key"), map.get("avg"));
}
@@ -169,24 +170,24 @@
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());
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;
}
-
+
}
diff --git a/src/main/resources/mapper/HistoryEntityMapper.xml b/src/main/resources/mapper/HistoryEntityMapper.xml
index 56eaad9..956888a 100644
--- a/src/main/resources/mapper/HistoryEntityMapper.xml
+++ b/src/main/resources/mapper/HistoryEntityMapper.xml
@@ -238,7 +238,6 @@
</select>
<select id="getAverageByAll" resultType="map">
-<!--
SELECT
h.mac_key,
AVG(h.mac_value) avg
@@ -261,32 +260,6 @@
AND h.time < #{end}
GROUP BY
h.mac_key
- -->
-
- SELECT
- mac_key,
- AVG(mac_value) avg
- FROM
- history h
- <if test="orgIds!=null and orgIds.size > 0">
- JOIN (
- SELECT
- e.mac
- FROM
- equipment e,
- org_equ oe
- WHERE
- e.id = oe.equid
- AND oe.orgid IN
- <foreach collection="orgIds" item="listItem" open="(" separator="," close=")" >
- #{listItem}
- </foreach>
- ) e ON h.mac = e.mac
- </if>
- WHERE h.time > #{start}
- AND h.time < #{end}
- GROUP BY
- mac_key
</select>
<select id="getEquipmentStates" resultType="map">
diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties
index 9f1dd42..02606cc 100644
--- a/src/main/resources/sysConfig.properties
+++ b/src/main/resources/sysConfig.properties
@@ -6,7 +6,7 @@
e11=0,50,150,475,800,1600,2100,2620
e15=0,100,160,215,265,800,1000,1200
e16=0,40,80,180,280,565,750,940
-IAQI=0,50,100,150,200,300,400,500
+IAQI=0,50,100,150,200,300,400,500,>500
e1-standard=35
e2-standard=50
e10-standard=2
--
Gitblit v1.8.0