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

ZengTao

2024-04-23 9057d8571f11a552a326fa35fda9b5ec614f5c58

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

@@ -3,6 +3,7 @@
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.sql.Time;
import java.util.ArrayList;
import java.util.List;

@@ -36,13 +37,21 @@
        }
        return instance;
    }

    
    /**
     * 关闭西门子s7通讯连接
     */
    public void CloseS7client() {
        if (s7PLC == null)
            s7PLC.close();
            s7PLC.checkConnected();
    }

    /**
     * s7通讯连接状态
     */
    public boolean CheckConnected() {
        return s7PLC.checkConnected();
    }

    /**
@@ -156,10 +165,17 @@
     * @return 结果
     */
    public List<Short> ReadWord(List<String> address) {
        if (s7PLC==null)
              return null;
        return s7PLC.readInt16(address);
        if (s7PLC == null)
            return null;

        try {
            return s7PLC.readInt16(address);
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());
            return null;
        }
    }




@@ -183,12 +199,19 @@
     * @return 结果
     */
    public List<Short> ReadWord(String address, int count) {
        if (s7PLC==null)
             return null;
        if (s7PLC == null)
            return null;

        List<String> addresslist = GetAddressList(address, count, 16);
        return s7PLC.readInt16(addresslist);
        try {
            return s7PLC.readInt16(addresslist);
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());

            return null;
        }
    }

    /**
     * 按指定的地址 读取byte结果集
     * 
@@ -200,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;
        }

    }

    /**
@@ -214,56 +245,86 @@
             return null;
        return s7PLC.readBoolean(addresslist);
    }

    public List<Boolean> readBits(List<String> addressList) {
        if (s7PLC == null || addressList.isEmpty()) {
            return null;
        }

        List<Boolean> values = new ArrayList<>();
        for (String address : addressList) {
            boolean value = s7PLC.readBoolean(address);
            values.add(value);
        }

        return values;
//读取不连续地址bit
public List<Boolean> readBits(List<String> addressList) {
    if (s7PLC == null || addressList.isEmpty()) {
        return null;
    }

    List<Boolean> values = new ArrayList<>();
    for (String address : addressList) {
        try {
            boolean value = s7PLC.readBoolean(address);
            values.add(value);
        } catch (Exception e) {
            // 处理异常
            System.out.println("读取 " + address + " 失败：" + e.getMessage());
        }
    }

    public List<String> readStrings(List<String> addressList) {
    return values;
}


//读取String
public List<String> readStrings(List<String> addressList) {
    if (s7PLC == null) {
        return null;
    }
    List<String> result = new ArrayList<>();
    for (String address : addressList) {
        try {
            byte[] bytes = s7PLC.readByte(address, 14);
            if (bytes != null) {
                String str = new String(bytes, StandardCharsets.UTF_8);
                result.add(str);
            }
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());
            result.add(null);
        }
    }

    return result;
}





    public List<String> readStringsandword(List<String> addressList) {
        if (s7PLC == null) {
            return null;
        }

        List<String> result = new ArrayList<>();

        for (String address : addressList) {
            byte[] bytes = s7PLC.readByte(address, 14);
//            System.out.println(bytes.toString());
          if (bytes != null) {
            String str = new String(bytes, StandardCharsets.UTF_8);
//          System.out.println(str);
//              if(str == null ){
//                   str = "";
//              }
                result.add(str);
            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);
            }
//            if ( bytes.toString().contains("@")) {
//                String str = "";
//
//                result.add(str);
//            }else{
//
//                String str = new String(bytes, StandardCharsets.US_ASCII);
//                result.add(str);
//            }
//            System.out.println(bytes.toString());
        }

        return result;
    }



//不连续地址写入Word
    public void WriteWord(List<String> address, List<Short> datas) {
        if (s7PLC == null)
            return;
@@ -279,7 +340,10 @@
            }
        }
    }

    
    
    
//字符串写入
    public void outmesid(String data, String addr) {
//        System.out.println("outmesid: " + data);
        List<Byte> glassidlist = new ArrayList<>();
@@ -294,7 +358,7 @@
        S7control.getinstance().WriteByte(addr, bytes);
    }


//读取不连续word
    public List<Short> readWords(List<String> addresses) {
        if (s7PLC == null) {
            return null;
@@ -303,15 +367,44 @@
        List<Short> data = new ArrayList<>();

        for (String address : addresses) {
            try {

            // 单个地址
            Short value = s7PLC.readInt16(address);
            data.add(value);
                // 单个地址
                Short value = s7PLC.readInt16(address);
                data.add(value);
            } catch (Exception e) {
                System.out.println("读取 " + address + " 失败：" + e.getMessage());

            }

        }

        return data;
    }

//读取时间
public Long readtime(String address) {
    if (s7PLC == null)
        return null;
    try {
        return s7PLC.readTime(address);
    } catch (Exception e) {
        System.out.println("读取 " + address + " 失败：" + e.getMessage());
        return null;
    }
}


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


        s7PLC.writeTime(address, datas); // 将数据写入单个地址
    }





    private int extractAddressNumber(String address) {
        String numberStr = address.replaceAll("\\D+", ""); // 使用正则表达式提取数字部分
@@ -327,11 +420,19 @@
     * @return Boolean结果
     */
    public List<Boolean> ReadBits(String address, int count) {
        if (s7PLC==null)
        if (s7PLC == null)
            return null;
        List<String> addresslist = GetAddressList(address, count, 1);
        return s7PLC.readBoolean(addresslist);
    }
        try {
            return s7PLC.readBoolean(addresslist);
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());
            return null;
        }

    };
    
    

    private List<String> GetAddressList(String address, int count, int addedbit) {
        List<String> addresslist = new ArrayList<String>();
@@ -344,6 +445,7 @@
        if (stringdatas.length == 2) {
            dbwindex = Integer.parseInt(stringdatas[1]);
        } else if (stringdatas.length == 3) {
            dbwindex = Integer.parseInt(stringdatas[1]);
            bitindex = Integer.parseInt(stringdatas[2]);
        } else
            return null;