From faec027b63bb19d061098724754895ae801ad493 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 30 Oct 2017 14:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 96 ++++++++++++++++++++++--------------------------
1 files changed, 44 insertions(+), 52 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 588e2e8..7ed83b2 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -10,18 +10,22 @@
import java.util.Map;
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.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;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import com.alibaba.fastjson.JSON;
import com.moral.monitor.dao.AccountEntityMapper;
import com.moral.monitor.dao.HistoryEntityMapper;
import com.moral.monitor.entity.AccountEntity;
import com.moral.monitor.entity.AccountEntityExample;
import com.moral.monitor.service.OrganizationService;
import com.moral.monitor.service.ScreenService;
+import com.moral.monitor.util.BusinessException;
import com.moral.monitor.util.ResourceUtil;
@Service
@@ -42,32 +46,17 @@
return accountMapper.selectByExample(example);
}
- @SuppressWarnings("deprecation")
public Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters) {
Map<String, Object> resultMap = new HashMap<String, Object>();
Date date = new Date();
-
- /** ������������ ������������������������ **/
- date.setMonth(6);
- int day = date.getDate();
- if (day < 13) {
- day = 31 - day;
- }else if (day < 19) {
- day += 10;
- }else if (day > 29) {
- day -= 10;
- }
- date.setDate(day);
- /** ������������ ������ **/
-
- parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
-
//���������������������������������������
- /*if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
- date = DateUtils.setMonths(date, -1);
- parameters.put("end", DateUtils.ceiling(date, Calendar.MONTH));
- }*/
+ 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);
@@ -76,11 +65,12 @@
if (MapUtils.isNotEmpty(average)) {
resultMap.putAll(average);
} else {
- resultMap.put("average", 0);
+ resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
}
//AQI ������
String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
+ String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
List<Double> IAQIs = new ArrayList<Double>();
for (String macKey : macKeys) {
double avg = 0, maxMacKey = 0, minMacKey = 0;
@@ -93,28 +83,24 @@
String[] macKeyValues = ResourceUtil.getArrValue(macKey);
int index = -1;
for (int i = 0; i < macKeyValues.length; i++) {
- Double macKeyValue = Double.valueOf(macKeyValues[i]);
- if (avg <= macKeyValue) {
+ if (avg <= Double.valueOf(macKeyValues[i])) {
if (i == 0) {
- index = 0;
- minMacKey = macKeyValue;
- maxMacKey = Double.valueOf(macKeyValues[i + 1]);
+ index = i;
} else {
index = i - 1;
- minMacKey = Double.valueOf(macKeyValues[i - 1]);
- maxMacKey = macKeyValue;
}
+ minMacKey = Double.valueOf(macKeyValues[index]);
+ maxMacKey = Double.valueOf(macKeyValues[index + 1]);
continue;
}
-
}
if (index == -1) {
resultMap.put("AQI", ">500");
break;
}
- String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
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")) {
@@ -122,34 +108,32 @@
}
//���������������
- String standard = ResourceUtil.getValue(parameters.get("macKey")+"-standard");
- if (StringUtils.isBlank(standard)) {
- standard = "50";
- }
- resultMap.put("standard", standard);
+ resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey")+"-standard"));
return resultMap;
}
- @SuppressWarnings("deprecation")
public Map<String, Object> getAverageByAll(Map<String, Object> parameters) {
Map<String, Object> result = new LinkedHashMap<String, Object>();
setOrgIdsByAccount(parameters);
Date date = new Date();
-
- /** ������������ ������������������������ **/
- date.setMonth(6);
- int day = date.getDate();
- if (day < 19 || day > 29) {
- day = (int) Math.floor(Math.random() * (29 - 19 + 1) + 19);
- date.setDate(day);
- }
- /** ������������ ������ **/
-
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)){
+ Map<String, Object> map = JSON.parseObject(macLog);
+ for (String key : map.keySet()) {
+ if (key.startsWith("e")) {
+ result.put(key, map.get(key));
+ }
+ }
+ }
+ }
for (Map<String, Object> map : averageByAll) {
result.put((String) map.get("mac_key"), map.get("avg"));
}
@@ -184,10 +168,18 @@
}
public void setOrgIdsByAccount(Map<String, Object> parameters) {
- AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf((String) parameters.get("accountId"))));
+ String accountId = (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 +"���������������������");
+ }
String organization = account.getOrganization();
//���������������������������������������������������������������
- if (!("-1".equals(organization) || "5212b9dfb55448e699889e01fa0fa6a2".equals(organization))) {
+ if (!("-1".equals(organization) || ResourceUtil.getValue("orgId").equals(organization))) {
Set<String> orgIds = organizationService.getChildOrganizationIds(account.getOrganization());
parameters.put("orgIds", orgIds);
}
--
Gitblit v1.8.0