更新

xufenglei

2018-03-13 13a59c6455e5c7a0d30ec93d953359a05778120f

更新 

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

@@ -431,8 +431,15 @@
        parameters.put("type", "month");

        parameters.put("format", "yyyy-MM");

        parameters.put("typeFormat", "%Y-%m-%d");

        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters); 
		
        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

        String sensorKey = parameters.get("sensorKey").toString();

        for (Map<String, Object> map : list) {

            String time = map.get("time").toString();

            time = time.substring(time.length() - 2);

            map.put("time", Integer.valueOf(time));

            map.put("value", map.get(sensorKey));

            map.remove(sensorKey);

        }

        return new ResultBean<List<Map<String, Object>>>(list);

    }

}