From c0b596275d583b0874e501f49a90e7a1dfd879e3 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期四, 09 五月 2024 09:37:48 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java index d2a6a67..99de30e 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java +++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java @@ -2,13 +2,15 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.FileUtils; import java.io.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - +@Slf4j public class PlcManualonePosition2 extends Thread { private Configuration config; @@ -165,10 +167,11 @@ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { - webserver.sendMessage(jsonObject.toString()); + // WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition2"); - if (webserver != null) { + if (webserver != null&&webserver.session.isOpen()) { + webserver.sendMessage(jsonObject.toString()); List<String> messages = webserver.getMessages(); List<String> waddresses1 = new ArrayList<>(); waddresses1.add("DB100.116"); @@ -208,6 +211,8 @@ // 娓呯┖娑堟伅鍒楄〃 webserver.clearMessages(); } + }else{ + log.info("ManualonePosition2 is closed"); } } } -- Gitblit v1.8.0