From 6e9c3733135fa96360c8c76e76b431efa5d7f52d Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 09 Jun 2018 11:28:32 +0800
Subject: [PATCH] test
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 295 +++++++++++++++++++++++-----------------------------------
1 files changed, 118 insertions(+), 177 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 8f440cd..4fd39e3 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -4,7 +4,7 @@
import static org.springframework.util.ObjectUtils.isEmpty;
import java.math.BigDecimal;
-import java.math.RoundingMode;
+import java.text.ParseException;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
@@ -15,7 +15,6 @@
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -31,11 +30,6 @@
import javax.annotation.Resource;
-import com.moral.common.util.ReportTimeFormat;
-import com.moral.entity.charts.DataCondition;
-import com.moral.entity.charts.LineChartCriteria;
-import com.moral.entity.charts.PairData;
-import com.moral.entity.charts.TimePeriod;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -43,17 +37,22 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.moral.common.util.CalculateUtils;
+import com.moral.common.util.ReportTimeFormat;
import com.moral.common.util.ResourceUtil;
import com.moral.common.util.ValidateUtil;
-import com.moral.entity.Device;
import com.moral.entity.Sensor;
+import com.moral.entity.charts.DataCondition;
+import com.moral.entity.charts.LineChartCriteria;
+import com.moral.entity.charts.TimePeriod;
+import com.moral.mapper.AlarmDailyMapper;
+import com.moral.mapper.AlarmMapper;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.HistoryMinutelyService;
@Service
-@SuppressWarnings({ "unchecked", "rawtypes", "unused" })
+@SuppressWarnings({ "unchecked", "unused", "rawtypes" })
public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {
@Resource
@@ -65,26 +64,19 @@
@Resource
private SensorMapper sensorMapper;
- // volatile
+ @Resource
+ private AlarmDailyMapper alarmDailyMapper;
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
- ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
LocalDate localDate = LocalDate.now();
// ������00:00:00
parameters.put("start", localDate.minusDays(1));
// ������00:00:00
parameters.put("end", localDate);
- String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
- String sensorKeyColumn = "";
- for (int i = 0; i < macKeys.length; i++) {
- sensorKeyColumn += "AVG(json -> '$." + macKeys[i] + "[0]') " + macKeys[i];
- if (i != macKeys.length -1) {
- sensorKeyColumn += " ,";
- }
- }
- parameters.put("sensorKeyColumn", sensorKeyColumn);
+ parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
return getAQIByDataMap(average);
}
@@ -142,8 +134,8 @@
}
@Override
- public Map<String, List<Object>> getCompareReport(Map<String, Object> parameters) throws Exception {
- Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();
+ public Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception {
+ Map<String, List> resultMap = new HashMap<String, List>();
List<Map<String, Object>> list = JSON.parseObject((String)parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {});
String type = (String) parameters.get("type");
@@ -162,12 +154,12 @@
List<Object> timeList = new ArrayList<Object>();
for (int i = 0; i < timeLength; i++) {
- timeList.add(i, String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));
+ timeList.add(String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));
}
parameters.put("timeList", timeList);
ExecutorService threadPool = Executors.newCachedThreadPool();
- CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);
+ CompletionService<Map<String, Object>> cs = new ExecutorCompletionService<Map<String, Object>>(threadPool);
for (int i = 0; i < list.size(); i++) {
Map<String, Object> map = list.get(i);
map.put("part", i);
@@ -176,9 +168,9 @@
}
map.put("time", map.remove("formatTime"));
map.putAll(parameters);
- cs.submit(new Callable<Map<String, List<Object>>>() {
+ cs.submit(new Callable<Map<String, Object>>() {
@Override
- public Map<String, List<Object>> call() throws Exception {
+ public Map<String, Object> call() throws Exception {
return getMonitorPointOrDeviceAvgData4Compare(map);
}
});
@@ -188,47 +180,83 @@
for (Map<String, Object> map : list) {
dataList.add(cs.take().get());
}
- Map[] maps = new HashMap[list.size()];
+ Object[] datas = new Object[list.size()];
+ Object[] deviceCounts = new Object[list.size()];
+ Object[] alarmDatas = new Object[list.size()];
Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
@Override
public int compare(String o1, String o2) {
return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
}
});
+ Map<String, Double> sortMap = new HashMap<String, Double>();
for (Object object : dataList) {
Map<String, Object> map = (Map<String, Object>)object;
for (String key : map.keySet()) {
- if (key.startsWith("data")) {
- int index = Integer.valueOf(key.replace("data", ""));
- maps[index] = map;
- }
- if (key.startsWith("sensors")) {
- sensors.addAll((List<String>) map.get(key));
+ int index = Integer.valueOf(key.substring(key.length() - 1));
+ String actual = key.substring(0, key.length() - 1);
+ Object obj = map.get(key);
+ switch (actual) {
+ case "data":
+ datas[index] = obj;
+ break;
+ case "deviceCount":
+ deviceCounts[index] = obj;
+ break;
+ case "alarmData":
+ alarmDatas[index] = obj;
+ if (!ObjectUtils.isEmpty(obj)) {
+ Map<String, BigDecimal> mapData = (Map<String, BigDecimal>) obj;
+ BigDecimal sum = mapData.remove("sum");
+ for (Entry<String, BigDecimal> entry : mapData.entrySet()) {
+ if (!"name".equals(entry.getKey())) {
+ sortMap.put(entry.getKey() + "-" + index, new BigDecimal(100).multiply(entry.getValue())
+ .divide(sum, 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+
+ }
+ }
+ }
+ break;
+ case "sensors":
+ sensors.addAll((List<String>) obj);
+ break;
}
}
}
+ List<Map.Entry<String, Double>> sortList = new ArrayList<Map.Entry<String,Double>>(sortMap.entrySet());
+ Collections.sort(sortList,new Comparator<Map.Entry<String,Double>>(){
+ @Override
+ public int compare(Entry<String, Double> o1, Entry<String, Double> o2) {
+ if (o2.getValue().compareTo(o1.getValue()) == 0) {
+ String[] key1 = o1.getKey().split("-");
+ String[] key2 = o2.getKey().split("-");
+ String sensor1 = key1[0].replace("e", "");
+ String sensor2 = key2[0].replace("e", "");
+ if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {
+ return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
+ }
+ return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
+ }
+ return o2.getValue().compareTo(o1.getValue());
+ }
+
+ });
resultMap.put("times", timeList);
- resultMap.put("datas", Arrays.asList(maps));
+ resultMap.put("datas", Arrays.asList(datas));
+ resultMap.put("deviceCounts", Arrays.asList(deviceCounts));
+ resultMap.put("alarmDatas", Arrays.asList(alarmDatas));
resultMap.put("sensors", new ArrayList<Object>(sensors));
+ resultMap.put("sortList", sortList);
return resultMap;
}
- public Map<String, List<Object>> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
- Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();
-
+ public Map<String, Object> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
List<Map<String, Object>> resultList = getMonitorPointOrDeviceAvgData(parameters);
-
List<Object> timeList = (List<Object>) parameters.get("timeList");
-
- List<Object> dataList = new ArrayList<Object>();
- Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
- @Override
- public int compare(String o1, String o2) {
- return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
- }
- });
- sensors.addAll((Set<String>)parameters.get("sensors"));
+ List<String> sensors = (List<String>) parameters.get("sensors");
+ String part = parameters.get("part").toString();
Map<String, Double[]> doubleMap = new LinkedHashMap<String, Double[]>();
for (Map<String, Object> map : resultList) {
String time = map.get("time").toString();
@@ -246,21 +274,37 @@
}
doubles[index] = (Double) map.get(sensorKey);
doubleMap.put(sensor, doubles);
-
}
}
}
- dataList.add(doubleMap);
- String part = parameters.get("part").toString();
- resultMap.put("data" + part, dataList);
- resultMap.put("sensors" + part, new ArrayList<Object>(sensors));
+
+ Object deviceCount;
+ if (parameters.containsKey("deviceCount")) {
+ deviceCount = parameters.remove("deviceCount");
+ } else {
+ deviceCount = deviceMapper.getDeviceCountByRegion(parameters);
+ }
+
+ resultMap.put("deviceCount" + part, deviceCount);
+ resultMap.put("data" + part, doubleMap);
+ resultMap.put("sensors" + part, sensors);
+ Object type = parameters.get("type");
+ if ("year".equals(type) || "month".equals(type)) {
+ parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
+ resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
+ }
return resultMap;
}
@Override
public List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception {
- List<Map<String, Object>> resultList ;
+ convertQueryParam(parameters);
+ return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
+ }
+
+ @Override
+ public void convertQueryParam(Map<String, Object> parameters) throws ParseException {
String type = (String) parameters.get("type");
if (!parameters.containsKey("field")) {
parameters.putAll(getElementByType(type));
@@ -280,138 +324,37 @@
parameters.put("start", start);
parameters.put("end", end);
- if (parameters.containsKey("sensorKey")) {
- List<String> sensors;
+ List<String> sensorKeys = new ArrayList<String>();
+ List<String> sensors = new ArrayList<String>();
+ if (parameters.containsKey("sensors")) {
try {
sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});
- parameters.put("sensors", new HashSet<String>(sensors));
+ for (String sensor : sensors) {
+ sensorKeys.add(sensor.split("-")[0]);
+ }
} catch (Exception e) {
- sensors = new ArrayList<String>();
- sensors.add((String)parameters.get("sensorKey"));
+ sensorKeys = sensors = (List<String>)parameters.remove("sensors");
}
- String sensorKeyColumn = "";
- for (int i = 0; i < sensors.size(); i++) {
- String sensorKey = sensors.get(i).split("-")[0];
- sensorKeyColumn += "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
- if (i != sensors.size() - 1) {
- sensorKeyColumn += " ,";
- }
-
- }
- parameters.put("sensorKeyColumn", sensorKeyColumn);
- }
-
- //sensorKeys.clear();
- // ������������������
- if (!parameters.containsKey("mac")) {
- resultList = new ArrayList<Map<String,Object>>();
- Integer monitorPointId = Integer.valueOf(parameters.get("monitorPointId").toString());
- List<Map<String, Object>> deviceVersions = deviceMapper.getDeviceVersionIdByMonitorPoint(monitorPointId);
- ExecutorService threadPool = Executors.newCachedThreadPool();
- CompletionService<List<Map<String, Object>>> cs = new ExecutorCompletionService<List<Map<String, Object>>>(threadPool);
- List<Map<String, Object>> list = new ArrayList<Map<String,Object>>();
- for (Map<String, Object> map : deviceVersions) {
- cs.submit(new Callable<List<Map<String, Object>>>() {
- @Override
- public List<Map<String, Object>> call() throws Exception {
- Map<String, Object> parameter = new HashMap<String, Object>(parameters);
- Integer deviceVersionId = (Integer) map.get("deviceVersionId");
- if (!parameter.containsKey("sensorKeyColumn")) {
- List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(deviceVersionId);
- String sensorKeyColumn = getSensorKeyColumnBySensors(sensors, parameters);
- parameter.put("sensorKeyColumn", sensorKeyColumn);
- }
- List<String> macs = deviceMapper.getDeviceMacByMonitorPointAndDeviceVersion(monitorPointId, deviceVersionId);
- if (ObjectUtils.isEmpty(macs) || macs.contains("null") ) {
- return new ArrayList<Map<String,Object>>();
- }else {
- parameter.put("macs", macs);
- return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameter);
- }
- }
- });
- }
- for (Map<String, Object> map : deviceVersions) {
- list.addAll(cs.take().get());
- }
- Map<String, Map<String, Number[]>> result = new LinkedHashMap<String, Map<String, Number[]>>();
- for (Map<String, Object> map : list) {
- time = (String) map.remove("time");
- Map<String, Number[]> times = new HashMap<String, Number[]>();
- if (result.containsKey(time)) {
- times = (Map<String, Number[]>) result.get(time);
- }
- for (Map.Entry<String,Object> entry : map.entrySet()) {
- String sensorKey = entry.getKey();
- Number[] doubles = new Number[3];
- Double sum = (Double) entry.getValue();
- Integer count = 1;
- if (times.containsKey(sensorKey)) {
- doubles = times.get(sensorKey);
- sum = (Double) doubles[0] + sum;
- count = (Integer) doubles[1] + 1;
- }
- doubles[0] = sum;
- doubles[1] = count;
- doubles[2] = new BigDecimal(sum / count).setScale(3, RoundingMode.HALF_UP).doubleValue();
- times.put(sensorKey, doubles);
- }
- result.put(time, times);
- }
- Iterator<Entry<String, Map<String, Number[]>>> iterator = result.entrySet().iterator();
- while(iterator.hasNext()){
- Entry<String, Map<String, Number[]>> entry = iterator.next();
- String resultTime = entry.getKey();
- Map<String, Number[]> value = entry.getValue();
- Map<String, Object> resultMap = new HashMap<String, Object>();
- resultMap.put("time", resultTime);
- for (String sensorKey : value.keySet()) {
- resultMap.put(sensorKey, value.get(sensorKey)[2]);
- }
- resultList.add(resultMap);
- }
- // ������ ���������
} else {
- // ���������������
- if (!parameters.containsKey("sensorKeyColumn")) {
- String mac = (String) parameters.get("mac");
- Device device = new Device();
- device.setMac(mac);
- device = deviceMapper.selectOne(device);
- List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(device.getDeviceVersionId());
- String sensorKeyColumn = getSensorKeyColumnBySensors(sensors,parameters);
- parameters.put("sensorKeyColumn", sensorKeyColumn);
-
+ List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);
+ for (Sensor sensor : sensorList) {
+ sensorKeys.add(sensor.getSensorKey());
+ String string = sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit();
+ if (parameters.containsKey("description")) {
+ string += "-" + sensor.getDescription();
+ }
+ sensors.add(string);
}
- resultList = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
- return resultList;
- }
-
- private String getSensorKeyColumnBySensors(List<Map<String, Object>> sensors,Map<String, Object> parameters) {
- String sensorKeyColumn = "";
- Set<String> sensorKeys = new HashSet<String>();
- if (parameters.containsKey("sensors")) {
- sensorKeys = (Set<String>) parameters.get("sensors");
- }
- for (int i = 0; i < sensors.size(); i++) {
- String sensorKey = (String) sensors.get(i).get("sensor_key");
- String name = (String) sensors.get(i).get("name");
- String unit = (String) sensors.get(i).get("unit");
- sensorKeyColumn += "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
- if (i != sensors.size() - 1) {
- sensorKeyColumn += " ,";
- }
- sensorKeys.add(sensorKey + "-" + name + "-" + unit );
- parameters.put("sensors", sensorKeys);
- }
- return sensorKeyColumn;
+ parameters.put("sensorKeys", sensorKeys);
+ parameters.put("sensors", sensors);
}
@Override
public Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters) {
- ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
- ValidateUtil.notNull(parameters.get("macKey"), "param.is.null");
+ //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ Object sensorKey = parameters.remove("macKey");
+ ValidateUtil.notNull(sensorKey, "param.is.null");
Map<String, Object> result = new HashMap<String, Object>();
LocalDate end = LocalDate.now(),start;
// ���������������������������������������
@@ -424,9 +367,7 @@
}
parameters.put("start", start);
parameters.put("end", end);
- String sensorKey = (String) parameters.get("macKey");
- String sensorKeyColumn = "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
- parameters.put("sensorKeyColumn", sensorKeyColumn);
+ parameters.put("sensorKeys", Arrays.asList(sensorKey));
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
if (isEmpty(average)) {
--
Gitblit v1.8.0