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

---
 src/main/java/com/zy/core/ServerBootstrap.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index bab666b..44b5464 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,5 +1,6 @@
 package com.zy.core;
 
+import com.core.exception.CoolException;
 import com.zy.common.utils.RedisUtil;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.SlaveConnection;
@@ -7,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;
@@ -51,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);
@@ -59,18 +63,61 @@
 
     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);
+            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("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            new Thread(thread).start();
+            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()) {
-            NyShuttleThread shuttleThread = new NyShuttleThread(shuttleSlave,redisUtil);
-            new Thread(shuttleThread).start();
-            SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
+            News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
+            ThreadHandler thread = null;
+            if (shuttleSlave.getThreadImpl().equals("NyShuttleThread")) {
+                thread = new NyShuttleThread(shuttleSlave, redisUtil);
+            } else {
+                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            new Thread(thread).start();
+            SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), thread);
         }
     }
 

--
Gitblit v1.9.1