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

wuyouming666

2023-12-25 c49dc2f40279bcc360948cea68dec69cf213b85f

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

@@ -215,7 +215,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;
        }

    }

    /**
@@ -331,11 +339,17 @@
    }

//读取时间
    public Long readtime(String address) {
        if (s7PLC==null)
            return null;
public Long readtime(String address) {
    if (s7PLC == null)
        return null;
    try {
        return s7PLC.readTime(address);
    } catch (Exception e) {
        e.printStackTrace();
        return null;
    }
}


    public void writetime(String address, long datas) {
        if (s7PLC == null)