From 7a728f29a56079f2b490094077c91f805a9e900e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 16 Mar 2018 09:09:16 +0800
Subject: [PATCH] 地图相关资源
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 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..1518f85 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -27,9 +27,16 @@
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;
+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;
@@ -264,7 +271,7 @@
@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");
String time = (String) parameters.get("time");
@@ -301,7 +308,7 @@
//sensorKeys.clear();
// ������������������
if (!parameters.containsKey("mac")) {
- resul = new ArrayList<Map<String,Object>>();
+ resultList = 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();
@@ -366,7 +373,7 @@
for (String sensorKey : value.keySet()) {
resultMap.put(sensorKey, value.get(sensorKey)[2]);
}
- resul.add(resultMap);
+ resultList.add(resultMap);
}
// ������ ���������
} else {
@@ -381,9 +388,9 @@
parameters.put("sensorKeyColumn", sensorKeyColumn);
}
- resul = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
+ resultList = historyMinutelyMapper.getMonitorPointOrDeviceAvgData(parameters);
}
- return resul;
+ return resultList;
}
private String getSensorKeyColumnBySensors(List<Map<String, Object>> sensors,Map<String, Object> parameters) {
@@ -435,4 +442,70 @@
return result;
}
+ /**
+ * ������������������������������������������������������������������
+ * @param lineChartCriteria
+ * @return
+ */
+ @Override
+ public List<List<PairData>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria){
+ String sensorKey = lineChartCriteria.getSensorKey();
+ TimePeriod timePeriod = lineChartCriteria.getTimePeriod();
+ List<DataCondition> dataConditionList = lineChartCriteria.getDataConditions();
+ List<List<PairData>> list = new ArrayList<>();
+ dataConditionList.forEach(item -> {
+ List<PairData> pairDataList = queryOneLineChartDateByCrieria(sensorKey,timePeriod,item);
+ list.add(pairDataList);
+ });
+ return list;
+ }
+
+ /**
+ * ������������������������������������������������������������������
+ * @param sensorKey
+ * @param timePeriod
+ * @param dataCondition
+ * @return
+ */
+ public List<PairData> queryOneLineChartDateByCrieria(String sensorKey, TimePeriod timePeriod, DataCondition dataCondition){
+ List<String> timeList = ReportTimeFormat.makeTimeList(timePeriod);
+ List<PairData> lineChartDatas = historyMinutelyMapper.selectLineChartDateByCrieria(sensorKey,timePeriod,dataCondition);
+ List<PairData> lineChartDatasWithEmpty = new ArrayList<>();
+ int m = 0;
+ int dataLength = lineChartDatas.size()-1;
+ m = dataLength>-1?0:-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));
+ }
+
+ }
+ }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