From 2801c1b1ce328e27d044f26cdf9609e7c90478d7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 18:37:50 +0800
Subject: [PATCH] #盘点逻辑修改
---
src/main/java/com/zy/core/ServerBootstrap.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 48d373b..b419fc6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -45,13 +45,12 @@
}
private void initMq(){
- // 鍒濆鍖栧爢鍨涙満mq
- for (Slave crn : slaveProperties.getCrn()) {
- MessageQueue.init(SlaveType.Crn, crn);
- }
// 鍒濆鍖栬緭閫佺嚎mq
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()) {
@@ -69,10 +68,6 @@
for (Slave car : slaveProperties.getCar()) {
MessageQueue.init(SlaveType.Car, car);
}
- // 鍒濆鍖栫┛姊溅mq
- for (Slave ste : slaveProperties.getSte()) {
- MessageQueue.init(SlaveType.Ste, ste);
- }
// 鍒濆鍖栨彁鍗囨満mq
for (Slave lift : slaveProperties.getLift()) {
MessageQueue.init(SlaveType.Lift, lift);
@@ -84,20 +79,6 @@
}
private void initThread(){
- // 鍒濆鍖栧爢鍨涙満绾跨▼
- News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
- }
- // 鍒濆鍖栫┛姊溅绾跨▼
- News.info("鍒濆鍖栫┛姊溅绾跨▼...................................................");
- for (SteSlave ste : slaveProperties.getSte()) {
- SteThread steThread = new SteThread(ste);
- new Thread(steThread).start();
- SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
- }
// 鍒濆鍖栬緭閫佺嚎绾跨▼
News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -105,17 +86,22 @@
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("鍒濆鍖栨彁鍗囨満........................................................");
for (LiftSlave liftSlave : slaveProperties.getLift()) {
- LiftThread liftThread = new LiftThread(liftSlave);
+ LiftThread liftThread = new LiftThread(liftSlave, redisUtil);
new Thread(liftThread).start();
SlaveConnection.put(SlaveType.Lift, liftSlave.getId(), liftThread);
}
// 鍒濆鍖栧洓鍚戠┛姊溅
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);
}
@@ -123,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