From 7ec503a70d25e089cc008192898d9da3219d2a6b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 十一月 2025 16:38:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 138 ++++++++++++++++++++-------------------------
1 files changed, 62 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index ba0b431..7779d8e 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,12 +1,16 @@
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.ZySiemensCrnThread;
+import com.zy.core.thread.impl.ZyStationThread;
+
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -14,6 +18,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import java.util.List;
/**
* Created by vincent on 2020/8/4
@@ -23,12 +28,11 @@
public class ServerBootstrap {
@Autowired
- private SlaveProperties slaveProperties;
- @Autowired
private MainProcess mainProcess;
@Autowired
private RedisUtil redisUtil;
-
+ @Autowired
+ private DeviceConfigService deviceConfigService;
@PostConstruct
@Async
@@ -45,87 +49,69 @@
}
private void initMq(){
- // 鍒濆鍖栬緭閫佺嚎mq
- for (Slave devp : slaveProperties.getDevp()) {
- MessageQueue.init(SlaveType.Devp, devp);
+ // 鍒濆鍖栧爢鍨涙満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());
}
- for (Slave devp2 : slaveProperties.getDevp2()) {
- MessageQueue.init(SlaveType.Devp2, devp2);
+ // 鍒濆鍖朢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
- for (Slave barcode : slaveProperties.getBarcode()) {
- MessageQueue.init(SlaveType.Barcode, barcode);
+ 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
- for (Slave led : slaveProperties.getLed()) {
- MessageQueue.init(SlaveType.Led, led);
- }
- // 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
- }
- // 鍒濆鍖栧彴杞q
- for (Slave car : slaveProperties.getCar()) {
- MessageQueue.init(SlaveType.Car, car);
- }
- // 鍒濆鍖栨彁鍗囨満mq
- for (Slave lift : slaveProperties.getLift()) {
- MessageQueue.init(SlaveType.Lift, lift);
- }
- // 鍒濆鍖栧洓鍚戠┛姊溅mq
- for (Slave shuttle : slaveProperties.getShuttle()) {
- MessageQueue.init(SlaveType.Shuttle, shuttle);
+ 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(){
- // 鍒濆鍖栬緭閫佺嚎绾跨▼
- News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new SiemensDevpThread(devp);
- new Thread((Runnable) devpThread).start();
- SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+ 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 (deviceConfig.getThreadImpl().equals("ZySiemensCrnThread")) {
+ thread = new ZySiemensCrnThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Crn, deviceConfig.getDeviceNo(), thread);
}
- for (Devp2Slave devp2 : slaveProperties.getDevp2()) {
- SiemensDevpThread2 siemensDevpThread2 = new SiemensDevpThread2(devp2);
- new Thread(siemensDevpThread2).start();
- SlaveConnection.put(SlaveType.Devp2, devp2.getId(), siemensDevpThread2);
+
+ 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 (deviceConfig.getThreadImpl().equals("ZyStationThread")) {
+ thread = new ZyStationThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Devp, deviceConfig.getDeviceNo(), 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);
- }
- // 鍒濆鍖栧洓鍚戠┛姊溅
- 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("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
- for (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = new BarcodeThread(barcode);
- new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
- }
- // 鍒濆鍖朙ED绾跨▼
- News.info("鍒濆鍖朙ED绾跨▼...................................................");
- for (LedSlave led : slaveProperties.getLed()) {
- LedThread ledThread = new LedThread(led);
- new Thread(ledThread).start();
- SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
- }
- // 鍒濆鍖栫绉ょ嚎绋�
-// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-// for (Slave scale : slaveProperties.getScale()) {
-// ScaleThread barcodeThread = new ScaleThread(scale);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
-// }
+
}
--
Gitblit v1.9.1