From ed8f0aeffb619c0540b16420320973207c55f015 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 08:52:49 +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..21c6424 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);
-
+ 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);
}
}
--
Gitblit v1.8.0