From 190bec9d5950a76e62b3bb1663f979a644695279 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 09 八月 2025 15:22:27 +0800
Subject: [PATCH] 完善wcs'主控图地图显示
---
src/main/java/com/zy/core/ServerBootstrap.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 32447ef..e06e776 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -55,18 +55,18 @@
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
}
-// // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// MessageQueue.init(SlaveType.Barcode, barcode);
-// }
-// // 鍒濆鍖朙ed鐏痬q
-// for (Slave led : slaveProperties.getLed()) {
-// MessageQueue.init(SlaveType.Led, led);
-// }
- // 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
+ // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ MessageQueue.init(SlaveType.Barcode, barcode);
}
+ // 鍒濆鍖朙ed鐏痬q
+ for (Slave led : slaveProperties.getLed()) {
+ MessageQueue.init(SlaveType.Led, led);
+ }
+// // 鍒濆鍖栫绉癿q
+// for (Slave scale : slaveProperties.getScale()) {
+// MessageQueue.init(SlaveType.Scale, scale);
+// }
// // 鍒濆鍖栧彴杞q
// for (Slave car : slaveProperties.getCar()) {
// MessageQueue.init(SlaveType.Car, car);
@@ -88,21 +88,21 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
-// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// BarcodeThread barcodeThread = new BarcodeThread(barcode);
-//// new Thread(barcodeThread).start();
-// 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("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ BarcodeThread barcodeThread = new BarcodeThread(barcode);
+// new Thread(barcodeThread).start();
+ 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("鍒濆鍖栫绉ょ嚎绋�...................................................");
for (Slave scale : slaveProperties.getScale()) {
ScaleThread scaleThread = new ScaleThread(scale);
--
Gitblit v1.9.1