From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/core/ServerBootstrap.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 2b4d6c3..f19854c 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -41,6 +41,7 @@
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
mainProcess.start();
+ mainProcess.agvStart();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
@@ -48,6 +49,12 @@
// 鍒濆鍖栬緭閫佺嚎mq
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
+ }
+ for (Slave devp2 : slaveProperties.getDevp2()) {
+ MessageQueue.init(SlaveType.Devp2, devp2);
+ }
+ for (Slave devp3 : slaveProperties.getDevp3()) {
+ MessageQueue.init(SlaveType.Devp3, devp3);
}
// 鍒濆鍖栨潯鐮佹壂鎻忎华mq
for (Slave barcode : slaveProperties.getBarcode()) {
@@ -83,6 +90,16 @@
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);
+ }
+ for (Devp2Slave devp3 : slaveProperties.getDevp3()) {
+ SiemensDevpThread3 siemensDevpThread3 = new SiemensDevpThread3(devp3);
+ new Thread(siemensDevpThread3).start();
+ SlaveConnection.put(SlaveType.Devp3, devp3.getId(), siemensDevpThread3);
+ }
// 鍒濆鍖栨彁鍗囨満
News.info("鍒濆鍖栨彁鍗囨満........................................................");
for (LiftSlave liftSlave : slaveProperties.getLift()) {
@@ -93,7 +110,7 @@
// 鍒濆鍖栧洓鍚戠┛姊溅
News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
- ShuttleThread shuttleThread = new ShuttleThread(shuttleSlave,redisUtil);
+ NyShuttleThread shuttleThread = new NyShuttleThread(shuttleSlave,redisUtil);
new Thread(shuttleThread).start();
SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
}
@@ -101,7 +118,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