From 9e8a54035a7b13ef75558c6e44ae7a7cd55693c9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 十二月 2023 08:39:56 +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 | 82 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 9 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 23ac20d..1711970 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
@@ -71,8 +71,36 @@
// Integer Plccount = this.count;
// System.out.println(stt);
- List<Boolean> arraylist = S7control.getinstance().ReadBits("DB101.0.0", 16);
- List<Boolean> arraylist2 = S7control.getinstance().ReadBits("DB101.2.6", 8);
+
+ List<String> addressList0 = new ArrayList<>();
+ addressList0.add("DB101.2.6");
+ addressList0.add("DB101.2.7");
+ addressList0.add("DB101.3.0");
+ addressList0.add("DB101.3.1");
+ addressList0.add("DB101.3.2");
+ addressList0.add("DB101.3.3");
+ addressList0.add("DB101.3.4");
+ addressList0.add("DB101.3.5");
+
+ List<String> addressList21 = new ArrayList<>();
+ addressList21.add("DB101.0.0");
+ addressList21.add("DB101.0.1");
+ addressList21.add("DB101.0.2");
+ addressList21.add("DB101.0.3");
+ addressList21.add("DB101.0.4");
+ addressList21.add("DB101.0.5");
+ addressList21.add("DB101.0.6");
+ addressList21.add("DB101.0.7");
+ addressList21.add("DB101.1.0");
+ addressList21.add("DB101.1.1");
+ addressList21.add("DB101.1.2");
+ addressList21.add("DB101.1.3");
+ addressList21.add("DB101.1.4");
+ addressList21.add("DB101.1.5");
+ addressList21.add("DB101.1.6");
+ addressList21.add("DB101.1.7");
+ List<Boolean> arraylist = S7control.getinstance().readBits(addressList21);
+ List<Boolean> arraylist2 = S7control.getinstance().readBits(addressList0);
List<Boolean> arraylist3 = S7control.getinstance().ReadBits("DB101.5.2", 2);
// Boolean[] values1 = { false, true, true, true, false, false, true, false,
// false, true, true, true, false, false,
@@ -96,6 +124,7 @@
jsonObject.append("params", params);
+// System.out.println("messageValue锛�" + arraylist +"messageValue2锛�" + arraylist2 );
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
@@ -104,9 +133,43 @@
WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
if (webSocketServer != null) {
- String addressList1 = "DB101.0.0";
- String addressList2 = "DB101.2.6";
+ // String addressList1 = "DB101.0.0";
+// String addressList2 = "DB101.2.6";
String addressList3 = "DB101.5.2";
+
+
+ List<String> addressList2 = new ArrayList<>();
+ addressList2.add("DB101.2.6");
+ addressList2.add("DB101.2.7");
+ addressList2.add("DB101.3.0");
+ addressList2.add("DB101.3.1");
+ addressList2.add("DB101.3.2");
+ addressList2.add("DB101.3.3");
+ addressList2.add("DB101.3.4");
+ addressList2.add("DB101.3.5");
+
+
+ List<String> addressList211 = new ArrayList<>();
+ addressList211.add("DB101.0.0");
+ addressList211.add("DB101.0.1");
+ addressList211.add("DB101.0.2");
+ addressList211.add("DB101.0.3");
+ addressList211.add("DB101.0.4");
+ addressList211.add("DB101.0.5");
+ addressList211.add("DB101.0.6");
+ addressList211.add("DB101.0.7");
+ addressList211.add("DB101.1.0");
+ addressList211.add("DB101.1.1");
+ addressList211.add("DB101.1.2");
+ addressList211.add("DB101.1.3");
+ addressList211.add("DB101.1.4");
+ addressList211.add("DB101.1.5");
+ addressList211.add("DB101.1.6");
+ addressList211.add("DB101.1.7");
+
+ List<String> addressList311 = new ArrayList<>();
+ addressList311.add("DB101.5.2");
+ addressList311.add("DB101.5.3");
List<String> messages = webSocketServer.getMessages();
if (!messages.isEmpty()) {
@@ -153,17 +216,18 @@
// System.out.println(bolList2);
// System.out.println(bolList3);
if (!bolList.isEmpty()) {
- S7control.getinstance().WriteBit(addressList1, bolList);
- System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList1);
+ S7control.getinstance().WriteBit(addressList211, bolList);
+ System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList211);
}
if (!bolList2.isEmpty()) {
- S7control.getinstance().WriteBit(addressList2, bolList2);
+ S7control.getinstance().WriteBit(addressList2, bolList2);
System.out.println("messageValue锛�" + bolList2 + " written to PLC at address " + addressList2);
}
if (!bolList3.isEmpty()) {
- S7control.getinstance().WriteBit(addressList3, bolList3);
- System.out.println("messageValue锛�" + bolList3 + " written to PLC at address " + addressList3);
+ S7control.getinstance().WriteBit(addressList311, bolList3);
+ System.out.println("messageValue锛�" + bolList3 + " written to PLC at address " + addressList311);
}
+ webSocketServer.clearMessages();
}
}
--
Gitblit v1.8.0