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/core/CoreConstantManage.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/core/CoreConstantManage.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/core/CoreConstantManage.java
index 262df98..492aab1 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/core/CoreConstantManage.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/core/CoreConstantManage.java
@@ -1,5 +1,6 @@
package com.dy.common.mw.core;
+import java.util.ArrayList;
import java.util.List;
import org.apache.logging.log4j.*;
@@ -10,10 +11,12 @@
private final static CoreConstantManage instance = new CoreConstantManage() ;
- private static Long sleepBigBusy = 100L ;//澶у繖鏃讹紙闄や簡鎭掍箙浠诲姟锛岃繕鏄叾浠栦换鍔★級锛屾牳蹇冪嚎绋嬫殏鍋滈棿闅�
- private static Long sleepSmallBusy = 500L ;//灏忓繖鏃讹紙鍙湁鎭掍箙浠诲姟锛屾棤鍏朵粬浠诲姟锛夛紝鏍稿績绾跨▼鏆傚仠闂撮殧
-
+ private List<CoreConstantTimer> coreConstantTimers ;
+
+ private Long coreInterval = 100L ;//鏍稿績绾跨▼鏆傚仠闂撮殧
+
private CoreConstantManage(){
+ coreConstantTimers = new ArrayList<>() ;
}
public static CoreConstantManage getInstance(){
@@ -22,12 +25,10 @@
/**
* 璁剧疆鏆傚仠鏃堕暱
- * @param sleepBigBusy 澶у繖鏃讹紙闄や簡鎭掍箙浠诲姟锛岃繕鏄叾浠栦换鍔★級锛屾牳蹇冪嚎绋嬫殏鍋滈棿闅�
- * @param sleepSmallBusy 灏忓繖鏃讹紙鍙湁鎭掍箙浠诲姟锛屾棤鍏朵粬浠诲姟锛夛紝鏍稿績绾跨▼鏆傚仠闂撮殧
+ * @param coreInterval 鏍稿績绾跨▼鏆傚仠闂撮殧
*/
- public void setSleep(Long sleepBigBusy, Long sleepSmallBusy){
- CoreConstantManage.sleepBigBusy = sleepBigBusy ;
- CoreConstantManage.sleepSmallBusy = sleepSmallBusy ;
+ public void setSleep(Long coreInterval){
+ this.coreInterval = coreInterval ;
}
public void start(){
@@ -35,7 +36,8 @@
List<CoreTask> constantTasks = CoreUnit.getAllConstantTasks();
if (constantTasks != null && constantTasks.size() > 0) {
for (CoreTask task : constantTasks) {
- new CoreConstantThread(sleepBigBusy, sleepSmallBusy, task).start();
+ //new CoreConstantThread(sleepBigBusy, sleepSmallBusy, task).start();
+ coreConstantTimers.add(new CoreConstantTimer(coreInterval, task).start());
}
}
}
--
Gitblit v1.8.0