fengxiang
2018-07-17 04bc6b13175f4274933b42278576be9e18ab8ef7
地图 type 功能实现
1 files added
4 files modified
59 ■■■■ changed files
src/main/java/com/moral/common/bean/ResultBean.java 5 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java 9 ●●●●● patch | view | raw | blame | history
src/main/webapp/js/moralmap.js 15 ●●●●● patch | view | raw | blame | history
src/main/webapp/js/utils.js 22 ●●●●● patch | view | raw | blame | history
src/main/webapp/view/map.jsp 8 ●●●● patch | view | raw | blame | history
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();
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 {
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() {
src/main/webapp/js/utils.js
New file
@@ -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 "";
    }
}
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;