##

luxiaotao1123

2020-12-30 9fd40b787bdd4e0caaed213d1931d9c7fb8f846c

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -5,6 +5,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
@@ -91,8 +92,18 @@
        // 初始化输送线线程
        log.info("初始化输送线线程...................................................");
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = new DevpThread(devp);
            new Thread(devpThread).start();
            DevpThread devpThread = null;
            switch (devp.getId()) {
                case 1:
                    devpThread = new SiemensDevpThread(devp);
                    break;
                case 2:
                    devpThread = new MelsecDevpThread(devp);
                    break;
                default:
                    break;
            }
            new Thread((Runnable) devpThread).start();
            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
        }

@@ -104,12 +115,12 @@
            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
        }
        // 初始化LED线程
//        log.info("初始化LED线程...................................................");
//        for (LedSlave led : slaveProperties.getLed()) {
//            LedThread ledThread = new LedThread(led);
//            new Thread(ledThread).start();
//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
//        }
        log.info("初始化LED线程...................................................");
        for (LedSlave led : slaveProperties.getLed()) {
            LedThread ledThread = new LedThread(led);
            new Thread(ledThread).start();
            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
        }
        // 初始化台车线程
        log.info("初始化台车线程...................................................");
        for (Slave car : slaveProperties.getCar()) {