From 2aaf47ead1a69ccbaf6a0167ae161aafd3622114 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 08:14:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 96 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index c5c91c0..9cf6d99 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,17 +1,17 @@
package com.zy.core;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.DeviceConfigService;
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.LfdZyForkLiftMasterThread;
-import com.zy.core.thread.impl.LfdZyForkLiftSlaveThread;
-import com.zy.core.thread.impl.NyShuttleThread;
-import com.zy.core.thread.impl.ZyForkLiftThread;
+import com.zy.core.thread.impl.ZySiemensCrnThread;
+import com.zy.core.thread.impl.ZyStationThread;
+import com.zy.core.thread.impl.ZyRgvThread;
+
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -19,6 +19,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import java.util.List;
/**
* Created by vincent on 2020/8/4
@@ -28,12 +29,11 @@
public class ServerBootstrap {
@Autowired
- private SlaveProperties slaveProperties;
- @Autowired
private MainProcess mainProcess;
@Autowired
private RedisUtil redisUtil;
-
+ @Autowired
+ private DeviceConfigService deviceConfigService;
@PostConstruct
@Async
@@ -50,60 +50,84 @@
}
private void initMq(){
- // 鍒濆鍖栬揣鍙夋彁鍗囨満mq
- for (Slave forkLift : slaveProperties.getForkLift()) {
- MessageQueue.init(SlaveType.ForkLift, forkLift);
+ // 鍒濆鍖栧爢鍨涙満mq
+ List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Crn)));
+ for (DeviceConfig crn : crnList) {
+ MessageQueue.init(SlaveType.Crn, crn.getDeviceNo());
}
- // 鍒濆鍖栧洓鍚戠┛姊溅mq
- for (Slave shuttle : slaveProperties.getShuttle()) {
- MessageQueue.init(SlaveType.Shuttle, shuttle);
+ // 鍒濆鍖朢gv灏忚溅mq
+ List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<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>()
+ .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>()
+ .eq("device_type", String.valueOf(SlaveType.Barcode)));
+ for (DeviceConfig barcode : barcodeList) {
+ MessageQueue.init(SlaveType.Barcode, barcode.getDeviceNo());
+ }
+ // 鍒濆鍖朙ed鐏痬q
+ List<DeviceConfig> ledList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Led)));
+ for (DeviceConfig led : ledList) {
+ MessageQueue.init(SlaveType.Led, led.getDeviceNo());
}
}
private void initThread(){
- // 鍒濆鍖栬揣鍙夋彁鍗囨満
- for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLift()) {
- News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
+ News.info("鍒濆鍖栧爢鍨涙満........................................................");
+ List<DeviceConfig> crnList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Crn)));
+ for (DeviceConfig deviceConfig : crnList) {
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());
+ if (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
+ thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
new Thread(thread).start();
- SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.Crn, deviceConfig.getDeviceNo(), thread);
}
- // 鍒濆鍖栬揣鍙夋彁鍗囨満
- for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLiftMaster()) {
- News.info("鍒濆鍖栬揣鍙夋彁鍗囨満Master........................................................");
+ News.info("鍒濆鍖栬緭閫佺珯........................................................");
+ List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Devp)));
+ for (DeviceConfig deviceConfig : devpList) {
ThreadHandler thread = null;
- if (forkLiftSlave.getThreadImpl().equals("LfdZyForkLiftMasterThread")) {
- thread = new LfdZyForkLiftMasterThread(forkLiftSlave, redisUtil);
+ if (deviceConfig.getThreadImpl().equals("ZyStationThread")) {
+ thread = new ZyStationThread(deviceConfig, redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
new Thread(thread).start();
- SlaveConnection.put(SlaveType.ForkLiftMaster, forkLiftSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.Devp, deviceConfig.getDeviceNo(), thread);
}
- // 鍒濆鍖栧洓鍚戠┛姊溅
- for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
- News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
+ News.info("鍒濆鍖朢GV........................................................");
+ List<DeviceConfig> rgvList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Rgv)));
+ for (DeviceConfig deviceConfig : rgvList) {
ThreadHandler thread = null;
- if (shuttleSlave.getThreadImpl().equals("NyShuttleThread")) {
- thread = new NyShuttleThread(shuttleSlave, redisUtil);
+ if (deviceConfig.getThreadImpl().equals("ZyRgvThread")) {
+ thread = new ZyRgvThread(deviceConfig, redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.Rgv, deviceConfig.getDeviceNo(), thread);
}
+
}
--
Gitblit v1.9.1