From 82007c3574640614f688479cc6c6e2ef5d729dbd Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 26 Apr 2018 08:59:22 +0800
Subject: [PATCH] Date 时间不做 精确处理

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 7adfbde..8d3d851 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -342,7 +342,7 @@
 			msg.append(" param[0] accountId:");
 			msg.append(accountId);
 			log.warn(msg);
-			model.setViewName("401");
+			model.setViewName("403");
 			return model;
 		}
 	}
@@ -456,7 +456,9 @@
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
 		parameters.put("type", "month");
 		String sensorKey = "list";
-		if (!ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+		if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+			parameters.put("description", "description");
+		} else {
 			sensorKey = parameters.remove("sensorKey").toString();
 			List<String> sensorKeys = new ArrayList<String>();
 			sensorKeys.add(sensorKey);
@@ -468,9 +470,7 @@
 			}
 		}
 		Map pieData = alarmService.getPieData(parameters);
-
 		List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
-
 		return new ResultBean<List<Map<String, Object>>>(list);
 	}
 }

--
Gitblit v1.8.0