xufenglei
2019-05-23 16a7ca8289574761ef14d096a553679f0b98eb09
update
1 files modified
4 ■■■■ changed files
src/main/java/com/moral/controller/ScreenController.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java
@@ -606,7 +606,7 @@
        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
        Object sensorKey = parameters.remove("sensorKey");
        parameters.put("sensors", Arrays.asList(sensorKey));
        monitorPointService.isCompensateCalculation(parameters);
        //monitorPointService.isCompensateCalculation(parameters);
        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
        
        for (Map<String, Object> map : list) {
@@ -725,7 +725,7 @@
        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
        parameters.put("sensors", Arrays.asList(sensorKeys));
        monitorPointService.isCompensateCalculation(parameters);
        //monitorPointService.isCompensateCalculation(parameters);
        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
        
        for (Map<String, Object> map : list) {