From c11bf8f5d114d5c5d49ec90ec5e1daf241fd0df0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 16 五月 2023 14:54:29 +0800
Subject: [PATCH] 路径站点管理
---
src/main/java/com/zy/core/ServerBootstrap.java | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index a1bb5dd..32447ef 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -55,29 +55,29 @@
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);
- }
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华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);
- }
+// // 鍒濆鍖栧彴杞q
+// for (Slave car : slaveProperties.getCar()) {
+// MessageQueue.init(SlaveType.Car, car);
+// }
}
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new MelsecCrnThread(crn);
+ CrnThread crnThread = new SiemensCrnThread(crn);
new Thread((Runnable) crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
@@ -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 barcodeThread = new ScaleThread(scale);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+// 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