From 5c6a71fbcad27a637c775358d1004ddb95f55729 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 17:29:41 +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 c351ac2..86f52d9 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -37,6 +37,7 @@
import com.alibaba.fastjson.TypeReference;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ValidateUtil;
+import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
/**
@@ -151,7 +152,7 @@
/**
* Gets the standard by sensor.���������������������������
*
- * @param request
+ * @param macKey
* the request
* @return the standard by sensor
*/
@@ -278,7 +279,7 @@
}
@RequestMapping(value = "/map-page", method = RequestMethod.GET)
- public String map(Model model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){
+ public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){
Account account = accountService.getAccountById(accountId);
String regionName = areaService.selectFullNameByCode(code);
if(account!=null&®ionName!=null){
@@ -290,8 +291,9 @@
params.put("orgId", account.getOrganizationId());
params.put("sensors", sensors);
String paramsJson = params.toJSONString();
- model.addAttribute("mapParams",paramsJson);
- return "map";
+ model.addObject("mapParams",paramsJson);
+ model.setViewName("map");
+ return model;
} else {
StringBuilder msg = new StringBuilder();
msg.append(" param[0] areaCode:");
@@ -299,7 +301,8 @@
msg.append(" param[0] accountId:");
msg.append(accountId);
log.warn(msg);
- return "401";
+ model.setViewName("401");
+ return model;
}
}
@RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)
--
Gitblit v1.8.0