From 0e3cb0f173a4996a743f4b4e5b03f15fdb9f9e9c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 11 九月 2020 10:12:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 57860a6..85435f6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,7 +5,9 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.CarThread;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import com.zy.core.thread.LedThread;
@@ -64,6 +66,10 @@
for (Slave scale : slaveProperties.getScale()) {
MessageQueue.init(SlaveType.Scale, scale);
}
+ // 鍒濆鍖栧彴杞q
+ for (Slave car : slaveProperties.getCar()) {
+ MessageQueue.init(SlaveType.Car, car);
+ }
}
private void initThread(){
@@ -84,6 +90,7 @@
}
// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
// for (Slave barcode : slaveProperties.getBarcode()) {
// BarcodeThread barcodeThread = new BarcodeThread(barcode);
// new Thread(barcodeThread).start();
@@ -91,12 +98,18 @@
// }
// 鍒濆鍖朙ED绾跨▼
log.info("鍒濆鍖朙ED绾跨▼...................................................");
- for (Slave led : slaveProperties.getLed()) {
+ 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 car : slaveProperties.getCar()) {
+ CarThread carThread = new CarThread(car);
+ new Thread(carThread).start();
+ SlaveConnection.put(SlaveType.Car, car.getId(), carThread);
+ }
}
--
Gitblit v1.9.1