Merge remote-tracking branch 'origin/master'

wangfei

2024-10-21 8785b6b5ee9298308752b53bf546953ae49b8c88

 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) {