From 1de312a18d164c2fa3718a1a975b8c5804723bcf Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:46:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 66 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index 5caea97..e207db3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -79,16 +79,36 @@
* @param datas word鐨勫��
*/
public void WriteWord(List<String> address, List<Short> datas) {
- if (s7PLC==null)
+ if (s7PLC == null)
return;
- // s7PLC.write(address, data);
- MultiAddressWrite addressWrite = new MultiAddressWrite();
for (int i = 0; i < address.size(); i++) {
- addressWrite.addInt16(address.get(i), datas.get(i));
+ String addr = address.get(i);
+ short data = datas.get(i);
+
+ if (addr.contains("-")) {
+ // 澶勭悊鑼冨洿鍦板潃
+ String[] range = addr.split("-");
+ if (range.length == 2) {
+ String startAddr = range[0].trim();
+ String endAddr = range[1].trim();
+
+ int startIndex = Integer.parseInt(startAddr.substring(startAddr.indexOf('.') + 1));
+ int endIndex = Integer.parseInt(endAddr.substring(endAddr.indexOf('.') + 1));
+
+ for (int j = startIndex; j <= endIndex; j++) {
+ String currentAddress = startAddr.substring(0, startAddr.indexOf('.') + 1) + j;
+ s7PLC.writeInt16(currentAddress, data); // 灏嗘暟鎹啓鍏ュ綋鍓嶅湴鍧�
+ }
+ }
+ } else {
+ // 澶勭悊鍗曚釜鍦板潃
+ s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
+ }
}
- s7PLC.writeMultiData(addressWrite);
}
+
+
@@ -255,6 +275,42 @@
return s7PLC.readBoolean(addresslist);
}
+ public List<Boolean> readBits(List<String> addressList) {
+ if (s7PLC == null)
+ return null;
+
+ List<Boolean> result = new ArrayList<>();
+
+ for (String address : addressList) {
+ if (address.contains("~")) {
+ String[] range = address.split("~");
+ String startAddress = range[0];
+ String endAddress = range[1];
+
+ int startIndex = extractAddressNumber(startAddress);
+ int endIndex = extractAddressNumber(endAddress);
+
+ String prefix = startAddress.substring(0, startAddress.indexOf(".") + 1);
+
+ for (int i = startIndex; i <= endIndex; i++) {
+ String newAddress = prefix + i;
+ result.add(s7PLC.readBoolean(newAddress));
+ }
+ } else {
+ result.add(s7PLC.readBoolean(address));
+ }
+ }
+
+ return result;
+ }
+
+
+ private int extractAddressNumber(String address) {
+ String numberStr = address.replaceAll("\\D+", ""); // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
+ return Integer.parseInt(numberStr);
+ }
+
+
/**
* 浠庢寚瀹氱殑鍦板潃寮�濮� 杩炵画鎸塨it浣嶈鍙�
*
--
Gitblit v1.8.0