From 9b33e93fccddea356c3d686684fc58ceb176ff39 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:01:26 +0800
Subject: [PATCH] 增加 省市区 查询条件

---
 src/main/java/com/moral/controller/ScreenController.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 21c6424..b21674a 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,16 +430,18 @@
 	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");
+		parameters.put("monitorPointId", parameters.remove("monitorPoint"));
+		String sensorKey = parameters.remove("sensorKey").toString();
+		List<String> sensorKeys = new ArrayList<String>();
+		sensorKeys.add(sensorKey);
+		parameters.put("sensorKeys", sensorKeys);
 		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);
+			map.put("value", map.remove(sensorKey));
 		}
 		return new ResultBean<List<Map<String, Object>>>(list);
 	}

--
Gitblit v1.8.0