From aed7e2e6ba8da5b7931a0a97293ba57f57d1a8cd Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Tue, 03 Apr 2018 10:31:38 +0800 Subject: [PATCH] 报表 优化 --- src/main/java/com/moral/controller/ScreenController.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 0fd2613..48892d7 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -7,6 +7,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -429,10 +430,19 @@ public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception { Map<String, Object> parameters = getParametersStartingWith(request, null); parameters.put("type", "month"); - parameters.put("format", "yyyy-MM"); - parameters.put("typeFormat", "%Y-%m-%d"); - List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters); + parameters.put("monitorPointId", parameters.remove("monitorPoint")); + String sensorKey = parameters.remove("sensorKey").toString(); + List<String> sensorKeys = new ArrayList<String>(); + sensorKeys.add(sensorKey); + parameters.put("sensors", sensorKeys); + List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters); + 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.remove(sensorKey)); + } return new ResultBean<List<Map<String, Object>>>(list); } } -- Gitblit v1.8.0