ZhuDongming
2019-08-16 691311e750b9d9d28b38862977e347e938155f47
src/main/java/com/moral/controller/ScreenController.java
@@ -1174,13 +1174,17 @@
        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);
            JSONObject params = new JSONObject();
            params.put("sensorInfo", sensorList);
            params.put("sensorInfoMin", sensorListMin);
            params.put("sensorInfoMax", sensorListMax);
            String paramsJson = params.toJSONString();
            model.addObject("uavTrajectoryParams", paramsJson);
            model.setViewName("uavTrajectory");
            return model;
        }else {
        } else {
            StringBuilder msg = new StringBuilder();
            msg.append(" param[0] mac:");
            msg.append(mac);