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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index ecf3f0a..3aaf637 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -6,8 +6,11 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
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.utils.DeviceMsgUtils;
import lombok.extern.slf4j.Slf4j;
@@ -29,6 +32,10 @@
@Value("${deviceMsgConfig.gatewayPort}")
private int gatewayPort;
+ @Value("${deviceMsgConfig.enableFakeDeviceThread}")
+ private boolean enableFakeDeviceThread;
+ @Value("${deviceMsgConfig.enableFake}")
+ private boolean enableFake;
@Autowired
private RedisUtil redisUtil;
@Autowired
@@ -66,6 +73,8 @@
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);
}
@@ -73,8 +82,19 @@
}
private void initFakeThread(){
- ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort);
- new Thread(thread).start();
+ 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);
+ }
}
@@ -94,6 +114,18 @@
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")) {
--
Gitblit v1.9.1