#
whycq
2024-07-16 64ec70b0423cc9f745fdf269c0d1d7c5828b42c8
#
4个文件已修改
8 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/LedThread.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1899,6 +1899,8 @@
                if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(1, commands))) {
                    News.error("{}号LED命令下发失败!!![ip:{}] [port:{}]", led.getId(), led.getIp(), led.getPort());
                    continue;
                } else {
                    News.info("{}号LED命令下发成功!!![ip:{}] [port:{}] [port:{}]", led.getId(), led.getIp(), led.getPort(),commands);
                }
            }
@@ -1955,6 +1957,7 @@
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
            // led显示默认内容
            if (reset) {
                //News.info("{}号LED命令重置!!![ip:{}] [port:{}]", led.getId(), led.getIp(), led.getPort());
                if (ledThread == null) {
                    continue;
                }
src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
@@ -77,7 +77,7 @@
                this.sendMessage(JSON.toJSONString(socketMessage));
            }
        }
//        log.info("收到来自连接:" + sessionId + "的信息:" + message);
        log.info("收到来自连接:" + sessionId + "的信息:" + message);
    }
    /**
src/main/java/com/zy/core/thread/LedThread.java
@@ -103,6 +103,7 @@
    }
    public void errorReset() {
        this.workNos.clear();
        this.errorMsg.delete(0, errorMsg.length());
    }
src/main/resources/application.yml
@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.10.10.233:1433;databasename=phpsasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=phpsasrs
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
    username: sa
    password: sa@123