From ffc84e8ad20d6734dbbfc1fb4c8533a35ba9072e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 22 一月 2024 08:41:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index a7e65f4..dddcf0c 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,11 +5,12 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.SocketSlave;
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 com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.core.thread.SocketThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -30,11 +31,15 @@
@Autowired
private MainProcess mainProcess;
-
+ /**
+ * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+ * @throws InterruptedException
+ */
@PostConstruct
@Async
- public void init(){
+ public void init() throws InterruptedException {
log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
@@ -69,25 +74,27 @@
for (Slave car : slaveProperties.getCar()) {
MessageQueue.init(SlaveType.Car, car);
}
+// // 鍒濆鍖杝ocket mq
+// for (Slave socket : slaveProperties.getSocket()) {
+// MessageQueue.init(SlaveType.Socket, socket);
+// }
}
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new CrnThread(crn);
- new Thread(crnThread).start();
+ CrnThread crnThread = new SiemensCrnThread(crn);
+ new Thread((Runnable) crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
-
// 鍒濆鍖栬緭閫佺嚎绾跨▼
log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new DevpThread(devp);
- new Thread(devpThread).start();
+ DevpThread devpThread = new SiemensDevpThread(devp);
+ new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
-
// 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
@@ -95,20 +102,28 @@
new Thread(barcodeThread).start();
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
}
- // 鍒濆鍖朙ED绾跨▼
+
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+// log.info("鍒濆鍖朣ocket绾跨▼...................................................");
+// for (SocketSlave socket : slaveProperties.getSocket()) {
+// SocketThread socketThread = new SocketThread(socket);
+// new Thread(socketThread).start();
+// SlaveConnection.put(SlaveType.Socket, socket.getId(), socketThread);
+// }
+// // 鍒濆鍖朙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);
- }
+ // 鍒濆鍖栫绉ょ嚎绋�
+// 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