Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs

zhangc

2025-04-22 0641b66a7724bda815e667feeb832e2f755d18cb

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

@@ -1,12 +1,13 @@
package com.zy.core;

import com.core.exception.CoolException;
import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.*;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
import com.zy.core.thread.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -44,88 +45,103 @@
        News.info("核心控制层已启动...............................................");
    }

    private void initMq(){
        // 初始化输送线mq
        for (Slave devp : slaveProperties.getDevp()) {
            MessageQueue.init(SlaveType.Devp, devp);
        }
        for (Slave devp2 : slaveProperties.getDevp2()) {
            MessageQueue.init(SlaveType.Devp2, devp2);
        }
        // 初始化条码扫描仪mq
        for (Slave barcode : slaveProperties.getBarcode()) {
            MessageQueue.init(SlaveType.Barcode, barcode);
        }
        // 初始化Led灯mq
        for (Slave led : slaveProperties.getLed()) {
            MessageQueue.init(SlaveType.Led, led);
        }
        // 初始化磅称mq
        for (Slave scale : slaveProperties.getScale()) {
            MessageQueue.init(SlaveType.Scale, scale);
        }
        // 初始化台车mq
        for (Slave car : slaveProperties.getCar()) {
            MessageQueue.init(SlaveType.Car, car);
    private void initMq() {
        // 初始化货叉提升机mq
        for (Slave forkLift : slaveProperties.getForkLift()) {
            MessageQueue.init(SlaveType.ForkLift, forkLift);
        }
        // 初始化提升机mq
        for (Slave lift : slaveProperties.getLift()) {
            MessageQueue.init(SlaveType.Lift, lift);
        for (Slave forkLift : slaveProperties.getForkLift()) {
            MessageQueue.init(SlaveType.Lift, forkLift);
        }
        // 初始化四向穿梭车mq
        for (Slave shuttle : slaveProperties.getShuttle()) {
            MessageQueue.init(SlaveType.Shuttle, shuttle);
        }
        // 初始化输送线mq
        for (Slave devp : slaveProperties.getDevp()) {
            MessageQueue.init(SlaveType.Devp, devp);
        }
    }

    private void initThread(){
        // 初始化输送线线程
        News.info("初始化输送线线程...................................................");
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = new SiemensDevpThread(devp);
            new Thread((Runnable) devpThread).start();
            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
    private void initThread() {
        // 初始化货叉提升机
        for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLift()) {
            News.info("初始化货叉提升机........................................................");
            ThreadHandler thread = null;
            if (forkLiftSlave.getThreadImpl().equals("ZyForkLiftThread")) {
                thread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
            } else if (forkLiftSlave.getThreadImpl().equals("LfdZyForkLiftSlaveThread")) {
                thread = new LfdZyForkLiftSlaveThread(forkLiftSlave, redisUtil, forkLiftSlave.getMasterId());
            } else {
                throw new CoolException("未知的线程实现");
            }

            new Thread(thread).start();
            SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), thread);
        }
        for (Devp2Slave devp2 : slaveProperties.getDevp2()) {
            SiemensDevpThread2 siemensDevpThread2 = new SiemensDevpThread2(devp2);
            new Thread(siemensDevpThread2).start();
            SlaveConnection.put(SlaveType.Devp2, devp2.getId(), siemensDevpThread2);

        // 初始化货叉提升机
        for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLiftMaster()) {
            News.info("初始化货叉提升机Master........................................................");
            ThreadHandler thread = null;
            if (forkLiftSlave.getThreadImpl().equals("LfdZyForkLiftMasterThread")) {
                thread = new LfdZyForkLiftMasterThread(forkLiftSlave, redisUtil);
            } else {
                throw new CoolException("未知的线程实现");
            }

            new Thread(thread).start();
            SlaveConnection.put(SlaveType.ForkLiftMaster, forkLiftSlave.getId(), thread);
        }

        // 初始化提升机
        News.info("初始化提升机........................................................");
        for (LiftSlave liftSlave : slaveProperties.getLift()) {
            LiftThread liftThread = new LiftThread(liftSlave, redisUtil);
            new Thread(liftThread).start();
            SlaveConnection.put(SlaveType.Lift, liftSlave.getId(), liftThread);
        for (LiftSlave slave : slaveProperties.getLift()) {
            News.info("初始化提升机........................................................");
            ThreadHandler thread = null;
            if (slave.getThreadImpl().equals("NyLiftThread")) {
                thread = new NyLiftThread(slave, redisUtil);
            } else {
                throw new CoolException("未知的线程实现");
            }

            new Thread(thread).start();
            SlaveConnection.put(SlaveType.Lift, slave.getId(), thread);
        }

        // 初始化四向穿梭车
        News.info("初始化四向穿梭车......................................................");
        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
            NyShuttleThread shuttleThread = new NyShuttleThread(shuttleSlave,redisUtil);
            new Thread(shuttleThread).start();
            SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
            News.info("初始化四向穿梭车......................................................");
            ThreadHandler thread = null;
            if (shuttleSlave.getThreadImpl().equals("NyShuttleThread")) {
                thread = new NyShuttleThread(shuttleSlave, redisUtil);
            } else {
                throw new CoolException("未知的线程实现");
            }

            new Thread(thread).start();
            SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), thread);
        }
        // 初始化条码扫描仪线程
        News.info("初始化条码扫描仪线程...................................................");
        for (Slave barcode : slaveProperties.getBarcode()) {
            BarcodeThread barcodeThread = new BarcodeThread(barcode);
            new Thread(barcodeThread).start();
            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
        // 初始化输送线
        for (DevpSlave devpSlave : slaveProperties.getDevp()) {
            News.info("初始化输送线......................................................");
            ThreadHandler thread = null;
            if (devpSlave.getThreadImpl().equals("FyDevpThread")) {
                thread = new FyDevpThread(devpSlave);
            } else {
                throw new CoolException("未知的线程实现");
            }
            new Thread(thread).start();
            SlaveConnection.put(SlaveType.Devp, devpSlave.getId(), thread);
        }
        // 初始化LED线程
        News.info("初始化LED线程...................................................");
        for (LedSlave led : slaveProperties.getLed()) {
            LedThread ledThread = new LedThread(led);
            new Thread(ledThread).start();
            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);

        // 初始化电视机
        for (LedSlave ledSlave : slaveProperties.getLed()) {
            News.info("初始化电视机......................................................");
            ThreadHandler thread = new NormalLedThread(ledSlave);
            new Thread(thread).start();
            SlaveConnection.put(SlaveType.Led, ledSlave.getId(), thread);
        }
        // 初始化磅秤线程
//        News.info("初始化磅秤线程...................................................");
//        for (Slave scale : slaveProperties.getScale()) {
//            ScaleThread barcodeThread = new ScaleThread(scale);
//            new Thread(barcodeThread).start();
//            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
//        }
    }