From a6b1aeac1fc7b92132780f7bd1ef8841539ff8a7 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 20 Aug 2019 15:05:27 +0800
Subject: [PATCH] 添加sensor查询map放入无人机地图
---
src/main/java/com/moral/controller/ScreenController.java | 14 +++++++++++---
1 files changed, 11 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..263bac6 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1183,13 +1183,21 @@
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);
+ Map<String, String> sensorsMap = sensorService.getSensorsMap(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);
params.put("sensorInfoMax", sensorListMax);
+ params.put("sensorsMap",sensorsMap);
String paramsJson = params.toJSONString();
model.addObject("uavTrajectoryParams", paramsJson);
model.setViewName("uavTrajectory");
--
Gitblit v1.8.0