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

wang

2024-05-09 93e36c526fe445c14d5fb19f3653f8a8e55e3a6c

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java

@@ -252,7 +252,7 @@
    }


    //读取String
    //读取StringList
    public List<String> readStrings(List<String> addressList) {
        if (s7PLC == null) {
            return null;
@@ -272,6 +272,19 @@
        }

        return result;
    }

    //读取字符串
    public String readString(String address) {
        if (s7PLC == null) {
            return null;
        }
        try {
            return s7PLC.readString(address);
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());
            return null;
        }
    }


@@ -314,12 +327,10 @@
        if (s7PLC == null) {
            return null;
        }

        List<Short> data = new ArrayList<>();

        for (String address : addresses) {
            try {

                // 单个地址
                Short value = s7PLC.readInt16(address);
                data.add(value);
@@ -332,6 +343,21 @@
        return data;
    }

    //读取单个word
    public Short readWord(String address) {
        if (s7PLC == null) {
            return null;
        }
        try {
            // 单个地址
            return s7PLC.readInt16(address);
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());

        }
        return -1;
    }

    //读取时间
    public Long readtime(String address) {
        if (s7PLC == null) {