From 64ec70b0423cc9f745fdf269c0d1d7c5828b42c8 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 16 七月 2024 14:40:28 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/LedThread.java | 1 + src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +++ src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java | 2 +- src/main/resources/application.yml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 64717c3..dff44cb 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); continue; + } else { + News.info("{}鍙稬ED鍛戒护涓嬪彂鎴愬姛锛侊紒锛乕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("{}鍙稬ED鍛戒护閲嶇疆锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort()); if (ledThread == null) { continue; } diff --git a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java index dedc11b..0d1ea53 100644 --- a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java +++ b/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); } /** diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java index f7805c9..a841206 100644 --- a/src/main/java/com/zy/core/thread/LedThread.java +++ b/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()); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c1bff08..e58b569 100644 --- a/src/main/resources/application.yml +++ b/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 -- Gitblit v1.9.1