From c85904597bf93e0fbae321093a970dd973b0f64f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54:28 +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 | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 16f05e3..048431f 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 {
@@ -16,7 +18,7 @@
private Configuration config;
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
- MessageHandler customS7Control = new MessageHandler();
+
public PLCManualJog() throws IOException {
@@ -25,7 +27,7 @@
// Boolean[] values1 = { false, true, true, true, false, false, true, false,
// false, true, true, true, false, false,
// true, false,false, true, true, true, false, false, true, false,
-// false, true, false, true };
+// false, true };
// List<Boolean> arraylist = new ArrayList<>(Arrays.asList(values1));
@Override
@@ -33,14 +35,7 @@
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);
@@ -58,12 +53,12 @@
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()) {
@@ -108,10 +103,19 @@
webserver.clearMessages();
}
+ }else{
+ log.info("ManualJog is closed");
}
}
}
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+
+
+
}
}
--
Gitblit v1.8.0