From a10daf057d11b14608652bcd3f8afe8a287b77a8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 十月 2024 09:35:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 110 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 2bff72a..ae2f143 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -49,7 +49,7 @@
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
- mainProcess.start();
+// mainProcess.start();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
@@ -86,19 +86,19 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
- }
+// News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// 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("鍒濆鍖朢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("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -106,13 +106,13 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
- // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
- News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
- for (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
- }
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+// News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+// for (Slave barcode : slaveProperties.getBarcode()) {
+// BarcodeThread barcodeThread = new BarcodeThread(barcode);
+//// new Thread(barcodeThread).start();
+// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+// }
// 鍒濆鍖朙ED绾跨▼
News.info("鍒濆鍖朙ED绾跨▼...................................................");
for (LedSlave led : slaveProperties.getLed()) {
@@ -134,40 +134,40 @@
public void destroy() {
}
- @Component
- class killThread {
+// @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);
+// }
+// }
+// }
- @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