From b2ea3adf3787f53487ad10faa116df0d586de652 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Mon, 19 Aug 2019 20:11:51 +0800
Subject: [PATCH] 修改无人机平均值，最小值和最大值直接从list集合中取
---
src/main/java/com/moral/controller/ScreenController.java | 6 +++---
1 files changed, 3 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..06124cb 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1183,9 +1183,9 @@
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<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters).get(0);
+ List<Map<String, Object>> sensorListMin = historyMinutelyService.getSensorData(parameters).get(1);
+ List<Map<String, Object>> sensorListMax = historyMinutelyService.getSensorData(parameters).get(2);
JSONObject params = new JSONObject();
params.put("sensorInfo", sensorList);
params.put("sensorInfoMin", sensorListMin);
--
Gitblit v1.8.0