From 5ddef25bcb1f56a10eddf2a264cb338d178ff5f1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 09:50:15 +0800
Subject: [PATCH] 百度地图,方案助手完善

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 3fdf54c..0321c19 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -551,7 +551,8 @@
 	@GetMapping("report_alarm_datas")
 	public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
-		parameters.put("type", "month");
+		ParameterUtils.getTimeType4Time(parameters);
+		//parameters.put("type", "month");
 		String sensorKey = "list";
 		if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
 			parameters.put("description", "description");

--
Gitblit v1.8.0