修改只调用一次service请求

ZhuDongming

2019-08-20 c0456c15702ed375bddb3be3f750a877d8979245

修改只调用一次service请求

 src/main/java/com/moral/controller/ScreenController.java

@@ -1182,18 +1182,15 @@
        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);

            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);