From 9fd40b787bdd4e0caaed213d1931d9c7fb8f846c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十二月 2020 09:46:33 +0800
Subject: [PATCH] ##
---
src/main/java/com/zy/core/ServerBootstrap.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 85bb881..49d53e2 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.SiemensCrnThread;
-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;
@@ -81,6 +79,9 @@
case 1:
crnThread = new SiemensCrnThread(crn);
break;
+ case 2:
+ crnThread = new MelsecCrnThread(crn);
+ break;
default:
break;
}
@@ -91,8 +92,18 @@
// 鍒濆鍖栬緭閫佺嚎绾跨▼
log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new DevpThread(devp);
- new Thread(devpThread).start();
+ DevpThread devpThread = null;
+ switch (devp.getId()) {
+ case 1:
+ devpThread = new SiemensDevpThread(devp);
+ break;
+ case 2:
+ devpThread = new MelsecDevpThread(devp);
+ break;
+ default:
+ break;
+ }
+ new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
@@ -104,12 +115,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