From 530aeddc3a2fc1310f68f6c76c82fb4aa99145b4 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 28 Mar 2018 14:31:53 +0800
Subject: [PATCH] 报表 优化
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 366 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 252 insertions(+), 114 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 939b22b..8f440cd 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -8,6 +8,8 @@
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -19,28 +21,39 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.TreeSet;
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 java.util.stream.Collectors;
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;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
import com.moral.common.util.CalculateUtils;
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.mapper.DeviceMapper;
import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.HistoryMinutelyService;
@Service
+@SuppressWarnings({ "unchecked", "rawtypes", "unused" })
public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {
@Resource
@@ -52,7 +65,7 @@
@Resource
private SensorMapper sensorMapper;
- private Set<String> sensorKeys = new HashSet<String>();
+ // volatile
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
@@ -128,151 +141,171 @@
return resultMap;
}
- public Map<String, List<Object>> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
- Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();
- if (ObjectUtils.isEmpty(parameters)) {
- resultMap.put("c", null);
- return resultMap;
- }
- List<Map<String, Object>> resultList = getMonitorPointOrDeviceAvgData(parameters);
-
- List<Object> timeList = new ArrayList<Object>();
- List<Object> dataList = new ArrayList<Object>();
- String sensorKey = (String) parameters.get("sensorKey");
- for (Map<String, Object> map : resultList) {
- String time = map.get("time").toString();
- time =time.substring(time.length() - 2);
- timeList.add(time);
- dataList.add(map.get(sensorKey));
- }
- String part = (String) parameters.get("part");
- resultMap.put("time" + part, timeList);
- resultMap.put("data" + part, dataList);
- return resultMap;
- }
-
@Override
public Map<String, List<Object>> getCompareReport(Map<String, Object> parameters) throws Exception {
Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();
- Map<String, Object> parametersA = new HashMap<String, Object>();
- Map<String, Object> parametersB = new HashMap<String, Object>();
- if (parameters.containsKey("time") && parameters.containsKey("monitorPoint")) {
- parametersA.put("part", "A");
- parametersA.putAll(parameters);
- parametersA.remove("timeb");
- }
- if (parameters.containsKey("timeb") && parameters.containsKey("monitorPointb")) {
- parametersB.putAll(parameters);
- parametersB.put("part", "B");
- parametersB.put("time", parametersB.get("timeb"));
- parametersB.put("monitorPoint", parametersB.get("monitorPointb"));
- if (parameters.containsKey("macb")) {
- parametersB.put("mac", parametersB.get("macb"));
+ List<Map<String, Object>> list = JSON.parseObject((String)parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {});
+
+ String type = (String) parameters.get("type");
+ parameters.putAll(getElementByType(type));
+ Integer timeLength = Integer.valueOf(parameters.remove("timeLength").toString());
+ if ("month".equals(type)) {
+ for (Map<String, Object> map : list) {
+ String[] formatTime = map.get("formatTime").toString().split("-");
+ LocalDate localDate = LocalDate.of(Integer.valueOf(formatTime[0]), Integer.valueOf(formatTime[1]), 1);
+ int lengthOfMonth = localDate.lengthOfMonth();
+ if (lengthOfMonth > timeLength) {
+ timeLength = lengthOfMonth;
+ }
}
- parametersB.remove("timeb");
}
- List<Map<String, Object>> list = new ArrayList<Map<String,Object>>();
- list.add(parametersA);
- list.add(parametersB);
+
+ 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));
+ }
+ parameters.put("timeList", timeList);
+
ExecutorService threadPool = Executors.newCachedThreadPool();
CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);
- for (Map<String, Object> map : list) {
+ for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> map = list.get(i);
+ map.put("part", i);
+ if (ObjectUtils.isEmpty(map.get("mac"))) {
+ map.remove("mac");
+ }
+ map.put("time", map.remove("formatTime"));
+ map.putAll(parameters);
cs.submit(new Callable<Map<String, List<Object>>>() {
@Override
public Map<String, List<Object>> call() throws Exception {
return getMonitorPointOrDeviceAvgData4Compare(map);
}
});
-
}
+
+ List<Object> dataList = new ArrayList<Object>();
for (Map<String, Object> map : list) {
- resultMap.putAll(cs.take().get());
+ dataList.add(cs.take().get());
}
- if (resultMap.containsKey("timeA") && resultMap.containsKey("timeB")) {
- List<Object> timeA = resultMap.get("timeA");
- List<Object> timeB = resultMap.get("timeB");
- List<Object> time = new ArrayList<Object>(timeA);
- List<Object> time1 = new ArrayList<Object>(timeB);
- List<Object> dataA = resultMap.get("dataA");
- List<Object> dataB = resultMap.get("dataB");
- List<Object> resultA = new ArrayList<Object>();
- List<Object> resultB = new ArrayList<Object>();
- time1.removeAll(time);
- time.addAll(time1);
- time.sort(new Comparator<Object>() {
- @Override
- public int compare(Object o1, Object o2) {
- return Integer.compare(Integer.valueOf(o1.toString()), Integer.valueOf(o2.toString()));
+ Map[] maps = new HashMap[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", "")));
+ }
+ });
+ 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;
}
- });
- for (int i = 0; i < time.size(); i++) {
- Object object = time.get(i);
- int indexA = timeA.indexOf(object);
- if (indexA > -1) {
- resultA.add(i, dataA.get(indexA));
- }else {
- resultA.add("-");
- }
- int indexB = timeB.indexOf(object);
- if (indexB > -1) {
- resultB.add(i, dataB.get(indexB));
- }else {
- resultB.add("-");
+ if (key.startsWith("sensors")) {
+ sensors.addAll((List<String>) map.get(key));
}
}
- resultMap.put("dataA", resultA);
- resultMap.put("dataB", resultB);
- resultMap.put("time", time);
- } else if (resultMap.containsKey("timeA")) {
- resultMap.put("time", resultMap.get("timeA"));
- } else {
- resultMap.put("time", resultMap.get("timeB"));
}
+ resultMap.put("times", timeList);
+ resultMap.put("datas", Arrays.asList(maps));
+ resultMap.put("sensors", new ArrayList<Object>(sensors));
return resultMap;
}
+ public Map<String, List<Object>> getMonitorPointOrDeviceAvgData4Compare(Map<String, Object> parameters) throws Exception {
+ Map<String, List<Object>> resultMap = new HashMap<String, List<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"));
+ Map<String, Double[]> doubleMap = new LinkedHashMap<String, Double[]>();
+ for (Map<String, Object> map : resultList) {
+ String time = map.get("time").toString();
+ time = time.substring(time.length() - 2);
+ int index = timeList.indexOf(time);
+ for (String sensor : sensors) {
+ String[] split = sensor.split("-");
+ String sensorKey = split[0];
+ if (map.containsKey(sensorKey)) {
+ Double[] doubles;
+ if (doubleMap.containsKey(sensor)) {
+ doubles = doubleMap.get(sensor);
+ } else {
+ doubles = new Double[timeList.size()];
+ }
+ 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));
+ return resultMap;
+ }
+
@Override
public List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception {
- List<Map<String, Object>> resul ;
+ List<Map<String, Object>> resultList ;
String type = (String) parameters.get("type");
+ if (!parameters.containsKey("field")) {
+ parameters.putAll(getElementByType(type));
+ }
String time = (String) parameters.get("time");
String format = (String) parameters.get("format");
+ Integer field = Integer.valueOf(parameters.get("field").toString());
Date start = DateUtils.parseDate(time, format), end = null ;
if (parameters.containsKey("timeb")) {
end = DateUtils.parseDate((String)parameters.get("timeb"), format);
} else {
- switch (type) {
- case "year":
- end = DateUtils.addYears(start, 1);
- break;
- case "month":
- end = DateUtils.addMonths(start, 1);
- break;
- case "day":
- end = DateUtils.addDays(start, 1);
- break;
- case "hour":
- end = DateUtils.addHours(start, 1);
- break;
- }
-
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(start);
+ instance.add(field, 1);
+ end = instance.getTime();
}
parameters.put("start", start);
parameters.put("end", end);
if (parameters.containsKey("sensorKey")) {
- String sensorKey = (String) parameters.get("sensorKey");
- String sensorKeyColumn = "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
+ List<String> sensors;
+ try {
+ sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});
+ parameters.put("sensors", new HashSet<String>(sensors));
+ } catch (Exception e) {
+ sensors = new ArrayList<String>();
+ sensors.add((String)parameters.get("sensorKey"));
+ }
+ 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();
+ //sensorKeys.clear();
// ������������������
if (!parameters.containsKey("mac")) {
- resul = new ArrayList<Map<String,Object>>();
- Integer monitorPointId = Integer.valueOf((String) parameters.get("monitorPoint"));
+ 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);
@@ -285,9 +318,8 @@
Integer deviceVersionId = (Integer) map.get("deviceVersionId");
if (!parameter.containsKey("sensorKeyColumn")) {
List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(deviceVersionId);
- String sensorKeyColumn = getSensorKeyColumnBySensors(sensors);
+ String sensorKeyColumn = getSensorKeyColumnBySensors(sensors, parameters);
parameter.put("sensorKeyColumn", sensorKeyColumn);
- parameters.put("sensors", sensorKeys);
}
List<String> macs = deviceMapper.getDeviceMacByMonitorPointAndDeviceVersion(monitorPointId, deviceVersionId);
if (ObjectUtils.isEmpty(macs) || macs.contains("null") ) {
@@ -304,8 +336,7 @@
}
Map<String, Map<String, Number[]>> result = new LinkedHashMap<String, Map<String, Number[]>>();
for (Map<String, Object> map : list) {
- time = (String) map.get("time");
- map.remove("time");
+ time = (String) map.remove("time");
Map<String, Number[]> times = new HashMap<String, Number[]>();
if (result.containsKey(time)) {
times = (Map<String, Number[]>) result.get(time);
@@ -337,7 +368,7 @@
for (String sensorKey : value.keySet()) {
resultMap.put(sensorKey, value.get(sensorKey)[2]);
}
- resul.add(resultMap);
+ resultList.add(resultMap);
}
// ������ ���������
} else {
@@ -348,27 +379,31 @@
device.setMac(mac);
device = deviceMapper.selectOne(device);
List<Map<String, Object>> sensors = sensorMapper.getSensorsByDeviceVersionId(device.getDeviceVersionId());
- String sensorKeyColumn = getSensorKeyColumnBySensors(sensors);
+ String sensorKeyColumn = getSensorKeyColumnBySensors(sensors,parameters);
parameters.put("sensorKeyColumn", sensorKeyColumn);
- parameters.put("sensors", sensorKeys);
}
- resul = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
+ resultList = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
- return resul;
+ return resultList;
}
- private String getSensorKeyColumnBySensors(List<Map<String, Object>> sensors) {
+ 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);
+ sensorKeys.add(sensorKey + "-" + name + "-" + unit );
+ parameters.put("sensors", sensorKeys);
}
return sensorKeyColumn;
}
@@ -402,4 +437,107 @@
return result;
}
+ /**
+ * ������������������������������������������������������������������
+ * @param lineChartCriteria
+ * @return
+ */
+ @Override
+ public Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria){
+ Map<String,List<List<Double>>> listMap = new HashMap<>();
+ List<String> sensorKeys = lineChartCriteria.getSensorKeys();
+ List<DataCondition> dataConditionList = lineChartCriteria.getDataConditions();
+ TimePeriod timePeriod = lineChartCriteria.getTimePeriod();
+ sensorKeys.forEach(sensorKey -> {
+ listMap.put(sensorKey,new ArrayList<List<Double>>(dataConditionList.size()));
+ });
+ dataConditionList.forEach(dataCondition -> {
+ Map<String,List<Double>> dataMap = queryOneLineChartDateByCrieria(sensorKeys,timePeriod,dataCondition);
+ // ������������
+ listMap.forEach( (sensorKey,list) -> {
+ List<Double> rowData = dataMap.get(sensorKey);
+ list.add(rowData);
+ });
+ });
+ return listMap;
+ }
+
+ /**
+ * ������������������������������������������������������������������,������ ������������������
+ * @param sensorKeys
+ * @param timePeriod
+ * @param dataCondition
+ * @return
+ */
+ public Map<String,List<Double>> queryOneLineChartDateByCrieria(List<String> sensorKeys, TimePeriod timePeriod, DataCondition dataCondition){
+ List<String> timeList = ReportTimeFormat.makeTimeList(timePeriod);
+ List<Map<String,Object>> lineChartDatas = historyMinutelyMapper.selectLineChartDateByCrieria(sensorKeys,timePeriod,dataCondition);
+ Map<String,List<Double>> lineChartDatasWithEmpty = new HashMap<>();
+ // lineChartDatasWithEmpty ���������
+ sensorKeys.forEach(sensorKey -> {
+ lineChartDatasWithEmpty.put(sensorKey,timeList.stream().map(time -> {
+ Double data = null;
+ return data;
+ }).collect(Collectors.toList()));
+ });
+ // m ���������data���index������������������m������
+ int m = 0;
+ int dataLength = lineChartDatas.size()-1;
+ m = dataLength>-1?0:-1;
+ if(m >-1){
+ for(int n =0;n<timeList.size();n++){
+ if(m>-1) {
+ String time = timeList.get(n);
+ Map<String,Object> rowData = lineChartDatas.get(m);
+ String keyTime = rowData.get("format_time").toString();
+ if(time.equals(keyTime)){
+ // list to map
+ int finalN = n;
+ sensorKeys.forEach(sensorKey -> {
+ Object value = rowData.get(sensorKey);
+ List<Double> lineChartDatasWithEmptyTemp = lineChartDatasWithEmpty.get(sensorKey);
+ if(finalN < lineChartDatasWithEmptyTemp.size()){
+ Double sensorValue = value!= null?new Double(value.toString()):null;
+ lineChartDatasWithEmptyTemp.set(finalN,sensorValue);
+ }
+ });
+ // ������ -1���������������
+ m = m<dataLength ? m+1 : -1;
+ }
+ }
+ }
+ }
+ return lineChartDatasWithEmpty;
+ }
+
+ private Map<String, Object> getElementByType(Object type){
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ switch (type.toString()) {
+ case "year":
+ resultMap.put("format", "yyyy");
+ resultMap.put("typeFormat", "%Y-%m");
+ resultMap.put("timeLength", 12);
+ resultMap.put("field", Calendar.YEAR);
+ break;
+ case "month":
+ resultMap.put("format", "yyyy-MM");
+ resultMap.put("typeFormat", "%Y-%m-%d");
+ resultMap.put("timeLength", 28);
+ resultMap.put("field", Calendar.MONTH);
+ break;
+ case "day":
+ resultMap.put("format", "yyyy-MM-dd");
+ resultMap.put("typeFormat", "%Y-%m-%d %H");
+ resultMap.put("timeLength", 24);
+ resultMap.put("field", Calendar.DATE);
+ break;
+ case "hour":
+ resultMap.put("format", "yyyy-MM-dd HH");
+ resultMap.put("typeFormat", "%Y-%m-%d %H:%i");
+ resultMap.put("timeLength", 60);
+ resultMap.put("field", Calendar.HOUR);
+ break;
+ }
+ return resultMap;
+ }
}
--
Gitblit v1.8.0