ZhuDongming
2019-08-20 2f7fd4b99d67d90abb1867d2de36e018cbcfa1ed
修改防止list越界
1 files modified
15 ■■■■ changed files
src/main/java/com/moral/controller/ScreenController.java 15 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java
@@ -1182,10 +1182,19 @@
        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) {
            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);
            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<>();
            }
            JSONObject params = new JSONObject();
            params.put("sensorInfo", sensorList);
            params.put("sensorInfoMin", sensorListMin);