更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。

kaiyu

2020-09-28 c159a9fe4d8269dd7d29f879db6ef7202a074154

 src/main/webapp/js/newmoralmap.js

@@ -218,6 +218,10 @@
                    var longitude = 106.638135;
                    var latitude = 29.709625;
                    point = new BMap.Point(longitude, latitude);
                } else if ("射阳县" == regoinNames[2]) {
                    var longitude = 120.332826;
                    var latitude = 33.772274;
                    point = new BMap.Point(longitude, latitude);
                }
                map.centerAndZoom(point, showZoom);
            } else {
@@ -395,7 +399,7 @@
        var timer = setTimeout(function () {
            baiduMap.closeInfoWindow.apply(baiduMap, arguments);
            moralMap["_closeInfoWinTimer"] = null;
        }, 1200);
        }, 500);
        moralMap["_closeInfoWinTimer"] = timer;
    }
    moralMap.clearOverlays = function () {
@@ -644,6 +648,7 @@

        return listView;
    }

    moralMap.MoralMarker = function (option) {
        var _option = option;
        var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
@@ -696,21 +701,61 @@
        })
    }

    moralMap.WindMarker = function (option, target) {
    moralMap.WindMarker = function (option, moralMap) {
        var _option = option;
        var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
        var _iconObj = new BMap.Icon("/img/wind_dir.png", new BMap.Size(25, 25));
        var _iconObj = _getWindIcon(1);
        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"])
            });
        }

        this.constructor.call(this, _pointObj, {
            icon: _iconObj,
            offset: new BMap.Size(0, -35),
            offset: new BMap.Size(0, -11),
            enableMassClear: true
        })
        return $.extend(this, {
            refreshWindDir: function (windDir) {
            refreshWindDir: function (windDir, windSpeed) {
                //状态发生变化的时候设置图标风向
                this.setRotation(windDir);
                if (windDir == undefined || windSpeed == undefined) {
                    moralMap.removeOverlay(this);
                } else {
                    var speedLevel;
                    if (windSpeed >= 0 && windSpeed <= 0.2) {
                        speedLevel = 0;
                    } else if (windSpeed > 0.2 && windSpeed <= 1.5) {
                        speedLevel = 1;
                    } else if (windSpeed > 1.5 && windSpeed <= 3.3) {
                        speedLevel = 2;
                    } else if (windSpeed > 3.3 && windSpeed <= 5.4) {
                        speedLevel = 3;
                    } else if (windSpeed > 5.4 && windSpeed <= 7.9) {
                        speedLevel = 4;
                    } else if (windSpeed > 7.9 && windSpeed <= 10.7) {
                        speedLevel = 5;
                    } else if (windSpeed > 10.7 && windSpeed <= 13.8) {
                        speedLevel = 6;
                    } else if (windSpeed > 13.8 && windSpeed <= 17.1) {
                        speedLevel = 7;
                    } else if (windSpeed > 17.1) {
                        speedLevel = 8;
                    }
                    if (speedLevel == 0) {
                        moralMap.removeOverlay(this);
                    } else {
                        moralMap.addOverlay(this);
                        var iconObj = _getWindIcon(speedLevel);
                        this.setIcon(iconObj);
                        this.setRotation(windDir);
                    }
                }
            },
            getOption: function () {
                return _option;
@@ -805,7 +850,7 @@
    var sensorsDescriptionMap;
    var sensorsUnitMap;
    $.ajax({
        url: "getSensorsMap",
        url: "getSensorsAllMap",
        type: "get",
        dataType: "json",
        success: function (data) {
@@ -823,14 +868,19 @@
                }
            }
        }
        var windMarker = new moralMap.WindMarker(option);
        var windIcon = {};
        windIcon["url"] = "/img/icoWind0";
        windIcon["width"] = 25;
        windIcon["height"] = 25;
        option["windIcon"] = windIcon;
        var windMarker = new moralMap.WindMarker(option, moralMap);
        moralMap.putDevice(option['mac'], windMarker);
        var refreshWindMarker = windMarker.refreshWindDir;
        return $.extend(windMarker, {
            refreshWindDir: function (data) {
                if (data != null && data != "") {
                    this.setData(data); //更新数据
                    refreshWindMarker.call(this, data["e23"]);
                    refreshWindMarker.call(this, data["e23"], data["e18"]);
                }
            },
            setData: function (data) {
@@ -898,24 +948,14 @@
        }
        var mouseOverHandle = option['mouseover'];
        moralMarker.addEventListener("mouseover", function () {
         /*   var obj = {};
            obj['methodName'] = 'deliverMac';
            obj['mac'] = option['mac'];
            var objStr = JSON.stringify(obj);
            if (!!window['external'] && !!window['external']['callWin']) {
                window['external'].callWin(objStr);
            } else {
                alert(objStr);
            }*/

            moralMap.showSensors = function (jsonData) {
                var deviceSensors = jsonData;
                var mac = deviceSensors["mac"];
                if (mac == option['mac']) {
                    if (!jsonData.hasOwnProperty('mac')) {
                        infoWindow.setContent("");
                        infoWindow.redraw();
                    } else {
                if (!jsonData.hasOwnProperty('mac')) {
                    infoWindow.setContent("");
                    infoWindow.redraw();
                } else {
                    if (mac == option['mac']) {
                        var adressOutHtml = '<div style="min-height:20px;overflow:auto;max-height:480px;font-size: 12px;" onmouseover="moralMap.clearCloseInfoWindow()" onmouseout="moralMap.closeInfoWindow()">';
                        var y, m, d, h, mm, s;
                        var date = new Date($.now());
@@ -951,6 +991,7 @@
                    }
                }
            }
            // }
            /*   if (!$.isEmptyObject(sensorInfo)) {
                   moralMap.openInfoWindow(infoWindow, this._point); //开启信息窗口
               }*/
@@ -958,14 +999,6 @@
        });

        moralMarker.addEventListener("mouseout", function () {
          /*  var obj = {};
            obj['methodName'] = 'stopDeliverMac';
            var objStr = JSON.stringify(obj);
            if (!!window['external'] && !!window['external']['callWin']) {
                window['external'].callWin(objStr);
            } else {
                alert(objStr);
            }*/
            moralMap.closeInfoWindow();
        });

@@ -1072,6 +1105,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 ("省控站" === option["monitorPoint"]["description"]) {
                            var icon06 = new BMap.Icon("/img/ico06.png", new BMap.Size(50, 50));
                            var mark06 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon06});
                            markers.push(mark06);
                        } else if ("县控站" === option["monitorPoint"]["description"]) {
                            var icon08 = new BMap.Icon("/img/ico08.png", new BMap.Size(50, 50));
                            var mark08 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon08});
                            markers.push(mark08);
                        }
                    }
                }
            }