From 9472449b4ca46f482d13b6e628660c61101b443f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 五月 2024 14:55:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
index 07d6e7f..4c030db 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.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 PLCManualJog extends Thread {
@@ -33,18 +35,8 @@
while (this != null) {
try {
Thread.sleep(500);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
-
-
- List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
+ List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
-
-
-
JSONObject jsonObject = new JSONObject();
@@ -57,21 +49,16 @@
// System.out.println("messageValue锛�"+ arraylist );
jsonObject.append("params", params);
-// System.out.println("messageValue锛�" + arraylist +"messageValue2锛�" + arraylist2 );
-// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
-// if (sendwServer != null) {
-// sendwServer.sendMessage(jsonObject.toString());
-// }
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualJog");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
+
// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
- if (webserver != null) {
-
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject.toString());
List<String> messages = webserver.getMessages();
if (!messages.isEmpty()) {
@@ -116,10 +103,19 @@
webserver.clearMessages();
}
+ }else{
+ log.info("ManualJog is closed");
}
}
}
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+
+
+
}
}
--
Gitblit v1.8.0