From 510a21954afdf40479bdf293568cc7979e6043ad Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 07 一月 2026 16:15:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/ServerBootstrap.java | 101 ++++++--------------------------------------------
1 files changed, 12 insertions(+), 89 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 520f386..79ba880 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -4,16 +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;
@@ -26,21 +24,22 @@
*/
@Slf4j
@Component
+@DependsOn("springContextUtil")
public class ServerBootstrap {
@Autowired
private SlaveProperties slaveProperties;
@Autowired
- private MainProcess mainProcess;
-
- public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
+ private CtuMainProcess ctuMainProcess;
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+ *
* @throws InterruptedException
*/
@PostConstruct
@Async
+ @DependsOn("basDevpService")
public void init() throws InterruptedException {
News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
Thread.sleep(2000);
@@ -49,19 +48,11 @@
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
- mainProcess.start();
+ ctuMainProcess.start();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
- private void initMq(){
- // 鍒濆鍖栧爢鍨涙満mq
- for (Slave crn : slaveProperties.getCrn()) {
- MessageQueue.init(SlaveType.Crn, crn);
- }
- // 鍒濆鍖朢gv灏忚溅mq
- for (Slave rgv : slaveProperties.getRgv()) {
- MessageQueue.init(SlaveType.Rgv, rgv);
- }
+ private void initMq() {
// 鍒濆鍖栬緭閫佺嚎mq
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
@@ -70,35 +61,10 @@
for (Slave barcode : slaveProperties.getBarcode()) {
MessageQueue.init(SlaveType.Barcode, barcode);
}
- // 鍒濆鍖朙ed鐏痬q
- for (Slave led : slaveProperties.getLed()) {
- MessageQueue.init(SlaveType.Led, led);
- }
- // 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
- }
- // 鍒濆鍖栧彴杞q
- for (Slave car : slaveProperties.getCar()) {
- MessageQueue.init(SlaveType.Car, car);
- }
}
- private void initThread(){
- // 鍒濆鍖栧爢鍨涙満绾跨▼
- News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
- }
- // 鍒濆鍖栫┛姊溅绾跨▼
- log.info("鍒濆鍖朢GV绾跨▼...................................................");
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- RgvThread rgvThread = new RgvThread(rgv);
- new Thread((Runnable) rgvThread).start();
- SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
- }
+ private void initThread() {
+
// 鍒濆鍖栬緭閫佺嚎绾跨▼
News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -110,15 +76,8 @@
News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
+ new Thread(barcodeThread).start();
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
- }
- // 鍒濆鍖朙ED绾跨▼
- News.info("鍒濆鍖朙ED绾跨▼...................................................");
- for (LedSlave led : slaveProperties.getLed()) {
- LedThread ledThread = new LedThread(led);
- new Thread(ledThread).start();
- SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
}
// 鍒濆鍖栫绉ょ嚎绋�
// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
@@ -134,40 +93,4 @@
public void destroy() {
}
-// @Component
-// class killThread {
-//
-// @Scheduled(cron = "0/3 * * * * ? ")
-// public void kill() {
-// int i = 0;
-// for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) {
-// i++;
-// SiemensCrnThread key = (SiemensCrnThread) entry.getKey();
-//// System.out.println("绗�"+i+"涓爢鍨涙満绾跨▼閲嶅惎绾跨▼鏉′欢锛�"+(System.currentTimeMillis() - key.getSign()));
-// if (System.currentTimeMillis() - key.getSign() > 120000) {
-// System.out.println("绗�"+i+"涓爢鍨涙満绾跨▼琚噸鍚�");
-//
-// // 璇锋眰绾跨▼瀹夊叏鍋滄
-// key.requestStop();
-//
-// // 绛夊緟绾跨▼瀹屾垚鍋滄, 鍙互杩欐牱鍋氫篃鍙互閫夋嫨涓嶈繖涔堝仛锛屽彇鍐充簬鏄惁闇�瑕佺瓑寰呯嚎绋嬬粨鏉�
-// try {
-// entry.getValue().join(20000); // 绛夊緟鏈�澶�20绉�
-// } catch (InterruptedException e) {
-//// // 鍙�傚綋澶勭悊涓柇
-//// Thread.currentThread().interrupt(); // 淇濈暀涓柇鐘舵��
-// entry.getValue().stop();
-// }
-//
-// // 閲嶆柊鍚姩绾跨▼
-// Thread thread = new Thread((Runnable) key); // 鍋囪CrnThread瀹炵幇浜哛unnable
-// thread.start();
-//
-// // 鏇挎崲鏄犲皠鍏崇郴涓殑鏃х嚎绋�
-// map.put(entry.getKey(), thread);
-// }
-// }
-// }
-
-// }
}
--
Gitblit v1.9.1