ZhuDongming
2019-08-20 a6b1aeac1fc7b92132780f7bd1ef8841539ff8a7
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");