From fb956794ce68616b418372a7c780e6e068b5d038 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 30 七月 2024 18:40:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 99 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 551ee70..b37b6b3 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -7,7 +7,11 @@
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.LedThread;
+import com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.utils.News;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -15,6 +19,8 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Created by vincent on 2020/8/4
@@ -28,11 +34,16 @@
@Autowired
private MainProcess mainProcess;
+ public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
+ /**
+ * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+ * @throws InterruptedException
+ */
@PostConstruct
@Async
public void init() throws InterruptedException {
- log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+ News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
@@ -40,13 +51,17 @@
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
mainProcess.start();
- log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
+ 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);
}
// 鍒濆鍖栬緭閫佺嚎mq
for (Slave devp : slaveProperties.getDevp()) {
@@ -61,51 +76,58 @@
MessageQueue.init(SlaveType.Led, led);
}
// 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
- }
+// for (Slave scale : slaveProperties.getScale()) {
+// MessageQueue.init(SlaveType.Scale, scale);
+// }
// 鍒濆鍖栧彴杞q
- for (Slave car : slaveProperties.getCar()) {
- MessageQueue.init(SlaveType.Car, car);
- }
+// for (Slave car : slaveProperties.getCar()) {
+// MessageQueue.init(SlaveType.Car, car);
+// }
}
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+ News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new MelsecCrnThread(crn);
+ 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);
+// }
// 鍒濆鍖栬緭閫佺嚎绾跨▼
- log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+ News.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("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+ 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绾跨▼
- log.info("鍒濆鍖朙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);
}
// 鍒濆鍖栫绉ょ嚎绋�
- log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
- for (Slave scale : slaveProperties.getScale()) {
- ScaleThread barcodeThread = new ScaleThread(scale);
- new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
- }
+// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+// for (Slave scale : slaveProperties.getScale()) {
+// ScaleThread barcodeThread = new ScaleThread(scale);
+// new Thread(barcodeThread).start();
+// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
+// }
}
@@ -113,5 +135,40 @@
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