From b17e2a3f2bd85d18630cb447d65368e430c887f8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 24 九月 2020 10:08:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index eb68da2..ac5207a 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -6,12 +6,16 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.CarThread;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
+import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
/**
@@ -27,9 +31,11 @@
private MainProcess mainProcess;
-// @PostConstruct
- public void init(){
+ @PostConstruct
+ @Async
+ public void init() throws InterruptedException {
log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
@@ -60,10 +66,15 @@
for (Slave scale : slaveProperties.getScale()) {
MessageQueue.init(SlaveType.Scale, scale);
}
+ // 鍒濆鍖栧彴杞q
+ for (Slave car : slaveProperties.getCar()) {
+ MessageQueue.init(SlaveType.Car, car);
+ }
}
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
+ log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
CrnThread crnThread = new CrnThread(crn);
new Thread(crnThread).start();
@@ -71,18 +82,34 @@
}
// 鍒濆鍖栬緭閫佺嚎绾跨▼
+ log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = new DevpThread(devp);
new Thread(devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
-// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Barcode, barcode.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 car : slaveProperties.getCar()) {
+ CarThread carThread = new CarThread(car);
+ new Thread(carThread).start();
+ SlaveConnection.put(SlaveType.Car, car.getId(), carThread);
+ }
}
--
Gitblit v1.9.1