From 6daf900a09adcca981f620744bf89851654d88e0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 05 八月 2025 09:58:08 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 003d514..723e418 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -8,14 +8,20 @@
 import com.zy.asrs.service.BasLiftService;
 import com.zy.asrs.service.DeviceConfigService;
 import com.zy.common.utils.RedisUtil;
+import com.zy.core.action.ShuttleAction;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
+import com.zy.core.task.ShuttleExecuteScheduler;
+import com.zy.core.thread.TrafficControlThread;
+import com.zy.core.thread.impl.NyLiftThread;
 import com.zy.core.thread.impl.NyShuttleThread;
+import com.zy.core.thread.impl.TrafficControlImplThread;
 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;
 
@@ -31,12 +37,17 @@
 @Component
 public class ServerBootstrap {
 
+    @Value("${deviceExecuteConfig.threadControlCount}")
+    private int threadControlCount;
+
     @Autowired
     private MainProcess mainProcess;
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
     private DeviceConfigService deviceConfigService;
+    @Autowired
+    private ShuttleAction shuttleAction;
     @Autowired
     private DeviceMsgUtils deviceMsgUtils;
     @Autowired
@@ -61,14 +72,22 @@
         List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                 .eq("device_type", String.valueOf(SlaveType.ForkLift)));
         for (DeviceConfig forkLift : forkLiftList) {
-            MessageQueue.init(SlaveType.ForkLift, forkLift);
+            MessageQueue.init(SlaveType.ForkLift, forkLift.getDeviceNo());
+        }
+        // 鍒濆鍖栨彁鍗囨満mq
+        List<DeviceConfig> liftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Lift)));
+        for (DeviceConfig lift : liftList) {
+            MessageQueue.init(SlaveType.Lift, lift.getDeviceNo());
         }
         // 鍒濆鍖栧洓鍚戠┛姊溅mq
         List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                 .eq("device_type", String.valueOf(SlaveType.Shuttle)));
         for (DeviceConfig shuttle : shuttleList) {
-            MessageQueue.init(SlaveType.Shuttle, shuttle);
+            MessageQueue.init(SlaveType.Shuttle, shuttle.getDeviceNo());
         }
+
+        MessageQueue.init(SlaveType.TrafficControl, 1);
     }
 
     private void initThread(){
@@ -94,6 +113,33 @@
 
             new Thread(thread).start();
             SlaveConnection.put(SlaveType.ForkLift, deviceConfig.getDeviceNo(), thread);
+
+            if (deviceConfig.getFake() == 1) {
+                fakeDevices.add(deviceConfig);
+            }else {
+                allDevices.add(deviceConfig);
+            }
+        }
+
+        // 鍒濆鍖栨彁鍗囨満
+        News.info("鍒濆鍖栨彁鍗囨満........................................................");
+        List<DeviceConfig> liftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.Lift)));
+        for (DeviceConfig deviceConfig : liftList) {
+            BasLift basLift = basLiftService.selectOne(new EntityWrapper<BasLift>().eq("lift_no", deviceConfig.getDeviceNo()));
+            if (basLift == null) {
+                throw new CoolException("鏈厤缃彁鍗囨満鏁版嵁");
+            }
+
+            ThreadHandler thread = null;
+            if (deviceConfig.getThreadImpl().equals("NyLiftThread")) {
+                thread = new NyLiftThread(deviceConfig, basLift.getPoint$(), basLift.getStationList$(), redisUtil);
+            } else {
+                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            new Thread(thread).start();
+            SlaveConnection.put(SlaveType.Lift, deviceConfig.getDeviceNo(), thread);
 
             if (deviceConfig.getFake() == 1) {
                 fakeDevices.add(deviceConfig);
@@ -128,6 +174,13 @@
         //璁惧鍒濆鍖栧畬姣�
         deviceMsgUtils.sendDeviceConfig(JSON.toJSONString(allDevices));
         deviceMsgUtils.sendFakeDeviceConfig(JSON.toJSONString(fakeDevices));
+
+        TrafficControlThread trafficControlThread = new TrafficControlImplThread(redisUtil);
+        new Thread(trafficControlThread).start();
+        SlaveConnection.put(SlaveType.TrafficControl, 1, trafficControlThread);
+
+        ShuttleExecuteScheduler shuttleExecuteScheduler = new ShuttleExecuteScheduler(shuttleAction, deviceConfigService, redisUtil, threadControlCount);
+        new Thread(shuttleExecuteScheduler).start();
     }
 
 

--
Gitblit v1.9.1