Junjie
昨天 a4f07b2a0ddb6c210e05afbbb491feeb466203e7
src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,6 +1,6 @@
package com.zy.core;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.service.DeviceConfigService;
@@ -8,11 +8,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.thread.impl.ZySiemensCrnThread;
import com.zy.core.thread.impl.ZySiemensDualCrnThread;
import com.zy.core.thread.impl.ZyStationThread;
import com.zy.core.thread.impl.ZyStationV3Thread;
import com.zy.core.thread.impl.ZyRgvThread;
import com.zy.core.thread.impl.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,37 +45,37 @@
    private void initMq(){
        // 初始化堆垛机mq
        List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Crn)));
        for (DeviceConfig crn : crnList) {
            MessageQueue.init(SlaveType.Crn, crn.getDeviceNo());
        }
        // 初始化双工位堆垛机mq
        List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.DualCrn)));
        for (DeviceConfig crn : dualCrnList) {
            MessageQueue.init(SlaveType.DualCrn, crn.getDeviceNo());
        }
        // 初始化Rgv小车mq
        List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Rgv)));
        for (DeviceConfig rgv : rgvList) {
            MessageQueue.init(SlaveType.Rgv, rgv.getDeviceNo());
        }
        // 初始化输送线mq
        List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Devp)));
        for (DeviceConfig devp : devpList) {
            MessageQueue.init(SlaveType.Devp, devp.getDeviceNo());
        }
        // 初始化条码扫描仪mq
        List<DeviceConfig> barcodeList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> barcodeList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Barcode)));
        for (DeviceConfig barcode : barcodeList) {
            MessageQueue.init(SlaveType.Barcode, barcode.getDeviceNo());
        }
        // 初始化Led灯mq
        List<DeviceConfig> ledList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> ledList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Led)));
        for (DeviceConfig led : ledList) {
            MessageQueue.init(SlaveType.Led, led.getDeviceNo());
@@ -87,7 +83,7 @@
    }
    private void initThread(){
        List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> crnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Crn)));
        if(!crnList.isEmpty()) {
            News.info("初始化堆垛机........................................................");
@@ -95,6 +91,8 @@
                ThreadHandler thread = null;
                if (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
                    thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
                } else if (deviceConfig.getThreadImpl().equals("ZySiemensCrnV2Thread")) {
                    thread = new ZySiemensCrnV2Thread(deviceConfig, redisUtil);
                } else {
                    throw new CoolException("未知的线程实现");
                }
@@ -107,7 +105,7 @@
            }
        }
        List<DeviceConfig> dualCrnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> dualCrnList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.DualCrn)));
        if(!dualCrnList.isEmpty()) {
            News.info("初始化双工位堆垛机........................................................");
@@ -127,7 +125,7 @@
            }
        }
        List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Devp)));
        if(!devpList.isEmpty()) {
            News.info("初始化输送站........................................................");
@@ -137,6 +135,8 @@
                    thread = new ZyStationThread(deviceConfig, redisUtil);
                } else if (deviceConfig.getThreadImpl().equals("ZyStationV3Thread")) {
                    thread = new ZyStationV3Thread(deviceConfig, redisUtil);
                } else if (deviceConfig.getThreadImpl().equals("ZyStationV4Thread")) {
                    thread = new ZyStationV4Thread(deviceConfig, redisUtil);
                } else {
                    throw new CoolException("未知的线程实现");
                }
@@ -149,7 +149,7 @@
            }
        }
        List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
        List<DeviceConfig> rgvList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Rgv)));
        if(!rgvList.isEmpty()) {
            News.info("初始化RGV........................................................");