From 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 14:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 150 ++++++++++++++++++++++++++------------------------
1 files changed, 78 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 0a73e54..88fa88d 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -9,7 +9,6 @@
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -27,7 +26,6 @@
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.stream.Collector;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -145,11 +143,10 @@
@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");
- Map<String, Object> timeType = JSON.parseObject((String)parameters.get("timeType"), new TypeReference<Map<String, Object>>() {});
- parameters.remove("timeType");
+ List<Map<String, Object>> list = JSON.parseObject((String)parameters.remove("items"), new TypeReference<List<Map<String, Object>>>() {});
+ Map<String, Object> timeType = JSON.parseObject((String)parameters.remove("timeType"), new TypeReference<Map<String, Object>>() {});
parameters.putAll(timeType);
+ parameters.put("type", parameters.remove("value"));
ExecutorService threadPool = Executors.newCachedThreadPool();
CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);
@@ -179,8 +176,7 @@
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>>>() {
@Override
@@ -228,23 +224,13 @@
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"));
- }
+ 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();
@@ -304,8 +290,23 @@
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);
}
@@ -313,7 +314,7 @@
// ������������������
if (!parameters.containsKey("mac")) {
resultList = new ArrayList<Map<String,Object>>();
- Integer monitorPointId = Integer.valueOf(parameters.get("monitorPoint").toString());
+ 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);
@@ -344,8 +345,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);
@@ -452,64 +452,70 @@
* @return
*/
@Override
- public List<List<PairData>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria){
- String sensorKey = lineChartCriteria.getSensorKey();
- TimePeriod timePeriod = lineChartCriteria.getTimePeriod();
+ 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();
- List<List<PairData>> list = new ArrayList<>();
- dataConditionList.forEach(item -> {
- List<PairData> pairDataList = queryOneLineChartDateByCrieria(sensorKey,timePeriod,item);
- list.add(pairDataList);
+ TimePeriod timePeriod = lineChartCriteria.getTimePeriod();
+ sensorKeys.forEach(sensorKey -> {
+ listMap.put(sensorKey,new ArrayList<List<Double>>(dataConditionList.size()));
});
- return list;
+ 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 sensorKey
+ * ������������������������������������������������������������������,������ ������������������
+ * @param sensorKeys
* @param timePeriod
* @param dataCondition
* @return
*/
- public List<PairData> queryOneLineChartDateByCrieria(String sensorKey, TimePeriod timePeriod, DataCondition dataCondition){
+ public Map<String,List<Double>> queryOneLineChartDateByCrieria(List<String> sensorKeys, TimePeriod timePeriod, DataCondition dataCondition){
List<String> timeList = ReportTimeFormat.makeTimeList(timePeriod);
- List<PairData> lineChartDatas = historyMinutelyMapper.selectLineChartDateByCrieria(sensorKey,timePeriod,dataCondition);
- List<PairData> lineChartDatasWithEmpty = new ArrayList<>();
+ 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){
+ if(m >-1){
for(int n =0;n<timeList.size();n++){
- String time = timeList.get(n);
- if(m>-1){
- PairData pairData = lineChartDatas.get(m);
- String keyTime = pairData.getCategory();
- if(time.equals(keyTime)){
- lineChartDatasWithEmpty.add(pairData);
- m = m<dataLength ? m+1 : -1;
- }else{
- lineChartDatasWithEmpty.add(generateEmptyData(time));
- }
- }else {
- lineChartDatasWithEmpty.add(generateEmptyData(time));
- }
-
+ 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;
+ }
+ }
}
- }else{
- fillEmptyDataToList(timeList,lineChartDatasWithEmpty);
}
return lineChartDatasWithEmpty;
- }
- private PairData generateEmptyData(String time) {
- PairData pairData = new PairData();
- pairData.setCategory(time);
- pairData.setValue(null);
- return pairData;
- }
- private void fillEmptyDataToList(List<String> timeList,List<PairData> lineChartDatasWithEmpty){
- timeList.forEach( time ->{
- PairData pairData = generateEmptyData(time);
- lineChartDatasWithEmpty.add(pairData);
- });
}
}
--
Gitblit v1.8.0