From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] (1)升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败; (2)升级状态向Remote模块通知时,当升级任务结束后,仍要向remote模块通知可配置的次数;

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
index cbdc7ba..b20cbca 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
@@ -5,7 +5,27 @@
 
 	private static ThreadPool.Pool pool_short ;//鐭伐浣滀换鍔$嚎绋嬫睜锛岀嚎绋嬪伐浣滅敤鏃惰緝鐭�
 	private static ThreadPool.Pool pool_long ;//闀垮伐浣滀换鍔$嚎绋嬫睜锛岀嚎绋嬪伐浣滅敤鏃惰緝闀�
-	
+
+
+	public final static Integer[] pool_short_state(){
+		Integer shortCurThread = 0 ;//鐭嚎绋嬫睜褰撳墠绾跨▼鏁�
+		Integer shortMaxThread = 0 ;//鐭嚎绋嬫睜鏈�澶х嚎绋嬫暟
+		Integer shortMinThread = 0 ;//鐭嚎绋嬫睜鏈�灏忕嚎绋嬫暟
+		shortCurThread = pool_short.size() ;
+		shortMaxThread = pool_short.maxThread() ;
+		shortMinThread = pool_short.minThread() ;
+		return new Integer[]{shortCurThread, shortMaxThread, shortMinThread} ;
+	}
+
+	public final static Integer[] pool_long_state(){
+		Integer longCurThread = 0 ;//鐭嚎绋嬫睜褰撳墠绾跨▼鏁�
+		Integer longMaxThread = 0 ;//鐭嚎绋嬫睜鏈�澶х嚎绋嬫暟
+		Integer longMinThread = 0 ;//鐭嚎绋嬫睜鏈�灏忕嚎绋嬫暟
+		longCurThread = pool_long.size() ;
+		longMaxThread = pool_long.maxThread() ;
+		longMinThread = pool_long.minThread() ;
+		return new Integer[]{longCurThread, longMaxThread, longMinThread} ;
+	}
 	/**
 	 * 鍒濆鍖栫嚎绋嬫睜
 	 * @param poolName 绾跨▼姹犲拰绾跨▼鍚嶇О
@@ -51,6 +71,7 @@
 	}
 	/**
 	 * 寰楀埌鍞竴绾跨▼姹犲疄渚�
+	 * @return
 	 * @throws Exception
 	 */
 	public final static ThreadPool.Pool getThreadPoolShort()
@@ -62,6 +83,8 @@
 	}
 	/**
 	 * 寰楀埌鍞竴绾跨▼姹犲疄渚�
+	 * @return
+	 * @throws Exception
 	 */
 	public final static ThreadPool.Pool getThreadPoolLong()
 		throws Exception {

--
Gitblit v1.8.0