理片笼逻辑和界面更改

wu

2023-12-04 a93a3f1532d33849187dcd1a372c315ec4511e04

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

@@ -1,11 +1,15 @@
package com.example.springboot.component;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;

import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import com.github.xingshuangs.iot.protocol.s7.service.MultiAddressWrite;
import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
import com.google.common.primitives.Bytes;

public class S7control {

@@ -78,35 +82,7 @@
     * @param address 地址
     * @param datas   word的值
     */
    public void WriteWord(List<String> address, List<Short> datas) {
        if (s7PLC == null)
            return;

        for (int i = 0; i < address.size(); i++) {
            String addr = address.get(i);
            short data = datas.get(i);

            if (addr.contains("-")) {
                // 处理范围地址
                String[] range = addr.split("-");
                if (range.length == 2) {
                    String startAddr = range[0].trim();
                    String endAddr = range[1].trim();

                    int startIndex = Integer.parseInt(startAddr.substring(startAddr.indexOf('.') + 1));
                    int endIndex = Integer.parseInt(endAddr.substring(endAddr.indexOf('.') + 1));

                    for (int j = startIndex; j <= endIndex; j++) {
                        String currentAddress = startAddr.substring(0, startAddr.indexOf('.') + 1) + j;
                        s7PLC.writeInt16(currentAddress, data); // 将数据写入当前地址
                    }
                }
            } else {
                // 处理单个地址
                s7PLC.writeInt16(addr, data); // 将数据写入单个地址
            }
        }
    }



@@ -184,43 +160,7 @@
        return s7PLC.readInt16(address);
    }

    public List<Short> readWords(List<String> addresses) {
        if (s7PLC == null) {
            return null;
        }

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

        for (String address : addresses) {
            if (address.contains("-")) {
                String[] range = address.split("-");
                String startAddress = range[0];
                String endAddress = range[1];

                if (startAddress.equals(endAddress)) {
                    // 单个地址
                    Short value = s7PLC.readInt16(startAddress);
                    data.add(value);
                } else {
                    // 范围地址
                    int startIndex = getIndexFromAddress(startAddress);
                    int endIndex = getIndexFromAddress(endAddress);

                    for (int i = startIndex; i <= endIndex; i++) {
                        String currentAddress = getAddressFromIndex(i);
                        Short value = s7PLC.readInt16(currentAddress);
                        data.add(value);
                    }
                }
            } else {
                // 单个地址
                Short value = s7PLC.readInt16(address);
                data.add(value);
            }
        }

        return data;
    }

    private int getIndexFromAddress(String address) {

@@ -258,7 +198,6 @@
    public byte[] ReadByte(String address, int count) {
        if (s7PLC==null)
             return null;

       // List<String> addresslist = GetAddressList(address, count, 16);
        return s7PLC.readByte(address,count);
    }
@@ -276,28 +215,33 @@
    }

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

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

        return values;
    }


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

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

        for (String address : addressList) {
            if (address.contains("~")) {
                String[] range = address.split("~");
                String startAddress = range[0];
                String endAddress = range[1];
            byte[] bytes = s7PLC.readByte(address, 14);

                int startIndex = extractAddressNumber(startAddress);
                int endIndex = extractAddressNumber(endAddress);

                String prefix = startAddress.substring(0, startAddress.indexOf(".") + 1);

                for (int i = startIndex; i <= endIndex; i++) {
                    String newAddress = prefix + i;
                    result.add(s7PLC.readBoolean(newAddress));
                }
            } else {
                result.add(s7PLC.readBoolean(address));
            if (bytes != null) {
                String str = new String(bytes, StandardCharsets.US_ASCII);
                result.add(str);
            }
        }

@@ -305,6 +249,55 @@
    }


    public void WriteWord(List<String> address, List<Short> datas) {
        if (s7PLC == null)
            return;

        for (int i = 0; i < address.size(); i++) {
            String addr = address.get(i);
            short data = datas.get(i);

            if (addr.contains("-")) {
                outmesid(String.valueOf(data),addr); // 单独处理带破折号的地址
            } else {
                s7PLC.writeInt16(addr, data); // 将数据写入单个地址
            }
        }
    }

    public void outmesid(String data, String addr) {
        System.out.println("outmesid: " + data);
        List<Byte> glassidlist = new ArrayList<>();
        String[] parts = addr.split("-");
        if (parts.length == 2) {
            addr = parts[0]; // 只保留 "-" 前面的部分
        }
        for (char iditem : data.toCharArray()) {
            glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
        }
        byte[] bytes = Bytes.toArray(glassidlist);
        S7control.getinstance().WriteByte(addr, bytes);
    }


    public List<Short> readWords(List<String> addresses) {
        if (s7PLC == null) {
            return null;
        }

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

        for (String address : addresses) {

            // 单个地址
            Short value = s7PLC.readInt16(address);
            data.add(value);

        }

        return data;
    }

    private int extractAddressNumber(String address) {
        String numberStr = address.replaceAll("\\D+", ""); // 使用正则表达式提取数字部分
        return Integer.parseInt(numberStr);