From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/java/com/moral/controller/ScreenController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 429fd24..263bac6 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1182,23 +1182,22 @@
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) {
- 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<>();
+ 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