更新Websocket以及rabbitMQ关闭逻辑

kaiyu

2020-12-07 513d8719dd870fed4022dacc56be46353c33e7f4

 src/main/webapp/js/newmoralmap.js

@@ -657,7 +657,11 @@
            state = state == null ? 0 : state;
            var icon = _option["icon"];
            //var url = icon["stateIcons"][state];
            var url = icon["url"] + state + ".png";
            if (state==5 || state==6){
                var url = icon["url"] + "0"+state + ".png";
            }else {
                var url = icon["url"] + state + ".png";
            }
            return new BMap.Icon(url, new BMap.Size(icon["width"], icon["height"]), {
                imageSize: new BMap.Size(icon["width"], icon["height"])
            });
@@ -698,16 +702,18 @@
        })
    }


    moralMap.WindMarker = function (option, moralMap) {
        var _option = option;
        var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
        var _iconObj = _getWindIcon(1);
        var _iconObj = _getWindIcon(0);
        this._point = _pointObj;

        function _getWindIcon(speedLevel) {
            speedLevel = speedLevel == null ? 0 : speedLevel;
            var windIcon = _option["windIcon"];
            var windUrl = windIcon["url"] + speedLevel + ".png";

            return new BMap.Icon(windUrl, new BMap.Size(windIcon["width"], windIcon["height"]), {
                imageSize: new BMap.Size(windIcon["width"], windIcon["height"])
            });
@@ -718,6 +724,8 @@
            offset: new BMap.Size(0, -11),
            enableMassClear: true
        })


        return $.extend(this, {
            refreshWindDir: function (windDir, windSpeed) {
                //状态发生变化的时候设置图标风向
@@ -747,7 +755,6 @@
                    if (speedLevel == 0) {
                        moralMap.removeOverlay(this);
                    } else {
                        moralMap.addOverlay(this);
                        var iconObj = _getWindIcon(speedLevel);
                        this.setIcon(iconObj);
                        this.setRotation(windDir);
@@ -759,7 +766,8 @@
            },
            setOption: function (option) {
                _option = option;
            }
            },

        })

    }
@@ -778,7 +786,7 @@
            }
        }
        var icon = {};
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png","/img/ico05.png", "/img/ico06.png"];
        icon["url"] = "/img/ico0";
        icon["width"] = 50;
        icon["height"] = 50;
@@ -903,7 +911,7 @@
            }
        }
        var icon = {};
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png","/img/ico005.png", "/img/ico006.png"];
        icon["url"] = "/img/ico0";
        icon["width"] = 50;
        icon["height"] = 50;
@@ -1202,7 +1210,57 @@

    var deviceStates;
    var monitorPointStates;
    moralMap.refreshState = function (states) {
    moralMap.refreshState = function (states, orgId, regionCode, accountId) {
        var state = JSON.stringify(states);
        var state1 = $(".pp2").html()
        var paramMap = {};
        var abc = '';
        paramMap["orgId"] = orgId;
        paramMap["regionCode"] = regionCode;
        paramMap["accountId"] = accountId;
        paramMap["states"] = state;
        paramMap["states1"] = state1;
        $.ajax({
            url: "/screen/tellAlarm",
            type: "post",
            dataType: "json",
            data: paramMap,
            success: function (info) {
                var alarm = JSON.parse(JSON.stringify(info));
                if (alarm.length > 0) {
                    $("#box").attr("style", "display:block;");//显示div
                    $("#tou").attr("style", "display:block;color: #d9534f;font-size: 20px;");//显示div
                    for (var i = 0; i < alarm.length; i++) {
                        var text = "<span style='line-height: 25px><p style='line-height: 25px'>";
                        var lookString = alarm[i][0]["time"] + " " + alarm[i][0]["name"];
                        for (var j = 0; j < alarm[i].length; j++) {
                            var value = "";
                            if (alarm[i].length > 1) {
                                if (j == 0) {
                                    value = alarm[i][j]["sensor"] + "=" + alarm[i][j]["value"];
                                    lookString = lookString + value;
                                } else {
                                    value = alarm[i][j]["sensor"] + "=" + alarm[i][j]["value"];
                                    lookString = lookString + "," + value;
                                }
                            } else {
                                value = alarm[i][j]["sensor"] + "=" + alarm[i][j]["value"];
                                lookString = lookString + value;
                            }
                            text = text + lookString + "超标" + "</p><hr></hr></span>";
                            $("#box1").prepend(text);
                        }

                    }
                    for (var j = 0; j < $("#box1").children("span").length; j++) {
                        if ($("#box1").children("span").length > 50) {
                            $("#box1 span:last").remove()  ;
                        }
                    }
                }
            },
        })
        state1 = $(".pp2").html(state);
        monitorPointStates = states;
        deviceStates = [];
        for (var i in states) {