From 4790be9d288a84a38b10e143c8433b7becc62404 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 十二月 2025 13:10:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 05e4a91..52b9b1d 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -4,17 +4,14 @@
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.RgvSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -39,6 +36,7 @@
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+ *
* @throws InterruptedException
*/
@PostConstruct
@@ -56,7 +54,7 @@
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
- private void initMq(){
+ private void initMq() {
// 鍒濆鍖栧爢鍨涙満mq
// for (Slave crn : slaveProperties.getCrn()) {
// MessageQueue.init(SlaveType.Crn, crn);
@@ -70,9 +68,9 @@
MessageQueue.init(SlaveType.Devp, devp);
}
// 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// MessageQueue.init(SlaveType.Barcode, barcode);
-// }
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ MessageQueue.init(SlaveType.Barcode, barcode);
+ }
// 鍒濆鍖朙ed鐏痬q
// for (Slave led : slaveProperties.getLed()) {
// MessageQueue.init(SlaveType.Led, led);
@@ -87,7 +85,7 @@
// }
}
- private void initThread(){
+ private void initThread() {
// 鍒濆鍖栧爢鍨涙満绾跨▼
// News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
// for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -110,12 +108,12 @@
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
// 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-// News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// BarcodeThread barcodeThread = new BarcodeThread(barcode);
-//// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
-// }
+ News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ BarcodeThread barcodeThread = new BarcodeThread(barcode);
+ new Thread(barcodeThread).start();
+ SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+ }
// // 鍒濆鍖朙ED绾跨▼
// News.info("鍒濆鍖朙ED绾跨▼...................................................");
// for (LedSlave led : slaveProperties.getLed()) {
--
Gitblit v1.9.1