地图相关 bug修复

fengxiang

2018-02-07 7a0aeaea540803c0768c10c63ac5e78849f01c7a

地图相关 bug修复

 src/main/java/com/moral/controller/ScreenController.java

@@ -136,9 +136,8 @@
    @GetMapping("alarm-levels")

    public Object getAlarmLevels(HttpServletRequest request, Integer orgId) {

        List<Map<String,Object>> sensorAlarmList = null;

        AlarmConfigValue alarmConfigValue = null;

        try {

            alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();

            AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get();

            Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels();

            sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> {

                 AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key);


 src/main/resources/mapper/DeviceMapper.xml

@@ -158,8 +158,9 @@
        </where>
    </select>
    <select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
        SELECT dev.* from device dev
        SELECT dev.*,dve.version as device_version_value from device dev
        left join monitor_point  mpt on dev.monitor_point_id = mpt.id
        left join device_version dve on dev.device_version_id = dve.id
        <where>
            <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
                mpt.organization_id = #{orgId,jdbcType=VARCHAR}

 src/main/webapp/js/moralmap.js

@@ -255,6 +255,10 @@
    }
    moralMap.onItermClick = function(index) {
        var row = moralMap.getPopupEqu(index);
        if(row['mac']==null){
            alert("mac项未配置，请联系管理员设置");
            return;
        }
        var equ = {
            name: row['name'],
            mac: (row['mac']).toLowerCase(),
@@ -452,7 +456,7 @@
            enableMassClear: true
        })
        //事件注册
        var eventType = ['click', 'mouseover', 'mouseout'];
        var eventType = ['click'];
        for(var index in eventType) {
            var eventName = eventType[index];
            if(_option[eventName] != undefined && typeof _option[eventName] == "function") {
@@ -658,8 +662,14 @@
        if(moralMask["infoWindow"] == undefined) {
            moralMask["infoWindow"] = infoWindow;
        }
        var  mouseOverHandle = option['mouseover'];
        //弹窗打开和关闭
        moralMask.addEventListener("mouseover", function() {
            if(mouseOverHandle!=null&&mouseOverHandle instanceof  Function){
                //将arguments转换成数组
                var args = Array.prototype.slice.call(arguments);
                mouseOverHandle.apply(this, args);
            }
            moralMap.closeSearchBox();
            baiduMap.openInfoWindow(infoWindow, this._point); //开启信息窗口
            if(infoWindow.getContent() == "") {

 src/main/webapp/view/map.jsp

@@ -314,8 +314,18 @@
        for(var i in objs) {
                var obj = objs[i];
                if(moralMap.getEquipment(obj["mac"])==null){
                    obj['mouseover'] = function (type) {
                        if(type.target.getData()==null){
                            //当前设备数据为空时，设备悬停事件中 刷新一下数据
                            refreshAllState();
                        }
                    }
                    obj['click'] = function(){
                                    var _obj = this.getOption();
                                       var _obj = this.getOption();
                                       if(_obj['mac']==null){
                                           alert("mac项未配置，请联系管理员设置");
                                           return;
                                       }
                                        var equ = {
                                        name: _obj['name'],
                                        mac: (_obj['mac']).toLowerCase(),
@@ -333,12 +343,6 @@
                                        alert(equStr);
                                    }
                              }
                    obj['mouseover'] = function (type) {
                        if(type.target.getData()==null){
                            //当前设备数据为空时，设备悬停事件中 刷新一下数据
                            refreshAllState();
                        }
                    }
                   var moralMask = new moralMap.Equipment(obj);
                   moralMap.addOverlay(moralMask);
                }