#盘点逻辑修改

Junjie

2023-11-30 32b4da424d646d1753f91208d12f22edceb75192

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

@@ -16,6 +16,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Devp2Slave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
@@ -37,7 +38,7 @@
@Slf4j
public class SiemensDevpThread2 implements Runnable, DevpThread {

    private DevpSlave slave;
    private Devp2Slave slave;
    private SiemensS7Net siemensS7Net;
    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
    private short heartBeatVal = 1;
@@ -49,7 +50,7 @@
        add(348);add(349);
    }};

    public SiemensDevpThread2(DevpSlave slave) {
    public SiemensDevpThread2(Devp2Slave slave) {
        this.slave = slave;
    }

@@ -60,7 +61,7 @@
        while (true) {
            try {
                int step = 1;
                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
                Task task = MessageQueue.poll(SlaveType.Devp2, slave.getId());
                if (task != null) {
                    step = task.getStep();
                }
@@ -69,11 +70,11 @@
                    case 1:
                        read();
                        break;
                    // 写数据 ID+目标站
                    case 2:
                        write((StaProtocol) task.getData());
                        read();
                        break;
//                    // 写数据 ID+目标站
//                    case 2:
//                        write((StaProtocol) task.getData());
//                        read();
//                        break;
                    default:
                        break;
                }