From 25a897c4e2bfd1722b1ea53d0aba5df81fcacbfc Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Mar 2018 10:55:27 +0800
Subject: [PATCH] 地图相关资源
---
src/main/java/com/moral/controller/ScreenController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 4309f5b..eeac838 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -188,9 +188,10 @@
* @param request
* the request
* @return the average by all
+ * @throws Exception
*/
@GetMapping("all-average")
- public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) {
+ public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
return historyService.getAllSensorAverageByDevice(parameters);
}
@@ -298,6 +299,8 @@
Account account = accountService.getAccountById(accountId);
String regionName = areaService.selectFullNameByCode(code);
if(account!=null&®ionName!=null){
+ //������������
+ regionName = regionName.replace(" ","");
Object sensors = sensorService.queryAll();
JSONObject params = new JSONObject();
params.put("regionCode",code);
--
Gitblit v1.8.0