From 07559603c6ae9a98139716b6443a4a7b6dd66755 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 14 一月 2024 16:24:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 9e5e95d..c7cec42 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -6,15 +6,19 @@
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
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,7 +32,13 @@
@Autowired
private MainProcess mainProcess;
+ public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
+
+ /**
+ * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+ * @throws InterruptedException
+ */
@PostConstruct
@Async
public void init() throws InterruptedException {
@@ -48,6 +58,10 @@
for (Slave crn : slaveProperties.getCrn()) {
MessageQueue.init(SlaveType.Crn, crn);
}
+ // 鍒濆鍖栧爢鍨涙満mq
+ for (Slave rgv : slaveProperties.getRgv()) {
+ MessageQueue.init(SlaveType.Rgv, rgv);
+ }
// 鍒濆鍖栬緭閫佺嚎mq
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
@@ -64,10 +78,10 @@
for (Slave scale : slaveProperties.getScale()) {
MessageQueue.init(SlaveType.Scale, scale);
}
- // 鍒濆鍖栧彴杞q
- for (Slave car : slaveProperties.getCar()) {
- MessageQueue.init(SlaveType.Car, car);
- }
+// // 鍒濆鍖栧彴杞q
+// for (Slave car : slaveProperties.getCar()) {
+// MessageQueue.init(SlaveType.Car, car);
+// }
}
private void initThread(){
@@ -75,10 +89,18 @@
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
+ Thread thread = new Thread((Runnable) crnThread);
+ thread.start();
+ map.put(crnThread, thread);
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("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -91,7 +113,7 @@
log.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绾跨▼
@@ -101,6 +123,13 @@
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);
+// }
}
@@ -108,5 +137,41 @@
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