From 3adff2c549121bc166f49aa8de681265cd87b2d9 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期四, 19 六月 2025 09:49:09 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/ServerBootstrap.java | 62 +++++++++++++++--------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java index 32447ef..c840a5b 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,27 +88,27 @@ 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 scale : slaveProperties.getScale()) { - ScaleThread scaleThread = new ScaleThread(scale); - new Thread(scaleThread).start(); - SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread); + // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼ + 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); +// new Thread(scaleThread).start(); +// SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread); +// } } -- Gitblit v1.9.1