From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/support/SupportUnit.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/support/SupportUnit.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/support/SupportUnit.java
index ea7216e..38cc9dd 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/support/SupportUnit.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/support/SupportUnit.java
@@ -4,7 +4,7 @@
import com.dy.common.threadPool.TreadPoolFactory;
import com.dy.common.mw.UnitAdapterInterface;
import com.dy.common.mw.UnitInterface;
-import com.dy.common.mw.UnitStartedCallbackInterface;
+import com.dy.common.mw.UnitCallbackInterface;
public class SupportUnit implements UnitInterface {
@@ -36,34 +36,39 @@
}
@Override
- public void start(UnitStartedCallbackInterface callback) throws Exception {
+ public void start(UnitCallbackInterface callback) throws Exception {
if(!started){
started = true ;
- if(confVo.enableThreadPool){
- TreadPoolFactory.initThreadPoolShort("鐭换鍔″伐浣滅嚎绋嬫睜",
- this.confVo.short_maxThread,
- this.confVo.short_minThread,
- this.confVo.short_freeTimeout,
+ if(confVo.enableShortThreadPool) {
+ TreadPoolFactory.initThreadPoolShort("鐭换鍔″伐浣滅嚎绋嬫睜",
+ this.confVo.short_maxThread,
+ this.confVo.short_minThread,
+ this.confVo.short_freeTimeout,
this.confVo.short_busyTimeout);
- TreadPoolFactory.initThreadPoolLong("闀夸换鍔″伐浣滅嚎绋嬫睜",
- this.confVo.long_maxThread,
- this.confVo.long_minThread,
- this.confVo.long_freeTimeout,
- this.confVo.long_busyTimeout);
-
- if(this.confVo.showStartInfo){
- System.out.println("绾跨▼姹犳ā鍧楁垚鍔熷惎鍔�");
- }
+ }else{
+ System.out.println("鐭嚎绋嬫睜閰嶇疆涓嶅惎鍔�");
}
- callback.call(null);
+ if(confVo.enableLongThreadPool) {
+ TreadPoolFactory.initThreadPoolLong("闀夸换鍔″伐浣滅嚎绋嬫睜",
+ this.confVo.long_maxThread,
+ this.confVo.long_minThread,
+ this.confVo.long_freeTimeout,
+ this.confVo.long_busyTimeout);
+ }else{
+ System.out.println("闀跨嚎绋嬫睜閰嶇疆涓嶅惎鍔�");
+ }
+ if(this.confVo.showStartInfo){
+ System.out.println("绾跨▼姹犳ā鍧楁垚鍔熷惎鍔�");
+ }
}
+ callback.call(null);
}
@Override
- public void stop(UnitStartedCallbackInterface callback) throws Exception {
+ public void stop(UnitCallbackInterface callback) {
}
-
+ /*
public static void main(String[] args) throws Exception{
SupportUnitConfigVo supVo = new SupportUnitConfigVo() ;
//鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
@@ -106,7 +111,6 @@
public void setConfig(SupportUnitConfigVo configVo) {
this.configVo = configVo;
}
-
-
}
+ */
}
--
Gitblit v1.8.0