ZhuDongming
2019-08-19 b2ea3adf3787f53487ad10faa116df0d586de652
修改无人机平均值,最小值和最大值直接从list集合中取
1 files modified
6 ■■■■ changed files
src/main/java/com/moral/controller/ScreenController.java 6 ●●●● patch | view | raw | blame | history
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);