From 14d7f0df63340ede75458c0e91b902376ef4dd64 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 11:26:32 +0800
Subject: [PATCH] 1、优化代码;2、修改长级测试中发现的bug;3、通信中间件配置文件配置项修改

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 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 b9031ee..3a54042 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
@@ -24,12 +24,12 @@
     sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
      -->
 	<base
-			orgTag="sp"
+			orgTag="ym"
 			isLowPower="false"
 			onlyDealRtus=""
 			onlyOneProtocol="false"
 			downComandMaxResendTimes="1"
-			commandSendInterval="2"
+			commandSendInterval="3"
 			cachWaitResultTimeout="120"
 			offLineCachTimeout="86400"
 			lastUpDataTimeLive="500"
@@ -54,19 +54,21 @@
 			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: 妯″潡鏄惁鍚姩
+	noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+	failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+	ugMaxRtuAtOnce锛氫负浜嗙紦瑙i�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+	rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+	notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+	-->
+	<upgrade enable="true"
+			 noOneRtuUpgradeMaxDuration="600"
+			 failTryTimes="1"
+			 ugMaxRtuAtOnce="1000"
+			 rtuOffLineWaitDuration="1200"
+			 notifyStateInterval="2"
+	/>
 
 	<!--
     鏀寔妯″潡
@@ -140,7 +142,7 @@
     idle: 鍙戝憜鏃堕暱锛堢锛�
      -->
 	<tcp enable="true"
-		 port="62000"
+		 port="60000"
 		 processors="3"
 		 idle="10"
 	/>

--
Gitblit v1.8.0