update

ZhuDongming

2020-06-29 e39e590ae3deed73a0927571174f9fbdb7f7e1e5

update

 src/main/java/com/moral/webSocketServer/WebSocketServer.java

@@ -37,7 +37,7 @@

    private String orgId;

    private String regionCode;
    private String accountId;

    private Connection connection;

@@ -58,8 +58,8 @@
        webSocketSet.add(this);
        int flag = param.indexOf("&");
        orgId = param.substring(0, flag);
        regionCode = param.substring(flag + 1);
        String QUEUE_NAME = "deviceInfo";
        accountId = param.substring(flag + 1);
        String QUEUE_NAME = "deviceInfo_"+accountId;
        try {
            //打开连接和创建频道，与发送端一样
            ConnectionFactory factory = new ConnectionFactory();

 src/main/webapp/js/newmoralmap.js

@@ -724,23 +724,23 @@
                    moralMap.removeOverlay(this);
                } else {
                    var speedLevel;
                    if (windSpeed >= 0.0 && windSpeed <= 0.2) {
                    if (windSpeed >= 0 && windSpeed <= 0.2) {
                        speedLevel = 0;
                    } else if (windSpeed >= 0.3 && windSpeed <= 1.5) {
                    } else if (windSpeed > 0.2 && windSpeed <= 1.5) {
                        speedLevel = 1;
                    } else if (windSpeed >= 1.6 && windSpeed <= 3.3) {
                    } else if (windSpeed > 1.5 && windSpeed <= 3.3) {
                        speedLevel = 2;
                    } else if (windSpeed >= 3.4 && windSpeed <= 5.4) {
                    } else if (windSpeed > 3.3 && windSpeed <= 5.4) {
                        speedLevel = 3;
                    } else if (windSpeed >= 5.5 && windSpeed <= 7.9) {
                    } else if (windSpeed > 5.4 && windSpeed <= 7.9) {
                        speedLevel = 4;
                    } else if (windSpeed >= 8.0 && windSpeed <= 10.7) {
                    } else if (windSpeed > 7.9 && windSpeed <= 10.7) {
                        speedLevel = 5;
                    } else if (windSpeed >= 10.8 && windSpeed <= 13.8) {
                    } else if (windSpeed > 10.7 && windSpeed <= 13.8) {
                        speedLevel = 6;
                    } else if (windSpeed >= 13.9 && windSpeed <= 17.1) {
                    } else if (windSpeed > 13.8 && windSpeed <= 17.1) {
                        speedLevel = 7;
                    } else if (windSpeed >= 17.2) {
                    } else if (windSpeed > 17.1) {
                        speedLevel = 8;
                    }
                }

 src/main/webapp/view/newmap.jsp

@@ -372,6 +372,7 @@
        moralMap['params'] = params;
        var orgId = params["orgId"];
        var regionCode = params["regionCode"];
        var accountId = params["accountId"];
        var provinceCode = regionCode.toString().substring(0, 2) + "0000";
        var mapType = getUrlParam("mapType");
        var mapOption = {};
@@ -645,7 +646,7 @@
        if (typeof (WebSocket) === "undefined") {
            alert("您的浏览器不支持WebSocket");
        } else {
            ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + regionCode);
            ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId);
            ws.onopen = function () {
            };