From 328d276bec3fa2d3b1fd9fec1965c11b4e45c1c7 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 15 九月 2023 16:59:04 +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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 9b9a66e..3ae24aa 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
@@ -206,7 +206,8 @@
} else
return null;
- for (int i = 0; i < count; i++) {
+ addresslist.add(address);
+ for (int i = 0; i < count-1; i++) {
int bitcurrent = bitindex + addedbit;
if (bitcurrent > 7) {
@@ -214,7 +215,9 @@
bitindex = 0;
} else
bitindex = bitcurrent;
- addresslist.add(stringdatas[0] + "." + dbwindex + "." + bitindex);
+
+ String endstr=stringdatas.length==3?"." + bitindex:"";
+ addresslist.add(stringdatas[0] + "." + dbwindex + endstr);
}
return addresslist;
}
--
Gitblit v1.8.0