From 83975f056b98871b1206be3bd741a7de68716d58 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 20 Aug 2019 15:03:18 +0800
Subject: [PATCH] map传值改为英文
---
src/main/java/com/moral/controller/ScreenController.java | 12 +++++++++---
1 files changed, 9 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..a21df60 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1183,9 +1183,15 @@
parameters.put("endTime", endTime);
String mac = parameters.get("mac").toString();
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);
+ List<List<Map<String, Object>>> sensorData = historyMinutelyService.getSensorData(parameters);
+ List<Map<String, Object>> sensorList = new ArrayList<>();
+ List<Map<String, Object>> sensorListMin = new ArrayList<>();
+ List<Map<String, Object>> sensorListMax = new ArrayList<>();
+ if (sensorData.size() == 3) {
+ sensorList = sensorData.get(0);
+ sensorListMin = sensorData.get(1);
+ sensorListMax = sensorData.get(2);
+ }
JSONObject params = new JSONObject();
params.put("sensorInfo", sensorList);
params.put("sensorInfoMin", sensorListMin);
--
Gitblit v1.8.0