#

Junjie

2025-04-27 e377f0ffba61c38f4f171d99e9ab6c3591f1d1b7

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -9,21 +9,17 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.CommandInfoLog;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.service.*;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CommandStatusType;
import com.zy.core.enums.IoModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.Cycle;
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -48,12 +44,11 @@
    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
    private short heartBeatVal = 1;
    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
        add(100);add(101);add(102);add(103);add(104);
        add(105);add(106);add(107);add(108);add(109);
        add(110);add(111);add(112);add(113);add(114);
        add(115);add(116);add(117);add(118);add(119);
        add(120);add(121);add(122);add(123);add(124);
        add(125);add(1001);add(1002);add(1003);add(1004);
        add(101);add(102);add(103);add(104);
        add(105);add(106);add(107);add(108);
        add(201);add(202);add(203);add(204);add(205);
        add(206);add(207);add(208);add(209);add(210);
        add(211);add(212);
    }};
    /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
        add(200);add(201);add(202);add(203);
@@ -132,7 +127,7 @@
                        break;
                    // 写数据 ID+目标站
                    case 4:
                        writeAgvOk((StaProtocol)task.getData());
                        writeCycle((StaProtocol)task.getData());
                        read();
                        break;
                   /* case 3:
@@ -544,6 +539,57 @@
        handleWriteFailure(staProtocol, writeFlag);
    }

    private void writeCycle(StaProtocol staProtocol) throws InterruptedException {
        if (staProtocol == null) {
            return;
        }

        ArrayList<Integer> staNos = getStaNo();
        int index = staNos.indexOf(staProtocol.getSiteId());

        if (index == -1) {
            log.error("站点编号 {} 不在已知列表中，无法写入任务！", staProtocol.getSiteId());
            return;
        }

        int writeCount = 0; // 任务下发尝试次数
        boolean writeFlag = false; // 任务下发成功标记
        String plcAddressWorkNo = "";
        String plcAddressStaNo = "" ;
        switch (staProtocol.getSiteId()){
            case 105:
                plcAddressWorkNo = "DB73." + 0;
                plcAddressStaNo = "DB73." + 4;
                break;
            case 106:
                plcAddressWorkNo = "DB73." + 6;
                plcAddressStaNo = "DB73." + (6 + 4);
                break;
            case 108:
                plcAddressWorkNo = "DB73." + 2 * 6;
                plcAddressStaNo = "DB73." + (2 * 6 + 4);
                break;
            case 110:
                plcAddressWorkNo = "DB73." + 3 * 6;
                plcAddressStaNo = "DB73." + (3 * 6 + 4);
                break;
            case 112:
                plcAddressWorkNo = "DB73." + 4 * 6;
                plcAddressStaNo = "DB73." + (4 * 6 + 4);
                break;
        }


        // **写入新任务**
        if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
            writeFlag = true;
            log.info("输送线命令写入成功，PLC编号={}，站点数据={}，尝试次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
        }

        // **写入失败处理**
        handleWriteFailure(staProtocol, writeFlag);
    }

    /**
     * 清零 PLC 数据并验证清零是否成功
     */
@@ -569,8 +615,9 @@
     * 写入新任务到 PLC 并验证是否成功
     */
    private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, StaProtocol staProtocol) throws InterruptedException {
        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());
        OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, staProtocol.getStaNo());

        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());

        if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
            Thread.sleep(200); // 等待 PLC 识别新值
@@ -584,6 +631,22 @@
        return false;
    }

    private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, Cycle cycle) throws InterruptedException {
        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, cycle.getWorkNo().intValue());
        OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, cycle.getStaNo());

        if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
            Thread.sleep(200); // 等待 PLC 识别新值
            OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
            if (readResult.IsSuccess) {
                int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
                short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
                return workNo == cycle.getWorkNo().intValue() && staNo == cycle.getStaNo();
            }
        }
        return false;
    }

    /**
     * 处理写入失败的情况
     */