From d66490d4dfbc811bca51a98c08dbbc444e258a30 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 27 九月 2022 10:52:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 6ecf80a..5054657 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,11 +3,15 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
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.model.SteSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.*;
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;
@@ -22,14 +26,22 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private MainProcess mainProcess;
@PostConstruct
- public void init(){
+ @Async
+ public void init() throws InterruptedException {
+ log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
+ // 寮�濮嬩富娴佺▼杩涚▼
+ mainProcess.start();
+ log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
private void initMq(){
@@ -53,23 +65,59 @@
for (Slave scale : slaveProperties.getScale()) {
MessageQueue.init(SlaveType.Scale, scale);
}
+ // 鍒濆鍖栧彴杞q
+ for (Slave car : slaveProperties.getCar()) {
+ MessageQueue.init(SlaveType.Car, car);
+ }
+ // 鍒濆鍖栫┛姊溅mq
+ for (Slave ste : slaveProperties.getSte()) {
+ MessageQueue.init(SlaveType.Ste, ste);
+ }
}
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- for (Slave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new CrnThread(crn);
- new Thread(crnThread).start();
+ log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ CrnThread crnThread = new SiemensCrnThread(crn);
+ new Thread((Runnable) crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
-
- // 鍒濆鍖栫珯鐐圭嚎绋�
- for (Slave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new DevpThread(devp);
- new Thread(devpThread).start();
+ // 鍒濆鍖栫┛姊溅绾跨▼
+ log.info("鍒濆鍖栫┛姊溅绾跨▼...................................................");
+ for (SteSlave ste : slaveProperties.getSte()) {
+ SteThread steThread = new SteThread(ste);
+ new Thread(steThread).start();
+ SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
+ }
+ // 鍒濆鍖栬緭閫佺嚎绾跨▼
+ log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = new SiemensDevpThread(devp);
+ 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);
+// }
}
--
Gitblit v1.9.1