From 04bc6b13175f4274933b42278576be9e18ab8ef7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Jul 2018 14:31:36 +0800
Subject: [PATCH] 地图 type 功能实现
---
src/main/webapp/js/moralmap.js | 15 ++++++++++-----
src/main/java/com/moral/common/bean/ResultBean.java | 5 ++++-
src/main/webapp/view/map.jsp | 8 +++++++-
src/main/java/com/moral/controller/ScreenController.java | 9 ++++-----
src/main/webapp/js/utils.js | 22 ++++++++++++++++++++++
5 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/ResultBean.java b/src/main/java/com/moral/common/bean/ResultBean.java
index b3a2ff9..e0c2d60 100644
--- a/src/main/java/com/moral/common/bean/ResultBean.java
+++ b/src/main/java/com/moral/common/bean/ResultBean.java
@@ -22,7 +22,10 @@
return new ResultBean("������������",SUCCESS);
}
public static ResultBean fail(){
- return new ResultBean("������������",FAIL);
+ return fail("������������");
+ }
+ public static ResultBean fail(String msg){
+ return new ResultBean(msg,FAIL);
}
public ResultBean(Throwable e) {
this.message = e.toString();
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a78ff3d..85745f8 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -9,8 +9,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.alibaba.fastjson.JSONReader;
-import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.*;
import com.moral.common.util.StringUtils;
import com.moral.entity.*;
import com.moral.entity.alarm.AlarmConfig;
@@ -32,8 +31,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.Constants;
import com.moral.common.bean.JsonData;
import com.moral.common.bean.PageResult;
@@ -616,7 +613,9 @@
DeviceVersion deviceVersion = deviceVersionService.queryVersionById(device.getDeviceVersionId());
rtdLayout = orgLayoutService.queryRtdLayoutWithUnit(orgId,deviceVersion.getVersion());
}else {
- return ResultBean.fail();
+ String errMsg = "device ���������������"+ JSON.toJSONString(device);
+ log.warn(errMsg);
+ return ResultBean.fail(errMsg);
}
} else {
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 276078c..c6c25bc 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -44,10 +44,15 @@
* ���������������������
*/
moralMap.mapInit = function() {
- baiduMap = new BMap.Map("mapCanvas", {
- minZoom: 12,
- maxZoom: 20
- }); // ������Map������,���������������������������/���������
+ var defaultParam = {
+ minZoom: 12,
+ maxZoom: 20
+ };
+ debugger;
+ if(!!arguments[1]) {
+ $.extend(defaultParam,arguments[1]);
+ }
+ baiduMap = new BMap.Map("mapCanvas",defaultParam); // ������Map������,���������������������������/���������
var map = baiduMap;
var mapStyle = {
features: ["road", "building", "water", "land"], //������������������poi
@@ -550,7 +555,7 @@
width: 110, // ������������������
height: 80, // ������������������
title: getTitleOutHtml(), // ������������������
- offset: new BMap.Size(-2,0) //���������������������
+ offset: new BMap.Size(-8,-5) //���������������������
}
function getTitleOutHtml() {
diff --git a/src/main/webapp/js/utils.js b/src/main/webapp/js/utils.js
new file mode 100644
index 0000000..58dfcf3
--- /dev/null
+++ b/src/main/webapp/js/utils.js
@@ -0,0 +1,22 @@
+//paraName ���������������������
+function getUrlParam(paraName) {
+ var url = document.location.toString();
+ var arrObj = url.split("?");
+
+ if (arrObj.length > 1) {
+ var arrPara = arrObj[1].split("&");
+ var arr;
+
+ for (var i = 0; i < arrPara.length; i++) {
+ arr = arrPara[i].split("=");
+
+ if (arr != null && arr[0] == paraName) {
+ return arr[1];
+ }
+ }
+ return "";
+ }
+ else {
+ return "";
+ }
+}
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 24d95aa..b3f5813 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -13,6 +13,7 @@
<title></title>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=rER1sgBIcQxkfNSlm2wmBGZGgEERrooM"></script>
<script type="text/javascript" src="/js/jquery.min.js"></script>
+ <script type="text/javascript" src="/js/utils.js"></script>
<script type="text/javascript">
if(typeof (JSON) == 'undefined'){
$.getScript("js/json2.js");
@@ -299,8 +300,13 @@
var moralMap = window.moralMap;
var params = $.parseJSON($("#mapParams").html());
moralMap['params'] = params;
+ var mapType = getUrlParam("mapType");
+ var mapOption = {};
+ if(!!mapType && !!eval(mapType)) {
+ mapOption["mapType"] = eval(mapType);
+ }
//������������������������������
- moralMap.mapInit(params["regionName"]);
+ moralMap.mapInit(params["regionName"],mapOption);
//������������
var listView =moralMap.initListView({id: "#equ_list",pageSize:12});
window["listView"] = listView;
--
Gitblit v1.8.0