From ed8f0aeffb619c0540b16420320973207c55f015 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 08:52:49 +0800
Subject: [PATCH] 地图点击关闭弹窗
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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..43104c6 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,8 +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;
@@ -452,16 +449,20 @@
* @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;
+ public Map<String, List<List<PairData>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria){
+ Map<String,List<List<PairData>>> listMap = new HashMap<>();
+ for(String sensorKey:lineChartCriteria.getSensorKeys()){
+ 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);
+ });
+ listMap.put(sensorKey,list);
+ }
+
+ return listMap;
}
/**
--
Gitblit v1.8.0