From 83449fef571c247a2d73194b8063638349d0076a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 20 十一月 2023 10:04:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 739b86c..b419fc6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -49,6 +49,9 @@
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
}
+ for (Slave devp2 : slaveProperties.getDevp2()) {
+ MessageQueue.init(SlaveType.Devp2, devp2);
+ }
// 鍒濆鍖栨潯鐮佹壂鎻忎华mq
for (Slave barcode : slaveProperties.getBarcode()) {
MessageQueue.init(SlaveType.Barcode, barcode);
@@ -79,15 +82,14 @@
// 鍒濆鍖栬緭閫佺嚎绾跨▼
News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
- if (devp.getId() == 1) {
- DevpThread devpThread = new SiemensDevpThread(devp);
- new Thread((Runnable) devpThread).start();
- SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
- }else {
-// DevpThread devpThread = new SiemensDevpThread2(devp);
-// new Thread((Runnable) devpThread).start();
-// SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
- }
+ DevpThread devpThread = new SiemensDevpThread(devp);
+ new Thread((Runnable) devpThread).start();
+ SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+ }
+ for (Devp2Slave devp2 : slaveProperties.getDevp2()) {
+ SiemensDevpThread2 siemensDevpThread2 = new SiemensDevpThread2(devp2);
+ new Thread(siemensDevpThread2).start();
+ SlaveConnection.put(SlaveType.Devp2, devp2.getId(), siemensDevpThread2);
}
// 鍒濆鍖栨彁鍗囨満
News.info("鍒濆鍖栨彁鍗囨満........................................................");
@@ -107,7 +109,9 @@
News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = new BarcodeThread(barcode);
- new Thread(barcodeThread).start();
+ if (barcode.getId() >= 11) {
+ new Thread(barcodeThread).start();
+ }
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
}
// 鍒濆鍖朙ED绾跨▼
--
Gitblit v1.9.1