From c0d2dc7614b173e0ea4c78c6f899ab732542127a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 13 七月 2025 19:54:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   63 +++++++++++++++----------------
 1 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index c67e150..003d514 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,13 +3,16 @@
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasLift;
 import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.service.BasLiftService;
 import com.zy.asrs.service.DeviceConfigService;
 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.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;
@@ -36,6 +39,8 @@
     private DeviceConfigService deviceConfigService;
     @Autowired
     private DeviceMsgUtils deviceMsgUtils;
+    @Autowired
+    private BasLiftService basLiftService;
 
     @PostConstruct
     @Async
@@ -70,44 +75,38 @@
         List<DeviceConfig> allDevices = new ArrayList<>();
         List<DeviceConfig> fakeDevices = new ArrayList<>();
 
-//        // 鍒濆鍖栬揣鍙夋彁鍗囨満
-//        List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
-//                .eq("device_type", String.valueOf(SlaveType.ForkLift)));
-//        allDevices.addAll(forkLiftList);
-//        for (DeviceConfig deviceConfig : forkLiftList) {
-//            News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
-//            ThreadHandler thread = null;
-//            if (deviceConfig.getThreadImpl().equals("ZyForkLiftThread")) {
-//                thread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
-//            } else if (deviceConfig.getThreadImpl().equals("LfdZyForkLiftSlaveThread")) {
-//                thread = new LfdZyForkLiftSlaveThread(forkLiftSlave, redisUtil, forkLiftSlave.getMasterId());
-//            } else {
-//                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
-//            }
-//
-//            new Thread(thread).start();
-//            SlaveConnection.put(SlaveType.ForkLift, deviceConfig.getDeviceNo(), thread);
-//        }
+        // 鍒濆鍖栬揣鍙夋彁鍗囨満
+        News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
+        List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+                .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+        for (DeviceConfig deviceConfig : forkLiftList) {
+            BasLift basLift = basLiftService.selectOne(new EntityWrapper<BasLift>().eq("lift_no", deviceConfig.getDeviceNo()));
+            if (basLift == null) {
+                throw new CoolException("鏈厤缃揣鍙夋彁鍗囨満鏁版嵁");
+            }
 
-//        // 鍒濆鍖栬揣鍙夋彁鍗囨満
-//        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);
-//        }
+            ThreadHandler thread = null;
+            if (deviceConfig.getThreadImpl().equals("ZyForkLiftThread")) {
+                thread = new ZyForkLiftThread(deviceConfig, basLift.getStationList$(), redisUtil);
+            } else {
+                throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+            }
+
+            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> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                 .eq("device_type", String.valueOf(SlaveType.Shuttle)));
         for (DeviceConfig deviceConfig : shuttleList) {
-            News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
             ThreadHandler thread = null;
             if (deviceConfig.getThreadImpl().equals("NyShuttleThread")) {
                 thread = new NyShuttleThread(deviceConfig, redisUtil);

--
Gitblit v1.9.1