Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-04-18 ad28331c1e3ed456b72765874b41b83b49dc279f

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/device/PlcParameterObject.java

@@ -16,7 +16,6 @@
    private ArrayList<PlcParameterInfo> plcParameterList;



    /**
     * @return 数据区开始地址
     */
@@ -70,7 +69,6 @@
    }



    /**
     * 根据参数标识 获取某个参数实例
     * 
@@ -116,10 +114,6 @@
    }






    /**
     * 添加参数实例
     * 
@@ -154,19 +148,16 @@
                }
                if (plcParameterInfo.getAddressLength()==2) { 
                      plcParameterInfo.setValue(String.valueOf(byte2short(valueList)));
                }
                else if (plcParameterInfo.getAddressLength()==14) {
                } else if (plcParameterInfo.getAddressLength() == 14) {
                    plcParameterInfo.setValue((byteToHexString(valueList)));
                }

                else
                {
                } else {
                    String valuestr = new String(valueList);
                    plcParameterInfo.setValue(valuestr);
                }
            }
        }
    }

     /**
     * short类型转byte[]
     * 
@@ -180,6 +171,7 @@
        }
        return b;
   }

     /**
     * byte[]类型转short
     * 
@@ -199,7 +191,6 @@
        String str = new String(bytes, StandardCharsets.UTF_8);
        return str;
    }



}