From 61694606d640cac824c36ee5bca709b6cc0ecb10 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 十一月 2020 16:44:49 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index ac5207a..48f02da 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,11 +5,9 @@
 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.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -76,8 +74,18 @@
         // 鍒濆鍖栧爢鍨涙満绾跨▼
         log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
         for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new CrnThread(crn);
-            new Thread(crnThread).start();
+            CrnThread crnThread = null;
+            switch (crn.getId()) {
+                case 1:
+                    crnThread = new SiemensCrnThread(crn);
+                    break;
+                case 2:
+                    crnThread = new MelsecCrnThread(crn);
+                    break;
+                default:
+                    break;
+            }
+            new Thread((Runnable) crnThread).start();
             SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
         }
 
@@ -97,12 +105,12 @@
             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("鍒濆鍖朙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