From 183c3ed6b30e3edf5e44c8bd2128d3be968bc1f4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 20 五月 2024 13:47:50 +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 | 67 ++++++++++++++-------------------
1 files changed, 29 insertions(+), 38 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 896be4c..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,43 +18,25 @@
private Configuration config;
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
- MessageHandler customS7Control = new MessageHandler();
+
public PLCManualJog() throws IOException {
config = new Configuration("config.properties");
}
-
+// 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 };
+// List<Boolean> arraylist = new ArrayList<>(Arrays.asList(values1));
@Override
public void run() {
while (this != null) {
try {
Thread.sleep(500);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // this.readValue();
- // String PlcAddress = this.name;
- // Integer Plccount = this.count;
-
- // System.out.println(stt);
-
-
- List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
-
-
- List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
-
- // Boolean[] values1 = { false, true, true, true, false, false, true, false,
- // false, true, true, true, false, false,
- // true, false };
- // List<Boolean> arraylist = new ArrayList<>(Arrays.asList(values1));
- // Boolean[] values2 = { false, true, true, true, false, false, true, false };
- // List<Boolean> arraylist2 = new ArrayList<>(Arrays.asList(values2));
- // Boolean[] values3 = { false, false };
- // List<Boolean> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
+ List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
JSONObject jsonObject = new JSONObject();
@@ -62,24 +46,19 @@
boolean value = arraylist.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
-
+ // 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()) {
@@ -109,22 +88,34 @@
List<Boolean> bolList = new ArrayList<>();
- for (int i = 0; i < 26 && i < messageBooleans.size(); i++) {
+ for (int i = 0; i < 28 && i < messageBooleans.size(); i++) {
bolList.add(messageBooleans.get(i));
}
if (!bolList.isEmpty()) {
- S7control.getinstance().WriteBit(addressList21, bolList);
+ S7control.getinstance().WriteBit(addressList21, bolList);
+// arraylist.clear();
+// arraylist.addAll(bolList);
+
System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList21);
}
webserver.clearMessages();
}
+ }else{
+ log.info("ManualJog is closed");
}
}
}
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+
+
+
}
}
--
Gitblit v1.8.0