From c88db5e02d675f2a877ec484dd39ad5baab0d0b8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 12 九月 2020 14:58:47 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 85435f6..ac5207a 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,12 +5,11 @@
 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.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 com.zy.core.thread.LedThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -34,8 +33,9 @@
 
     @PostConstruct
     @Async
-    public void init(){
+    public void init() throws InterruptedException {
         log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
@@ -89,20 +89,20 @@
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
 
-//        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-//        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 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()) {

--
Gitblit v1.9.1