From 470962be1cfdbf75b734ab8f78e28a7b23a06964 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期三, 07 九月 2022 17:55:25 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 9e5e95d..32447ef 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -28,7 +28,10 @@
     @Autowired
     private MainProcess mainProcess;
 
-
+    /**
+     * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+     * @throws InterruptedException
+     */
     @PostConstruct
     @Async
     public void init() throws InterruptedException {
@@ -52,22 +55,22 @@
         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);
-        }
+//        // 鍒濆鍖栨潯鐮佹壂鎻忎华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
-        for (Slave car : slaveProperties.getCar()) {
-            MessageQueue.init(SlaveType.Car, car);
-        }
+//        // 鍒濆鍖栧彴杞q
+//        for (Slave car : slaveProperties.getCar()) {
+//            MessageQueue.init(SlaveType.Car, car);
+//        }
     }
 
     private void initThread(){
@@ -78,7 +81,6 @@
             new Thread((Runnable) crnThread).start();
             SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
         }
-
         // 鍒濆鍖栬緭閫佺嚎绾跨▼
         log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
         for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -86,20 +88,26 @@
             new Thread((Runnable) devpThread).start();
             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 scale : slaveProperties.getScale()) {
+            ScaleThread scaleThread = new ScaleThread(scale);
+            new Thread(scaleThread).start();
+            SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
         }
     }
 

--
Gitblit v1.9.1