From 9a34c6b7a1a1bd98408849dc5dda44709727adb6 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 14 十一月 2024 11:10:23 +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(test测试).xml |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
index 32a3a8f..7270793 100644
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
@@ -29,7 +29,7 @@
 		onlyDealRtus=""
 		onlyOneProtocol="false"
 		downComandMaxResendTimes="1"
-		commandSendInterval="2"
+		commandSendInterval="10"
 		cachWaitResultTimeout="120"
 		offLineCachTimeout="86400"
 		lastUpDataTimeLive="500"
@@ -54,19 +54,19 @@
 		synchroRtuClockTimepieces="300000"
 	/>
 
-
-	<!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤
-     杞欢鍗囩骇 -->
-	<updateRtuSoft enable="true">
-		<soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" >
-			<newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion>
-		</soft1>
-		<!--
-        <soft2 enable="false" oldVersionName="rtu_v1_0,rtu_v2_0,rtu_v3_0" >
-            <newVersion newVersionName="rtu_v4_0" file="rtuSoft/rtu_v4_0.txt"></newVersion>
-        </soft2>
-         -->
-	</updateRtuSoft>
+	<!-- RTU 杞欢鍗囩骇
+	enable: 妯″潡鏄惁鍚姩
+	failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+	ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+	rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+	notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+	-->
+	<upgrade enable="true"
+			 failTryTimes="1"
+			 ugMaxRtuAtOnce="1000"
+			 rtuOffLineWaitDuration="1200"
+			 notifyStateInterval="2"
+	/>
 
 	<!--
     鏀寔妯″潡

--
Gitblit v1.8.0