From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
index dae4ca1..e8bfd42 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java
@@ -4,6 +4,7 @@
import com.github.xingshuangs.iot.utils.ShortUtil;
import java.lang.reflect.Array;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -182,6 +183,7 @@
Array.setByte(valueList, i, plcValueArray[plcParameterInfo.getAddressIndex() + i]);
}
+
if (plcParameterInfo.getAddressLength() == 2) {
plcParameterInfo.setValue(String.valueOf(byte2short(valueList)));
} else if (plcParameterInfo.getAddressLength() == 4) {
--
Gitblit v1.8.0