From 09c4b134bf8b8221635a06bd7ee3064c759b7dcf Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 24 三月 2023 12:57:06 +0800
Subject: [PATCH] 提升机代码部分

---
 src/main/java/com/zy/core/ServerBootstrap.java |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 5054657..024304c 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,10 +3,7 @@
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
-import com.zy.core.model.DevpSlave;
-import com.zy.core.model.LedSlave;
-import com.zy.core.model.SteSlave;
+import com.zy.core.model.*;
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.thread.*;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +30,7 @@
     @PostConstruct
     @Async
     public void init() throws InterruptedException {
-        log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
         Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
@@ -41,7 +38,7 @@
         initThread();
         // 寮�濮嬩富娴佺▼杩涚▼
         mainProcess.start();
-        log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
+        News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
     private void initMq(){
@@ -73,46 +70,64 @@
         for (Slave ste : slaveProperties.getSte()) {
             MessageQueue.init(SlaveType.Ste, ste);
         }
+        // 鍒濆鍖栧洓鍚戠┛姊溅mq
+        for (Slave shuttle : slaveProperties.getShuttle()) {
+            MessageQueue.init(SlaveType.Shuttle, shuttle);
+        }
     }
 
     private void initThread(){
         // 鍒濆鍖栧爢鍨涙満绾跨▼
-        log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+        News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
         for (CrnSlave crn : slaveProperties.getCrn()) {
             CrnThread crnThread = new SiemensCrnThread(crn);
             new Thread((Runnable) crnThread).start();
             SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
         }
         // 鍒濆鍖栫┛姊溅绾跨▼
-        log.info("鍒濆鍖栫┛姊溅绾跨▼...................................................");
+        News.info("鍒濆鍖栫┛姊溅绾跨▼...................................................");
         for (SteSlave ste : slaveProperties.getSte()) {
             SteThread steThread = new SteThread(ste);
             new Thread(steThread).start();
             SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
         }
         // 鍒濆鍖栬緭閫佺嚎绾跨▼
-        log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+        News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
         for (DevpSlave devp : slaveProperties.getDevp()) {
             DevpThread devpThread = new SiemensDevpThread(devp);
             new Thread((Runnable) devpThread).start();
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
+        // 鍒濆鍖栨彁鍗囨満
+        News.info("鍒濆鍖栨彁鍗囨満........................................................");
+        for (LiftSlave liftSlave : slaveProperties.getLift()) {
+            LiftThread liftThread = new LiftThread(liftSlave);
+            new Thread(liftThread).start();
+            SlaveConnection.put(SlaveType.Lift, liftSlave.getId(), liftThread);
+        }
+        // 鍒濆鍖栧洓鍚戠┛姊溅
+        News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
+        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
+            ShuttleThread shuttleThread = new ShuttleThread(shuttleSlave);
+            new Thread(shuttleThread).start();
+            SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
+        }
         // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-        log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+        News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
         for (Slave barcode : slaveProperties.getBarcode()) {
             BarcodeThread barcodeThread = new BarcodeThread(barcode);
             new Thread(barcodeThread).start();
             SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
         }
         // 鍒濆鍖朙ED绾跨▼
-        log.info("鍒濆鍖朙ED绾跨▼...................................................");
+        News.info("鍒濆鍖朙ED绾跨▼...................................................");
         for (LedSlave led : slaveProperties.getLed()) {
             LedThread ledThread = new LedThread(led);
             new Thread(ledThread).start();
             SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
         }
         // 鍒濆鍖栫绉ょ嚎绋�
-//        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+//        News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
 //        for (Slave scale : slaveProperties.getScale()) {
 //            ScaleThread barcodeThread = new ScaleThread(scale);
 //            new Thread(barcodeThread).start();

--
Gitblit v1.9.1