From fd5d26ae0d1dbf71f90b99ef84d09a34e2d10d83 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 一月 2025 10:45:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   48 +++++++++++++++---------------------------------
 1 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 665d92d..5f00670 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -7,6 +7,8 @@
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -45,10 +47,6 @@
     }
 
     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);
@@ -69,13 +67,9 @@
         for (Slave car : slaveProperties.getCar()) {
             MessageQueue.init(SlaveType.Car, car);
         }
-        // 鍒濆鍖栫┛姊溅mq
-        for (Slave ste : slaveProperties.getSte()) {
-            MessageQueue.init(SlaveType.Ste, ste);
-        }
-        // 鍒濆鍖栨彁鍗囨満mq
-        for (Slave lift : slaveProperties.getLift()) {
-            MessageQueue.init(SlaveType.Lift, lift);
+        // 鍒濆鍖栬揣鍙夋彁鍗囨満mq
+        for (Slave forkLift : slaveProperties.getForkLift()) {
+            MessageQueue.init(SlaveType.ForkLift, forkLift);
         }
         // 鍒濆鍖栧洓鍚戠┛姊溅mq
         for (Slave shuttle : slaveProperties.getShuttle()) {
@@ -84,20 +78,6 @@
     }
 
     private void initThread(){
-        // 鍒濆鍖栧爢鍨涙満绾跨▼
-        News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
-        for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new SiemensCrnThread(crn);
-            new Thread((Runnable) crnThread).start();
-            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
-        }
-        // 鍒濆鍖栫┛姊溅绾跨▼
-        News.info("鍒濆鍖栫┛姊溅绾跨▼...................................................");
-        for (SteSlave ste : slaveProperties.getSte()) {
-            SteThread steThread = new SteThread(ste);
-            new Thread(steThread).start();
-            SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
-        }
         // 鍒濆鍖栬緭閫佺嚎绾跨▼
         News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
         for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -105,17 +85,17 @@
             new Thread((Runnable) devpThread).start();
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
-        // 鍒濆鍖栨彁鍗囨満
-        News.info("鍒濆鍖栨彁鍗囨満........................................................");
-        for (LiftSlave liftSlave : slaveProperties.getLift()) {
-            LiftThread liftThread = new LiftThread(liftSlave, redisUtil);
-            new Thread(liftThread).start();
-            SlaveConnection.put(SlaveType.Lift, liftSlave.getId(), liftThread);
+        // 鍒濆鍖栬揣鍙夋彁鍗囨満
+        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("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
         for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
-            ShuttleThread shuttleThread = new ShuttleThread(shuttleSlave,redisUtil);
+            NyShuttleThread shuttleThread = new NyShuttleThread(shuttleSlave,redisUtil);
             new Thread(shuttleThread).start();
             SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
         }
@@ -123,7 +103,9 @@
         News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
         for (Slave barcode : slaveProperties.getBarcode()) {
             BarcodeThread barcodeThread = new BarcodeThread(barcode);
-            new Thread(barcodeThread).start();
+            if (barcode.getId() >= 11) {
+                new Thread(barcodeThread).start();
+            }
             SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
         }
         // 鍒濆鍖朙ED绾跨▼

--
Gitblit v1.9.1