From 85bb0d60ce25ec902aba8c298931bda33a77e7b8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 十月 2024 11:59:35 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/ServerBootstrap.java | 103 +++++++++------------------------------------------
1 files changed, 18 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 98da0b9..c52b3fc 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -29,10 +29,6 @@
@Autowired
private MainProcess mainProcess;
- int CRN_COUNT = 0;
-
- public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
-
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
@@ -53,14 +49,10 @@
}
private void initMq(){
-// // 鍒濆鍖栧爢鍨涙満mq
-// for (Slave crn : slaveProperties.getCrn()) {
-// MessageQueue.init(SlaveType.Crn, crn);
-// }
-// // 鍒濆鍖朢GVmq
-// for (Slave rgv : slaveProperties.getRgv()) {
-// MessageQueue.init(SlaveType.Rgv, rgv);
-// }
+ // 鍒濆鍖朢GVmq
+ for (Slave rgv : slaveProperties.getRgv()) {
+ MessageQueue.init(SlaveType.Rgv, rgv);
+ }
// 鍒濆鍖栬緭閫佺嚎mq
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
@@ -77,10 +69,6 @@
// for (Slave scale : slaveProperties.getScale()) {
// MessageQueue.init(SlaveType.Scale, scale);
// }
-// // 鍒濆鍖栫～鍖栫綈mq
-// for (Slave jar : slaveProperties.getJar()) {
-// MessageQueue.init(SlaveType.Jar, jar);
-// }
// // 鍒濆鍖栧彴杞q
// for (Slave car : slaveProperties.getCar()) {
// MessageQueue.init(SlaveType.Car, car);
@@ -92,29 +80,20 @@
}
private void initThread(){
-// // 鍒濆鍖栧爢鍨涙満绾跨▼
-// log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
-// for (CrnSlave crn : slaveProperties.getCrn()) {
-// CrnThread crnThread = new SiemensCrnThread(crn);
-// 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()) {
-// DevpThread devpThread = new SiemensDevpThread(devp);
-// new Thread((Runnable) devpThread).start();
-// SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
-// }
+ // 鍒濆鍖栫┛姊溅绾跨▼
+ 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()) {
+ DevpThread devpThread = new SiemensDevpThread(devp);
+ new Thread((Runnable) devpThread).start();
+ SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+ }
//
// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
@@ -129,13 +108,6 @@
// LedThread ledThread = new LedThread(led);
// new Thread(ledThread).start();
// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
-// }
-// // 鍒濆鍖杍ar绾跨▼
-// log.info("鍒濆鍖杍ar绾跨▼...................................................");
-// for (JarSlave jar : slaveProperties.getJar()) {
-// JarThread jarThread = new JarThread(jar);
-// new Thread(jarThread).start();
-// SlaveConnection.put(SlaveType.Jar, jar.getId(), jarThread);
// }
// // 鍒濆鍖朣te绾跨▼
// log.info("鍒濆鍖杝te绾跨▼...................................................");
@@ -156,45 +128,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