From 6f08c72b1056c9e4b2bdf79bafbc49fcc3cdcaa1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Sun, 08 Apr 2018 11:24:56 +0800
Subject: [PATCH] 报表优化
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 364 +++++++++++++++++++++++++--------------------------
1 files changed, 180 insertions(+), 184 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 4ee5b0f..e71ff2a 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -9,7 +9,7 @@
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
+import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -27,9 +27,15 @@
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;
@@ -47,7 +53,7 @@
import com.moral.service.HistoryMinutelyService;
@Service
-@SuppressWarnings({ "unchecked", "rawtypes", "unused" })
+@SuppressWarnings({ "unchecked", "unused" })
public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {
@Resource
@@ -71,14 +77,7 @@
// ������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(macKeys));
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
return getAQIByDataMap(average);
}
@@ -138,42 +137,41 @@
@Override
public Map<String, List<Object>> getCompareReport(Map<String, Object> parameters) throws Exception {
Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();
- List<Map<String, Object>> list = JSON.parseObject((String)parameters.get("items"), new TypeReference<List<Map<String, Object>>>() {});
- parameters.remove("items");
- ExecutorService threadPool = Executors.newCachedThreadPool();
- CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);
-
+ 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) {
- int timeLength = Integer.valueOf(parameters.get("timeLength").toString());
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) {
- parameters.put("timeLength", lengthOfMonth);
+ timeLength = lengthOfMonth;
}
}
}
List<Object> timeList = new ArrayList<Object>();
- for (int i = 0; i <Integer.valueOf(parameters.get("timeLength").toString()); i++) {
- timeList.add(i, String.format("%02d", "day".equals(type) || "hour".equals(type) ? i : i + 1));
+ for (int i = 0; i < timeLength; i++) {
+ 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, 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);
if (ObjectUtils.isEmpty(map.get("mac"))) {
map.remove("mac");
}
- map.put("time", map.get("formatTime"));
- map.remove("formatTime");
+ 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);
}
});
@@ -183,7 +181,8 @@
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()];
Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
@Override
public int compare(String o1, String o2) {
@@ -195,7 +194,11 @@
for (String key : map.keySet()) {
if (key.startsWith("data")) {
int index = Integer.valueOf(key.replace("data", ""));
- maps[index] = map;
+ datas[index] = map.get(key);
+ }
+ if (key.startsWith("deviceCount")) {
+ int index = Integer.valueOf(key.replace("deviceCount", ""));
+ deviceCounts[index] = map.get(key);
}
if (key.startsWith("sensors")) {
sensors.addAll((List<String>) map.get(key));
@@ -203,37 +206,19 @@
}
}
resultMap.put("times", timeList);
- resultMap.put("datas", Arrays.asList(maps));
+ resultMap.put("datas", Arrays.asList(datas));
+ resultMap.put("deviceCounts", Arrays.asList(deviceCounts));
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>>();
-
+ 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 ;
- if (parameters.containsKey("sensorKey")) {
- String sensorKey = (String) parameters.get("sensorKey");
- Sensor sensor = new Sensor();
- sensor.setSensorKey(sensorKey);
- sensor = sensorMapper.selectOne(sensor );
- sensors = new HashSet<String>();
- sensors.add(sensorKey + "-" + sensor.getName() + "-" + sensor.getUnit());
- } else {
- 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();
@@ -251,159 +236,66 @@
}
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);
return resultMap;
}
@Override
public List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception {
- List<Map<String, Object>> resul ;
-
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;
- parameters.put("sensorKeyColumn", sensorKeyColumn);
- }
-
- //sensorKeys.clear();
- // ������������������
- if (!parameters.containsKey("mac")) {
- resul = new ArrayList<Map<String,Object>>();
- Integer monitorPointId = Integer.valueOf(parameters.get("monitorPoint").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.get("time");
- 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]);
- }
- resul.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);
-
- }
- resul = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
- }
- return resul;
- }
-
- private String getSensorKeyColumnBySensors(List<Map<String, Object>> sensors,Map<String, Object> parameters) {
- String sensorKeyColumn = "";
- Set<String> sensorKeys = new HashSet<String>();
+ List<String> sensorKeys = new ArrayList<String>();
+ List<String> sensors = new ArrayList<String>();
if (parameters.containsKey("sensors")) {
- sensorKeys = (Set<String>) parameters.get("sensors");
+ try {
+ sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});
+ for (String sensor : sensors) {
+ sensorKeys.add(sensor.split("-")[0]);
+ }
+ } catch (Exception e) {
+ sensorKeys = sensors = (List<String>)parameters.remove("sensors");
+ }
+ } else {
+ List<Sensor> sensorList = sensorMapper.getSensorsByCriteria(parameters);
+ for (Sensor sensor : sensorList) {
+ sensorKeys.add(sensor.getSensorKey());
+ sensors.add(sensor.getSensorKey() + "-" + sensor.getName() + "-" + sensor.getUnit());
+ }
}
- 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);
+
+ return historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
@Override
@@ -422,9 +314,10 @@
}
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);
+ String sensorKey = (String) parameters.remove("macKey");
+ List<String> sensorKeys = new ArrayList<String>();
+ sensorKeys.add(sensorKey);
+ parameters.put("sensorKeys", sensorKeys);
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
if (isEmpty(average)) {
@@ -435,4 +328,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