From b17e2a3f2bd85d18630cb447d65368e430c887f8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 24 九月 2020 10:08:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index e995d30..ac5207a 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -6,6 +6,8 @@
 import com.zy.core.model.CrnSlave;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.CarThread;
 import com.zy.core.thread.CrnThread;
 import com.zy.core.thread.DevpThread;
 import lombok.extern.slf4j.Slf4j;
@@ -31,8 +33,9 @@
 
     @PostConstruct
     @Async
-    public void init(){
+    public void init() throws InterruptedException {
         log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
@@ -63,6 +66,10 @@
         for (Slave scale : slaveProperties.getScale()) {
             MessageQueue.init(SlaveType.Scale, scale);
         }
+        // 鍒濆鍖栧彴杞q
+        for (Slave car : slaveProperties.getCar()) {
+            MessageQueue.init(SlaveType.Car, car);
+        }
     }
 
     private void initThread(){
@@ -82,12 +89,27 @@
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
 
-//        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-//        for (Slave barcode : slaveProperties.getBarcode()) {
-//            BarcodeThread barcodeThread = new BarcodeThread(barcode);
-//            new Thread(barcodeThread).start();
-//            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+        log.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绾跨▼...................................................");
+//        for (LedSlave led : slaveProperties.getLed()) {
+//            LedThread ledThread = new LedThread(led);
+//            new Thread(ledThread).start();
+//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
 //        }
+        // 鍒濆鍖栧彴杞︾嚎绋�
+        log.info("鍒濆鍖栧彴杞︾嚎绋�...................................................");
+        for (Slave car : slaveProperties.getCar()) {
+            CarThread carThread = new CarThread(car);
+            new Thread(carThread).start();
+            SlaveConnection.put(SlaveType.Car, car.getId(), carThread);
+        }
     }
 
 

--
Gitblit v1.9.1