From fbc1ee007b2cbf95d33b6950fc95c0b4a34027d6 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 10 七月 2025 15:54:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 99 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 5420fbd..9c9ebd6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,22 +1,25 @@
package com.zy.core;
-import com.core.exception.CoolException;
+import com.zy.common.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.properties.DeviceConfig;
+import com.zy.core.thread.fake.FakeNyShuttleThread;
+import com.zy.core.thread.fake.FakeZyForkLiftThread;
+import com.zy.core.thread.impl.LfdZyForkLiftMasterThread;
import com.zy.core.thread.impl.NyShuttleThread;
-import com.zy.core.thread.impl.ZyForkLiftThread;
+import com.zy.core.utils.DeviceMsgUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import java.util.List;
/**
* Created by vincent on 2020/8/4
@@ -25,12 +28,12 @@
@Component
public class ServerBootstrap {
- @Autowired
- private SlaveProperties slaveProperties;
- @Autowired
- private MainProcess mainProcess;
+ @Value("${deviceMsgConfig.gatewayPort}")
+ private int gatewayPort;
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private DeviceMsgUtils deviceMsgUtils;
@PostConstruct
@@ -40,52 +43,42 @@
Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
+ // 鍒濆鍖栬櫄鎷熻澶囩嚎绋�
+ initFakeThread();
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
- // 寮�濮嬩富娴佺▼杩涚▼
- mainProcess.start();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
private void initMq(){
- // 鍒濆鍖栬揣鍙夋彁鍗囨満mq
- for (Slave forkLift : slaveProperties.getForkLift()) {
- MessageQueue.init(SlaveType.ForkLift, forkLift);
- }
- // 鍒濆鍖栧洓鍚戠┛姊溅mq
- for (Slave shuttle : slaveProperties.getShuttle()) {
- MessageQueue.init(SlaveType.Shuttle, shuttle);
+ // 鍒濆鍖栬澶噈q
+ List<DeviceConfig> deviceConfigs = deviceMsgUtils.getDeviceConfig();
+ for (DeviceConfig device : deviceConfigs) {
+ SlaveType type = SlaveType.findInstance(device.getDeviceType());
+ if(null == type){
+ continue;
+ }
+ MessageQueue.init(type, device.getDeviceNo());
}
}
private void initThread(){
- // 鍒濆鍖栬揣鍙夋彁鍗囨満
- News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
- for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLift()) {
- ThreadHandler thread = null;
- if (forkLiftSlave.getThreadImpl().equals("ZyForkLiftThread")) {
- thread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
- } else {
- throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ List<DeviceConfig> deviceConfigs = deviceMsgUtils.getDeviceConfig();
+ for (DeviceConfig device : deviceConfigs) {
+ if (device.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
+ initForkLiftThread(device);
+ } else if (device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
+ initShuttleThread(device);
}
-
- new Thread(thread).start();
- SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), thread);
}
+ }
- // 鍒濆鍖栧洓鍚戠┛姊溅
- News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
- for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
- ThreadHandler thread = null;
- if (shuttleSlave.getThreadImpl().equals("NyShuttleThread")) {
- thread = new NyShuttleThread(shuttleSlave, redisUtil);
- } else {
- throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
- }
+ private void initFakeThread(){
+ ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort);
+ new Thread(thread).start();
- new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), thread);
- }
+ ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
+ new Thread(thread2).start();
}
@@ -93,5 +86,29 @@
public void destroy() {
}
+ private void initForkLiftThread(DeviceConfig deviceConfig) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("LfdZyForkLiftMasterThread")) {
+ thread = new LfdZyForkLiftMasterThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.ForkLiftMaster, deviceConfig.getDeviceNo(), thread);
+ }
+
+ private void initShuttleThread(DeviceConfig deviceConfig) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("NyShuttleThread")) {
+ thread = new NyShuttleThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Shuttle, deviceConfig.getDeviceNo(), thread);
+ }
+
}
--
Gitblit v1.9.1