From 4c42fb553b28810d358405ee34efd71981332542 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 27 Oct 2017 10:22:23 +0800
Subject: [PATCH] 取标准值 从配置文件中取
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 34 ++++++++++++++++++++++------------
src/main/resources/sysConfig.properties | 21 ++++++++++++++++++++-
2 files changed, 42 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 883bd81..588e2e8 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -11,6 +11,7 @@
import java.util.Set;
import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,12 +71,15 @@
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", 0);
}
- //
+
+ //AQI ������
String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
List<Double> IAQIs = new ArrayList<Double>();
for (String macKey : macKeys) {
@@ -113,10 +117,16 @@
double maxIAQI = Double.valueOf(IAQIValues[index + 1]);
IAQIs.add(calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg));
}
- resultMap.put("standard", 35);
if (!resultMap.containsKey("AQI")) {
resultMap.put("AQI", Collections.max(IAQIs));
}
+
+ //���������������
+ String standard = ResourceUtil.getValue(parameters.get("macKey")+"-standard");
+ if (StringUtils.isBlank(standard)) {
+ standard = "50";
+ }
+ resultMap.put("standard", standard);
return resultMap;
}
@@ -146,16 +156,6 @@
return result;
}
- public void setOrgIdsByAccount(Map<String, Object> parameters) {
- AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf((String) parameters.get("accountId"))));
- String organization = account.getOrganization();
- //���������������������������������������������������������������
- if (!("-1".equals(organization) || "5212b9dfb55448e699889e01fa0fa6a2".equals(organization))) {
- Set<String> orgIds = organizationService.getChildOrganizationIds(account.getOrganization());
- parameters.put("orgIds", orgIds);
- }
- }
-
@Override
public Map<String, Object> getEquipmentStates(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
@@ -183,6 +183,16 @@
return result;
}
+ public void setOrgIdsByAccount(Map<String, Object> parameters) {
+ AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf((String) parameters.get("accountId"))));
+ String organization = account.getOrganization();
+ //���������������������������������������������������������������
+ if (!("-1".equals(organization) || "5212b9dfb55448e699889e01fa0fa6a2".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) {
return (maxIAQI - minIAQI) * (avg - minMacKey) / (maxMacKey - minMacKey) + minIAQI;
}
diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties
index a9d8665..15c6c87 100644
--- a/src/main/resources/sysConfig.properties
+++ b/src/main/resources/sysConfig.properties
@@ -6,4 +6,23 @@
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
\ No newline at end of file
+IAQI=0,50,100,150,200,300,400,500
+e1-standard=35
+e2-standard=50
+e3-standard=
+e4-standard=
+e5-standard=
+e6-standard=
+e7-standard=
+e8-standard=
+e9-standard=
+e10-standard=2
+e11-standard=50
+e12-standard=
+e13-standard=
+e14-standard=100
+e15-standard=100
+e16-standard=40
+e17-standard=
+e18-standard=
+e19-standard=
\ No newline at end of file
--
Gitblit v1.8.0