From 2e2861fd0bbba403a15a212c550bed9f8331f467 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 15 Jan 2018 17:14:13 +0800
Subject: [PATCH] 更新 查询
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 404 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 291 insertions(+), 113 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 970dd6c..50be408 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -1,33 +1,46 @@
package com.moral.monitor.service.impl;
-import java.util.ArrayList;
+import static org.apache.commons.lang3.time.DateUtils.addDays;
+import static org.apache.commons.lang3.time.DateUtils.truncate;
+import static org.springframework.util.ObjectUtils.isEmpty;
+
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletionService;
+import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-import com.alibaba.fastjson.JSON;
+import com.mongodb.BasicDBObject;
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
+@SuppressWarnings("unused")
public class ScreenServiceImpl implements ScreenService {
@Autowired
@@ -39,129 +52,117 @@
@Autowired
private OrganizationService organizationService;
+ @Autowired
+ private MongoTemplate mongoTemplate;
+
public List<AccountEntity> getAccountLists(String account, String password) {
AccountEntityExample example = new AccountEntityExample();
example.or().andAccountEqualTo(account).andPasswordEqualTo(password);
return accountMapper.selectByExample(example);
}
- @SuppressWarnings("deprecation")
- public Map<String, Object> getMonthDataByEquipment(Map<String, Object> parameters) {
+ public Map<String, Object> getMonthDataByEquipment(final Map<String, Object> parameters) throws Exception {
Map<String, Object> resultMap = new HashMap<String, Object>();
+ // 1.0 ���������������
+ resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey") + "-standard"));
+
+ // 2.0 AQI ������
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);
- /** ������������ ������ **/
-
+ // ������00:00:00
+ parameters.put("start", DateUtils.truncate(DateUtils.addDays(date, -1), Calendar.DATE));
+ // ������00:00:00
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));
- }*/
- parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
- 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" };
- String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
- List<Double> IAQIs = new ArrayList<Double>();
- for (String macKey : macKeys) {
- double avg = 0, maxMacKey = 0, minMacKey = 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");
- }
- String[] macKeyValues = ResourceUtil.getArrValue(macKey);
- int index = -1;
- for (int i = 0; i < macKeyValues.length; i++) {
- if (avg <= Double.valueOf(macKeyValues[i])) {
- if (i == 0) {
- index = i;
- } else {
- index = i - 1;
+ final String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
+ ExecutorService threadPool = Executors.newCachedThreadPool();
+ CompletionService<Double> cs = new ExecutorCompletionService<Double>(threadPool);
+ for (final String macKey : macKeys) {
+ cs.submit(new Callable<Double>() {
+ @Override
+ public Double call() throws Exception {
+ Double result = null;
+ double avg = 0, minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
+ Map<String, Object> map = new HashMap<String, Object>(parameters);
+ map.put("macKey", macKey);
+ Map<String, Object> average = historyMapper.getMonthAverageBySensor(map);
+ if (!ObjectUtils.isEmpty(average)) {
+ avg = (Double) average.get("average");
+ String[] macKeyValues = ResourceUtil.getArrValue(macKey);
+ int index = -1;
+ for (int i = 0; i < macKeyValues.length; i++) {
+ if (avg <= Double.valueOf(macKeyValues[i])) {
+ if (i == 0) {
+ index = i;
+ } else {
+ index = i - 1;
+ }
+ break;
+ }
+ }
+ if (index == -1) {
+ result = Double.MAX_VALUE;
+ } else {
+ minMacKey = Double.valueOf(macKeyValues[index]);
+ maxMacKey = Double.valueOf(macKeyValues[index + 1]);
+ minIAQI = Double.valueOf(IAQIValues[index]);
+ maxIAQI = Double.valueOf(IAQIValues[index + 1]);
+ result = calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg);
+ }
}
- minMacKey = Double.valueOf(macKeyValues[index]);
- maxMacKey = Double.valueOf(macKeyValues[index + 1]);
- continue;
+ return result;
}
- }
- if (index == -1) {
- resultMap.put("AQI", ">500");
- break;
- }
- 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));
+
+ // 3.0 ���������������
+ Map<String, Object> average = null;
+ Map<String, Object> map = new HashMap<String, Object>(parameters);
+ // ���������������������������������������
+ if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
+ // ���������1���00:00:00
+ map.put("start", DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH));
+ } else {
+ // ���������1���00:00:00
+ map.put("start", DateUtils.truncate(date, Calendar.MONTH));
+ }
+ average = historyMapper.getMonthAverageBySensor(map);
+ if (ObjectUtils.isEmpty(average)) {
+ resultMap.put("average", "N/A");
+ } else {
+ resultMap.put("average", String.format("%.2f", average.get("average")));
}
- //���������������
- String standard = ResourceUtil.getValue(parameters.get("macKey")+"-standard");
- if (StringUtils.isBlank(standard)) {
- standard = "50";
+ Set<Double> IAQIs = new HashSet<Double>();
+ for (String macKey : macKeys) {
+ IAQIs.add(cs.take().get());
}
- resultMap.put("standard", standard);
+ IAQIs.remove(null);
+ if (ObjectUtils.isEmpty(IAQIs)) {
+ resultMap.put("AQI", "N/A");
+ } else {
+ Double AQI = Collections.max(IAQIs);
+ if (AQI == Double.MAX_VALUE) {
+ resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
+ } else {
+ resultMap.put("AQI", String.format("%.0f", AQI));
+ }
+ }
+
return resultMap;
}
- @SuppressWarnings("deprecation")
public Map<String, Object> getAverageByAll(Map<String, Object> parameters) {
Map<String, Object> result = new LinkedHashMap<String, Object>();
setOrgIdsByAccount(parameters);
-
+ parameters.put("macKey", "all");
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);
- }
- /** ������������ ������ **/
-
+ // ������������ -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)) {
- 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"));
}
@@ -196,25 +197,202 @@
}
public void setOrgIdsByAccount(Map<String, Object> parameters) {
- String accountId = ObjectUtils.nullSafeToString(parameters.get("accountId"));
- if (!StringUtils.isNumeric(accountId) ) {
- return;
+ 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)) {
- return;
+ 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;
}
-
+
+ @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;
+ }
+
+ @Override
+ public Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ Date date = new Date();
+ //Long end = DateUtils.truncate(date, Calendar.DATE).getTime(),start;
+ Date end = DateUtils.truncate(date, Calendar.DATE),start;
+
+ // ���������������������������������������
+ if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
+ // ���������1���00:00:00
+ //start = DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH).getTime();
+ start = DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH);
+ } else {
+ // ���������1���00:00:00
+ //start = DateUtils.truncate(date, Calendar.MONTH).getTime();
+ start = DateUtils.truncate(date, Calendar.MONTH);
+ }
+ start = DateUtils.addHours(start, 8);
+ end = DateUtils.addHours(end, 8);
+ Aggregation aggregation = Aggregation.newAggregation(
+ Aggregation.match(Criteria.where("mac").is(parameters.get("mac"))),
+ Aggregation.match(Criteria.where("time").gte(start)),
+ Aggregation.match(Criteria.where("time").lt(end)),
+ Aggregation.group("mac").avg((String) parameters.get("macKey")).as("avg")
+ );
+ //AggregationResults<BasicDBObject> results = mongoTemplate.aggregate(aggregation, "data",BasicDBObject.class);
+ AggregationResults<BasicDBObject> results = mongoTemplate.aggregate(aggregation, "data_hourly",BasicDBObject.class);
+ List<BasicDBObject> list = results.getMappedResults();
+ if (!ObjectUtils.isEmpty(list)) {
+ result = list.get(0);
+ }
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> getDayAQIBySensor(final Map<String, Object> parameters) throws Exception {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ Date date = new Date();
+ // ������00:00:00
+ parameters.put("start", DateUtils.truncate(DateUtils.addDays(date, -1), Calendar.DATE));
+ // ������00:00:00
+ parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
+ String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
+ final String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
+ ExecutorService threadPool = Executors.newCachedThreadPool();
+ CompletionService<Double> cs = new ExecutorCompletionService<Double>(threadPool);
+ for (final String macKey : macKeys) {
+ cs.submit(new Callable<Double>() {
+ @Override
+ public Double call() throws Exception {
+ Double result = null;
+ double avg = 0, minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
+ Map<String, Object> map = new HashMap<String, Object>(parameters);
+ map.put("macKey", macKey);
+ Map<String, Object> average = historyMapper.getMonthAverageBySensor(map);
+ if (!ObjectUtils.isEmpty(average)) {
+ avg = (Double) average.get("average");
+ String[] macKeyValues = ResourceUtil.getArrValue(macKey);
+ int index = -1;
+ for (int i = 0; i < macKeyValues.length; i++) {
+ if (avg <= Double.valueOf(macKeyValues[i])) {
+ if (i == 0) {
+ index = i;
+ } else {
+ index = i - 1;
+ }
+ break;
+ }
+ }
+ if (index == -1) {
+ result = Double.MAX_VALUE;
+ } else {
+ minMacKey = Double.valueOf(macKeyValues[index]);
+ maxMacKey = Double.valueOf(macKeyValues[index + 1]);
+ minIAQI = Double.valueOf(IAQIValues[index]);
+ maxIAQI = Double.valueOf(IAQIValues[index + 1]);
+ result = calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg);
+ }
+ }
+ return result;
+ }
+ });
+ }
+ Set<Double> IAQIs = new HashSet<Double>();
+ for (String macKey : macKeys) {
+ IAQIs.add(cs.take().get());
+ }
+ IAQIs.remove(null);
+ if (ObjectUtils.isEmpty(IAQIs)) {
+ resultMap.put("AQI", "N/A");
+ } else {
+ Double AQI = Collections.max(IAQIs);
+ if (AQI == Double.MAX_VALUE) {
+ resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
+ } else {
+ resultMap.put("AQI", String.format("%.0f", AQI));
+ }
+ }
+ return resultMap;
+ }
+
+ @Override
+ public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ Date date = new Date();
+ // ������00:00:00
+ parameters.put("start", truncate(addDays(date, -1), Calendar.DATE));
+ // ������00:00:00
+ parameters.put("end", truncate(date, Calendar.DATE));
+ String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
+ Map<String, Double> average = historyMapper.getDayAQIByDevice(parameters);
+ if (isEmpty(average)) {
+ resultMap.put("AQI", "N/V");
+ } else {
+ Set<Double> IAQIs = new HashSet<Double>();
+ for (Map.Entry<String, Double> entry : average.entrySet()) {
+ double minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
+ String[] macKeyValues = ResourceUtil.getArrValue(entry.getKey());
+ Double avg = entry.getValue();
+ if (isEmpty(avg)) {
+ IAQIs.add(null);
+ } else {
+ int index = -1;
+ for (int i = 0; i < macKeyValues.length; i++) {
+ if (avg <= Double.valueOf(macKeyValues[i])) {
+ if (i == 0) {
+ index = i;
+ } else {
+ index = i - 1;
+ }
+ break;
+ }
+ }
+ if (index == -1) {
+ IAQIs.add(Double.MAX_VALUE);
+ } else {
+ minMacKey = Double.valueOf(macKeyValues[index]);
+ maxMacKey = Double.valueOf(macKeyValues[index + 1]);
+ minIAQI = Double.valueOf(IAQIValues[index]);
+ maxIAQI = Double.valueOf(IAQIValues[index + 1]);
+ Double result = calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg);
+ IAQIs.add(result);
+ }
+ }
+ }
+ IAQIs.remove(null);
+ if (isEmpty(IAQIs)) {
+ resultMap.put("AQI", "N/V");
+ } else {
+ Double AQI = Collections.max(IAQIs);
+ if (AQI == Double.MAX_VALUE) {
+ resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
+ } else {
+ resultMap.put("AQI", String.format("%.0f", AQI));
+ }
+ }
+ }
+ return resultMap;
+ }
}
--
Gitblit v1.8.0