From e4ca85253b5fe431f42557776dce0c64bc234a5e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 30 四月 2025 12:23:07 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/ServerBootstrap.java | 59 ++++++++++-------------------------------------------------
1 files changed, 10 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index bf699d1..d548941 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -12,14 +12,10 @@
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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -34,6 +30,8 @@
private SlaveProperties slaveProperties;
@Autowired
private MainProcess mainProcess;
+
+ int CRN_COUNT = 0;
public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
@@ -72,14 +70,14 @@
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);
- }
+// // 鍒濆鍖栫绉癿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() throws InterruptedException {
@@ -125,43 +123,6 @@
@PreDestroy
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++;
- MelsecCrnThread key = (MelsecCrnThread) 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