From 9057d8571f11a552a326fa35fda9b5ec614f5c58 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 09:33:09 +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 | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 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 16fa085..16f05e3 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,7 +22,11 @@
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() {
@@ -37,14 +41,7 @@
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<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
JSONObject jsonObject = new JSONObject();
@@ -54,14 +51,9 @@
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) {
@@ -107,7 +99,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);
}
--
Gitblit v1.8.0