Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wc...

luxiaotao1123

2020-09-08 28a7821e43bd5763739fe67384cfea6693b3500b

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

@@ -3,12 +3,16 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
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.BarcodeThread;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import com.zy.core.thread.LedThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
@@ -28,13 +32,16 @@


    @PostConstruct
    @Async
    public void init(){
        log.info("核心控制层开始初始化...............................................");
        // 初始化消息队列
        initMq();
        // 初始化下位机线程
        initThread();
        // 开始主流程进程
        mainProcess.start();
        log.info("核心控制层已启动...............................................");
    }

    private void initMq(){
@@ -62,25 +69,35 @@

    private void initThread(){
        // 初始化堆垛机线程
        for (Slave crn : slaveProperties.getCrn()) {
        log.info("初始化堆垛机线程...................................................");
        for (CrnSlave crn : slaveProperties.getCrn()) {
            CrnThread crnThread = new CrnThread(crn);
            new Thread(crnThread).start();
            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
        }

        // 初始化输送线线程
        for (Slave devp : slaveProperties.getDevp()) {
        log.info("初始化输送线线程...................................................");
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = new DevpThread(devp);
            new Thread(devpThread).start();
            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
        }

        // 初始化条码扫描仪线程
        for (Slave barcode : slaveProperties.getBarcode()) {
            BarcodeThread barcodeThread = new BarcodeThread(barcode);
            new Thread(barcodeThread).start();
            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
//        // 初始化条码扫描仪线程
//        for (Slave barcode : slaveProperties.getBarcode()) {
//            BarcodeThread barcodeThread = new BarcodeThread(barcode);
//            new Thread(barcodeThread).start();
//            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);
        }

    }