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

ZengTao

2024-04-23 6f271cc93b7992ae4613ac2fe2dad81c34630296

 springboot-vue3/src/main/java/com/example/springboot/component/S7control.java

@@ -223,7 +223,15 @@
        if (s7PLC==null)
             return null;
       // List<String> addresslist = GetAddressList(address, count, 16);
        return s7PLC.readByte(address,count);

        try {
            return s7PLC.readByte(address, count);
        }catch (Exception e) {
            // 处理异常
            System.out.println("读取 " + address + " 失败：" + e.getMessage());
            return null;
        }

    }

    /**
@@ -279,6 +287,41 @@

    return result;
}





    public List<String> readStringsandword(List<String> addressList) {
        if (s7PLC == null) {
            return null;
        }
        List<String> result = new ArrayList<>();
        for (String address : addressList) {
            try {
                if (address.contains("-")) {
                    address = address.substring(0, address.indexOf("-"));

                    byte[] bytes = s7PLC.readByte(address, 14);
                    if (bytes != null) {
                        String str = new String(bytes, StandardCharsets.UTF_8);
                        result.add(str);
                    }

                } else {
                    Short value = s7PLC.readInt16(address);
                    result.add(value.toString());

                }
            } catch (Exception e) {
                System.out.println("读取 " + address + " 失败：" + e.getMessage());
                result.add(null);
            }
        }

        return result;
    }



//不连续地址写入Word
@@ -345,7 +388,7 @@
    try {
        return s7PLC.readTime(address);
    } catch (Exception e) {
        e.printStackTrace();
        System.out.println("读取 " + address + " 失败：" + e.getMessage());
        return null;
    }
}