From 627d77af3fcc77d012160c916349adc2340a846f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 06 五月 2024 08:21:26 +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 | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 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 bafe5ab..a3b24e4 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
@@ -22,29 +22,19 @@
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, 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();
- }
-
-
-
- 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,false, true, true, true, false, false, true, false,
-// false, true, false, true };
-// List<Boolean> arraylist = new ArrayList<>(Arrays.asList(values1));
-
+ List<String> addressList21 = Arrays.asList(config.getProperty("PLCManualJog.button").split(","));
+ List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
JSONObject jsonObject = new JSONObject();
@@ -57,11 +47,6 @@
// 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) {
@@ -107,7 +92,10 @@
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);
}
@@ -117,6 +105,13 @@
}
}
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+
+
+
}
}
--
Gitblit v1.8.0