From 7a1a67b71ef5f86c2fb629c1a10b04cf3cbbd2a4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 02 十一月 2022 09:14:14 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 26d14a9..5054657 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -6,6 +6,7 @@
 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.properties.SlaveProperties;
 import com.zy.core.thread.*;
 import lombok.extern.slf4j.Slf4j;
@@ -68,6 +69,10 @@
         for (Slave car : slaveProperties.getCar()) {
             MessageQueue.init(SlaveType.Car, car);
         }
+        // 鍒濆鍖栫┛姊溅mq
+        for (Slave ste : slaveProperties.getSte()) {
+            MessageQueue.init(SlaveType.Ste, ste);
+        }
     }
 
     private void initThread(){
@@ -77,6 +82,13 @@
             CrnThread crnThread = new SiemensCrnThread(crn);
             new Thread((Runnable) crnThread).start();
             SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+        }
+        // 鍒濆鍖栫┛姊溅绾跨▼
+        log.info("鍒濆鍖栫┛姊溅绾跨▼...................................................");
+        for (SteSlave ste : slaveProperties.getSte()) {
+            SteThread steThread = new SteThread(ste);
+            new Thread(steThread).start();
+            SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
         }
         // 鍒濆鍖栬緭閫佺嚎绾跨▼
         log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
@@ -100,12 +112,12 @@
             SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
         }
         // 鍒濆鍖栫绉ょ嚎绋�
-        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-        for (Slave scale : slaveProperties.getScale()) {
-            ScaleThread barcodeThread = new ScaleThread(scale);
-            new Thread(barcodeThread).start();
-            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
-        }
+//        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+//        for (Slave scale : slaveProperties.getScale()) {
+//            ScaleThread barcodeThread = new ScaleThread(scale);
+//            new Thread(barcodeThread).start();
+//            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
+//        }
     }
 
 

--
Gitblit v1.9.1