From 5fcdef2e8eec55221bb65a7a2cf91a4be7cc89ac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 02 十二月 2024 16:41:11 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
index 227776f..263c8f3 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
@@ -28,8 +28,8 @@
 			isLowPower="false"
 			onlyDealRtus=""
 			onlyOneProtocol="false"
-			downComandMaxResendTimes="2"
-			commandSendInterval="10"
+			downComandMaxResendTimes="1"
+			commandSendInterval="3"
 			cachWaitResultTimeout="120"
 			offLineCachTimeout="86400"
 			lastUpDataTimeLive="500"
@@ -56,15 +56,17 @@
 
 	<!-- RTU 杞欢鍗囩骇
 	enable: 妯″潡鏄惁鍚姩
+	noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
 	failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
 	ugMaxRtuAtOnce锛氫负浜嗙紦瑙i�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
 	rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
 	notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
 	-->
 	<upgrade enable="true"
-			 failTryTimes="1"
-			 ugMaxRtuAtOnce="1000"
-			 rtuOffLineWaitDuration="1200"
+			 noOneRtuUpgradeMaxDuration="1200"
+			 failTryTimes="2"
+			 ugMaxRtuAtOnce="5000"
+			 rtuOffLineWaitDuration="1800"
 			 notifyStateInterval="2"
 	/>
 
@@ -122,14 +124,12 @@
 	/>
 
 	<!--
-    sleepBigBusy锛氫富绾跨▼澶у繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
-    sleepSmallBusy锛氫富绾跨▼灏忓繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
+    coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
     queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
     queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
      -->
 	<core
-			sleepBigBusy="100"
-			sleepSmallBusy="500"
+			coreInterval="100"
 			queueWarnSize="100000"
 			queueMaxSize="300000"
 	/>

--
Gitblit v1.8.0