From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java
index 3fefdac..bc14c50 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcBitInfo.java
@@ -54,19 +54,29 @@
*/
public String getAddress(int index) {
String[] stringdatas = this.startAddress.trim().split("\\.");
- if (stringdatas.length < 2)
+ if (stringdatas.length < 2) {
return null;
+ }
int dbwindex = 0;
int bitindex = 0;
if (stringdatas.length == 3) {
dbwindex = Integer.parseInt(stringdatas[1]);
bitindex = Integer.parseInt(stringdatas[2]);
} else
+ {
return null;
+ }
dbwindex += index / 8;
bitindex += index % 8;
return stringdatas[0] + "." + dbwindex + "." + bitindex;
}
+ /**
+ * 鑾峰彇鍦板潃
+ *
+ */
+ public String getAddress() {
+ return getAddress(this.addressIndex);
+ }
public void setAddressIndex(int addressindex) {
--
Gitblit v1.8.0