From 8546724bd6847fd5ac0db6d451e74a31ca2d5532 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 26 Mar 2018 14:05:48 +0800
Subject: [PATCH] 报表 优化
---
src/main/java/com/moral/controller/ScreenController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 0fd2613..ff16681 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/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);
-
+ parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+ 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.remove(sensorKey));
+ }
return new ResultBean<List<Map<String, Object>>>(list);
}
}
--
Gitblit v1.8.0