From 591735554fc359c5988e00732ef9067d79157007 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 30 八月 2025 12:19:29 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/ServerBootstrap.java | 73 ++++++++++--------------------------
1 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 1749382..9b3b999 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -7,19 +7,16 @@
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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -62,6 +59,10 @@
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()) {
MessageQueue.init(SlaveType.Devp, devp);
@@ -74,25 +75,32 @@
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 {
// 鍒濆鍖栧爢鍨涙満绾跨▼
News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new MelsecCrnThread(crn);
+ CrnThread crnThread = new SiemensCrnThread(crn);
Thread thread = new Thread((Runnable) crnThread);
thread.start();
map.put(crnThread, thread);
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+ }
+ // 鍒濆鍖朢GV绾跨▼
+ 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);
}
// 鍒濆鍖栬緭閫佺嚎绾跨▼
News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
@@ -127,45 +135,6 @@
@PreDestroy
public void destroy() {
- }
-
- @Component
- class killThread {
-
- @Scheduled(cron = "0/3 * * * * ? ")
- public void kill() {
- for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) {
- CRN_COUNT++;
- SiemensCrnThread key = (SiemensCrnThread) entry.getKey();
-// System.out.println("绗�"+i+"涓爢鍨涙満绾跨▼閲嶅惎绾跨▼鏉′欢锛�"+(System.currentTimeMillis() - key.getSign()));
- if (CRN_COUNT>10000){
- continue;
- }
- if (System.currentTimeMillis() - key.getSign() > 120000 && System.currentTimeMillis() - key.getSign()<1200000) {
- System.out.println("绗�"+CRN_COUNT+"涓爢鍨涙満绾跨▼琚噸鍚�");
-
- // 璇锋眰绾跨▼瀹夊叏鍋滄
- 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