ZhuDongming
2020-07-06 f145f5ca0b1beef1300ef73ed1393af63413779d
add国控、省控、县控图标
3 files modified
65 ■■■■ changed files
src/main/java/com/moral/service/impl/DeviceServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
src/main/webapp/js/newmoralmap.js 22 ●●●●● patch | view | raw | blame | history
src/main/webapp/view/newmap.jsp 33 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -23,6 +23,7 @@
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Device;
import com.moral.entity.DeviceProperty;
import com.moral.entity.MonitorPoint;
import com.moral.mapper.DeviceMapper;
import com.moral.mapper.DevicePropertyMapper;
import com.moral.mapper.DeviceVersionMapper;
@@ -220,6 +221,10 @@
        Example.Criteria deviceCriteria = deviceExample.createCriteria();
        deviceCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
        List<Device> devicesInfo = deviceMapper.selectByExample(deviceExample);
        Example monitorExample = new Example(MonitorPoint.class);//实例化
        Example.Criteria monitorCriteria = monitorExample.createCriteria();
        monitorCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);
        List<MonitorPoint> monitorsInfo = monitorPointMapper.selectByExample(monitorExample);
        for (Device d : deviceList) {
            if (dv.contains(d.getDeviceVersionId())) {
                d.setHasWindInfo(true);
@@ -231,6 +236,11 @@
                    d.setState(temp.getState());
                }
            }
            for (MonitorPoint mp : monitorsInfo) {
                if (d.getMonitorPointId().equals(mp.getId())) {
                    d.setMonitorPoint(mp);
                }
            }
        }
        return deviceList;
    }
src/main/webapp/js/newmoralmap.js
@@ -648,15 +648,6 @@
    moralMap.MoralMarker = function (option) {
        var _option = option;
        var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
        if (_option["description"]=="国控站"){
            _option["state"]="5";
        }
        if (_option["description"]=="省控站"){
            _option["state"]="6";
        }
        if (_option["description"]=="县控站"){
            _option["state"]="8";
        }
        var _iconObj = _getMapIcon(_option["state"]);
        this._point = _pointObj;
@@ -1127,6 +1118,19 @@
                        if (longitude < bounds.northeastLng && longitude > bounds.southwestLng && latitude < bounds.northeastLat && latitude > bounds.southwestLat) {
                            markers.push(oldmarker);
                        }
                        if("国控站"===option["monitorPoint"]["description"]){
                            var icon05 = new BMap.Icon("/img/ico05.png", new BMap.Size(50, 50));
                            var mark05 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon05});
                            markers.push(mark05);
                        }else if("省控站"===obj["monitorPoint"]["description"]){
                            var icon06 = new BMap.Icon("/img/ico06.png", new BMap.Size(50, 50));
                            var mark06 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon06});
                            markers.push(mark06);
                        }else if("县控站"===obj["monitorPoint"]["description"]){
                            var icon08 = new BMap.Icon("/img/ico08.png", new BMap.Size(50, 50));
                            var mark08 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon08});
                            markers.push(mark08);
                        }
                    }
                }
            }
src/main/webapp/view/newmap.jsp
@@ -340,7 +340,8 @@
        background: url(/img/charts_btn_bg_2.png) left top no-repeat;
        background-size: 70%;
    }
    .wind_explain{
    .wind_explain {
        position: absolute;
        height: 200px;
        width: 110px;
@@ -348,15 +349,18 @@
        top: 110px;
        z-index: 1;
    }
    .wind_explain li{
    .wind_explain li {
        height: 25px;
    }
    .wind_explain li span{
    .wind_explain li span {
        display: inline-block;
        height: 25px;
        line-height: 25px;
    }
    .wind_explain li img{
    .wind_explain li img {
        vertical-align: top;
    }
</style>
@@ -518,6 +522,19 @@
                                alert(equStr);
                            }
                        }
                        if("国控站"===obj["monitorPoint"]["description"]){
                            var icon05 = new BMap.Icon("/img/ico05.png", new BMap.Size(50, 50));
                            var mark05 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon05});
                            moralMap.addOverlay(mark05);
                        }else if("省控站"===obj["monitorPoint"]["description"]){
                            var icon06 = new BMap.Icon("/img/ico06.png", new BMap.Size(50, 50));
                            var mark06 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon06});
                            moralMap.addOverlay(mark06);
                        }else if("县控站"===obj["monitorPoint"]["description"]){
                            var icon08 = new BMap.Icon("/img/ico08.png", new BMap.Size(50, 50));
                            var mark08 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon08});
                            moralMap.addOverlay(mark08);
                        }
                        var moralMask = new moralMap.Equipment(obj);
                        moralMap.addOverlay(moralMask);
                        if (obj['hasWindInfo'] && obj['state'] != 4) {
@@ -677,7 +694,7 @@
        if (typeof (WebSocket) === "undefined") {
            alert("您的浏览器不支持WebSocket");
        } else {
            ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId+'_'+regionCode);
            ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId + '_' + regionCode);
            ws.onopen = function () {
            };
@@ -685,9 +702,9 @@
            ws.onmessage = function (msg) {
                // $("#searchParam").val(JSON.parse(msg.data));
                moralMap.refreshWindDir(JSON.parse(JSON.parse(msg.data)));
              /*  if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
                    moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
                }*/
                /*  if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
                      moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
                  }*/
            };
            //关闭事件