From ce511a3d55e5f349b1647172e562c1659bbc8172 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 09 一月 2026 15:27:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 117 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index bab666b..3aaf637 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,21 +1,27 @@
package com.zy.core;
+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.FakeNyLiftThread;
+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.NyLiftThread;
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
@@ -24,12 +30,16 @@
@Component
public class ServerBootstrap {
- @Autowired
- private SlaveProperties slaveProperties;
- @Autowired
- private MainProcess mainProcess;
+ @Value("${deviceMsgConfig.gatewayPort}")
+ private int gatewayPort;
+ @Value("${deviceMsgConfig.enableFakeDeviceThread}")
+ private boolean enableFakeDeviceThread;
+ @Value("${deviceMsgConfig.enableFake}")
+ private boolean enableFake;
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private DeviceMsgUtils deviceMsgUtils;
@PostConstruct
@@ -39,38 +49,51 @@
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()) {
- ZyForkLiftThread forkLiftThread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
- new Thread(forkLiftThread).start();
- SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), forkLiftThread);
+ 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.Lift))) {
+ initLiftThread(device);
+ } else if (device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
+ initShuttleThread(device);
+ }
}
- // 鍒濆鍖栧洓鍚戠┛姊溅
- News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
- for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
- NyShuttleThread shuttleThread = new NyShuttleThread(shuttleSlave,redisUtil);
- new Thread(shuttleThread).start();
- SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
+ }
+
+ private void initFakeThread(){
+ if (enableFake) {
+ ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort, enableFake, enableFakeDeviceThread);
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.FakeThread, 1, thread);
+
+ ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
+ new Thread(thread2).start();
+ SlaveConnection.put(SlaveType.FakeThread, 2, thread2);
+
+ ThreadHandler thread3 = new FakeNyLiftThread(redisUtil);
+ new Thread(thread3).start();
+ SlaveConnection.put(SlaveType.FakeThread, 3, thread3);
}
}
@@ -79,5 +102,41 @@
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 initLiftThread(DeviceConfig deviceConfig) {
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("NyLiftThread")) {
+ thread = new NyLiftThread(deviceConfig, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Lift, 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