From 9a0dd8244282d90b08b16d2c239683bbac62fab2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 一月 2024 15:02:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 379ec1b..766cc49 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -40,20 +40,13 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
// id
List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
-
List<String> paramlist = S7control.getinstance().readStrings(addressList1);
// System.out.println(paramlist);
-
//鎵嬪姩鐘舵��
List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
-
List<Short> data = S7control.getinstance().readWords(addresses);
-
-
//娓呴櫎id
List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
-
-
// 鎵爜鏋�
List<Boolean> data2 = S7control.getinstance().readBits(addressList0);
List<String> addressList3 = Arrays.asList(config.getProperty("Parameter2.scanner").split(","));
@@ -63,17 +56,11 @@
List<String> timeout = Arrays.asList(config.getProperty("Parameter2.timeout").split(","));
String timeout2 = config.getProperty("Parameter2.timeout");
-
Long readtimeout = S7control.getinstance().readtime(timeout2);
List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
-
-
List<String> data3 = S7control.getinstance().readStrings(addressList3);
// A01 A02 B01 B02
-
List<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
-
-
List<Short> data4 = S7control.getinstance().readWords(addresses4);
//System.out.println(data);
// List<Long> TIME2 = Collections.singletonList(S7control.getinstance().readtime("DB100.194"));
@@ -187,7 +174,7 @@
if (!containsOne) {
//鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
if (id.matches(".*\\d.*")) {
- //鍒ゆ柇娓呮id鏄惁true
+ //鍒ゆ柇娓呴櫎id鏄惁true
if (value) {
System.out.println(id);
switch (i) {
@@ -207,7 +194,7 @@
}
}
- }
+
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
if (!sValue.isEmpty()) {
@@ -215,6 +202,7 @@
S7control.getinstance().WriteBit(addressList0, sValue);
System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
}
+ }
}
}
} catch (Exception e) {
--
Gitblit v1.8.0