From ef36c5d9f693c57956f4d0f40688b04fe62fd5f1 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 20 Aug 2019 13:03:44 +0800
Subject: [PATCH] map创建调整顺序
---
src/main/java/com/moral/controller/ScreenController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 014b1a0..429fd24 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1182,10 +1182,19 @@
parameters.put("startTime", startTime);
parameters.put("endTime", endTime);
String mac = parameters.get("mac").toString();
+ List<Map<String, Object>> sensorList=null;
+ List<Map<String, Object>> sensorListMin=null;
+ List<Map<String, Object>> sensorListMax=null;
if (mac != null && mac.length() != 0) {
- List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters);
- List<Map<String, Object>> sensorListMin = historyMinutelyService.getSensorDataMin(parameters);
- List<Map<String, Object>> sensorListMax = historyMinutelyService.getSensorDataMax(parameters);
+ if(historyMinutelyService.getSensorData(parameters).size()==3){
+ sensorList = historyMinutelyService.getSensorData(parameters).get(0);
+ sensorListMin = historyMinutelyService.getSensorData(parameters).get(1);
+ sensorListMax = historyMinutelyService.getSensorData(parameters).get(2);
+ }else{
+ sensorList = new ArrayList<>();
+ sensorListMin = new ArrayList<>();
+ sensorListMax = new ArrayList<>();
+ }
JSONObject params = new JSONObject();
params.put("sensorInfo", sensorList);
params.put("sensorInfoMin", sensorListMin);
--
Gitblit v1.8.0