From f96a2246074ec51d0930836390fa6e3433141d28 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 22 八月 2022 15:17:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 9e5e95d..7ce7369 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,17 +69,27 @@
for (Slave car : slaveProperties.getCar()) {
MessageQueue.init(SlaveType.Car, car);
}
+ // 鍒濆鍖栫┛姊溅mq
+ for (Slave ste : slaveProperties.getSte()) {
+ MessageQueue.init(SlaveType.Ste, ste);
+ }
}
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
+ CrnThread crnThread = new MelsecCrnThread(crn);
new Thread((Runnable) crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
-
+ // 鍒濆鍖栫┛姊溅绾跨▼
+ log.info("鍒濆鍖栫┛姊溅绾跨▼...................................................");
+ for (SteSlave crn : slaveProperties.getSte()) {
+ SteThread steThread = new SteThread(crn);
+ new Thread((Runnable) steThread).start();
+ SlaveConnection.put(SlaveType.Ste, crn.getId(), steThread);
+ }
// 鍒濆鍖栬緭閫佺嚎绾跨▼
log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -86,7 +97,6 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
-
// 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
@@ -101,6 +111,13 @@
new Thread(ledThread).start();
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);
+// }
}
--
Gitblit v1.9.1