From fbc1ee007b2cbf95d33b6950fc95c0b4a34027d6 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 10 七月 2025 15:54:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |  103 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 6ecf80a..9c9ebd6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,17 +1,25 @@
 package com.zy.core;
 
+import com.zy.common.exception.CoolException;
+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.properties.SlaveProperties;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.properties.DeviceConfig;
+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.NyShuttleThread;
+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;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
+import java.util.List;
 
 /**
  * Created by vincent on 2020/8/4
@@ -20,56 +28,57 @@
 @Component
 public class ServerBootstrap {
 
+    @Value("${deviceMsgConfig.gatewayPort}")
+    private int gatewayPort;
     @Autowired
-    private SlaveProperties slaveProperties;
+    private RedisUtil redisUtil;
+    @Autowired
+    private DeviceMsgUtils deviceMsgUtils;
 
 
     @PostConstruct
-    public void init(){
+    @Async
+    public void init() throws InterruptedException {
+        News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
+        // 鍒濆鍖栬櫄鎷熻澶囩嚎绋�
+        initFakeThread();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
         initThread();
+        News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
     private void initMq(){
-        // 鍒濆鍖栧爢鍨涙満mq
-        for (Slave crn : slaveProperties.getCrn()) {
-            MessageQueue.init(SlaveType.Crn, crn);
-        }
-        // 鍒濆鍖栬緭閫佺嚎mq
-        for (Slave devp : slaveProperties.getDevp()) {
-            MessageQueue.init(SlaveType.Devp, devp);
-        }
-        // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-        for (Slave barcode : slaveProperties.getBarcode()) {
-            MessageQueue.init(SlaveType.Barcode, barcode);
-        }
-        // 鍒濆鍖朙ed鐏痬q
-        for (Slave led : slaveProperties.getLed()) {
-            MessageQueue.init(SlaveType.Led, led);
-        }
-        // 鍒濆鍖栫绉癿q
-        for (Slave scale : slaveProperties.getScale()) {
-            MessageQueue.init(SlaveType.Scale, scale);
+        // 鍒濆鍖栬澶噈q
+        List<DeviceConfig> deviceConfigs = deviceMsgUtils.getDeviceConfig();
+        for (DeviceConfig device : deviceConfigs) {
+            SlaveType type = SlaveType.findInstance(device.getDeviceType());
+            if(null == type){
+                continue;
+            }
+            MessageQueue.init(type, device.getDeviceNo());
         }
     }
 
     private void initThread(){
-        // 鍒濆鍖栧爢鍨涙満绾跨▼
-        for (Slave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new CrnThread(crn);
-            new Thread(crnThread).start();
-            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+        List<DeviceConfig> deviceConfigs = deviceMsgUtils.getDeviceConfig();
+        for (DeviceConfig device : deviceConfigs) {
+            if (device.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
+                initForkLiftThread(device);
+            } else if (device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
+                initShuttleThread(device);
+            }
         }
+    }
 
-        // 鍒濆鍖栫珯鐐圭嚎绋�
-        for (Slave devp : slaveProperties.getDevp()) {
-            DevpThread devpThread = new DevpThread(devp);
-            new Thread(devpThread).start();
-            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
-        }
+    private void initFakeThread(){
+        ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort);
+        new Thread(thread).start();
 
+        ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
+        new Thread(thread2).start();
     }
 
 
@@ -77,5 +86,29 @@
     public void destroy() {
     }
 
+    private void initForkLiftThread(DeviceConfig deviceConfig) {
+        ThreadHandler thread = null;
+        if (deviceConfig.getThreadImpl().equals("LfdZyForkLiftMasterThread")) {
+            thread = new LfdZyForkLiftMasterThread(deviceConfig, redisUtil);
+        } else {
+            throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+        }
+
+        new Thread(thread).start();
+        SlaveConnection.put(SlaveType.ForkLiftMaster, deviceConfig.getDeviceNo(), thread);
+    }
+
+    private void initShuttleThread(DeviceConfig deviceConfig) {
+        ThreadHandler thread = null;
+        if (deviceConfig.getThreadImpl().equals("NyShuttleThread")) {
+            thread = new NyShuttleThread(deviceConfig, redisUtil);
+        } else {
+            throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+        }
+
+        new Thread(thread).start();
+        SlaveConnection.put(SlaveType.Shuttle, deviceConfig.getDeviceNo(), thread);
+    }
+
 
 }

--
Gitblit v1.9.1