From 150a2e9b867995ce118940655c8e0fafe2b4e1b9 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 10 四月 2025 18:28:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 5420fbd..44b5464 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -8,8 +8,7 @@
 import com.zy.core.model.*;
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.thread.*;
-import com.zy.core.thread.impl.NyShuttleThread;
-import com.zy.core.thread.impl.ZyForkLiftThread;
+import com.zy.core.thread.impl.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -52,6 +51,10 @@
         for (Slave forkLift : slaveProperties.getForkLift()) {
             MessageQueue.init(SlaveType.ForkLift, forkLift);
         }
+        // 鍒濆鍖栨彁鍗囨満mq
+        for (Slave forkLift : slaveProperties.getForkLift()) {
+            MessageQueue.init(SlaveType.Lift, forkLift);
+        }
         // 鍒濆鍖栧洓鍚戠┛姊溅mq
         for (Slave shuttle : slaveProperties.getShuttle()) {
             MessageQueue.init(SlaveType.Shuttle, shuttle);
@@ -60,11 +63,13 @@
 
     private void initThread(){
         // 鍒濆鍖栬揣鍙夋彁鍗囨満
-        News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
         for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLift()) {
+            News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
             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());
             } else {
                 throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
             }
@@ -73,9 +78,37 @@
             SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), thread);
         }
 
+        // 鍒濆鍖栬揣鍙夋彁鍗囨満
+        for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLiftMaster()) {
+            News.info("鍒濆鍖栬揣鍙夋彁鍗囨満Master........................................................");
+            ThreadHandler thread = null;
+            if (forkLiftSlave.getThreadImpl().equals("LfdZyForkLiftMasterThread")) {
+                thread = new LfdZyForkLiftMasterThread(forkLiftSlave, redisUtil);
+            } else {
+                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            new Thread(thread).start();
+            SlaveConnection.put(SlaveType.ForkLiftMaster, forkLiftSlave.getId(), thread);
+        }
+
+        // 鍒濆鍖栨彁鍗囨満
+        for (LiftSlave slave : slaveProperties.getLift()) {
+            News.info("鍒濆鍖栨彁鍗囨満........................................................");
+            ThreadHandler thread = null;
+            if (slave.getThreadImpl().equals("NyLiftThread")) {
+                thread = new NyLiftThread(slave, redisUtil);
+            } else {
+                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            new Thread(thread).start();
+            SlaveConnection.put(SlaveType.Lift, slave.getId(), thread);
+        }
+
         // 鍒濆鍖栧洓鍚戠┛姊溅
-        News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
         for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
+            News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
             ThreadHandler thread = null;
             if (shuttleSlave.getThreadImpl().equals("NyShuttleThread")) {
                 thread = new NyShuttleThread(shuttleSlave, redisUtil);

--
Gitblit v1.9.1