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(sp沙盘).xml |   76 +++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 37 deletions(-)

diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050sp\346\262\231\347\233\230\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050sp\346\262\231\347\233\230\051.xml"
index 50849b5..a84ad5e 100644
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050sp\346\262\231\347\233\230\051.xml"
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050sp\346\262\231\347\233\230\051.xml"
@@ -24,22 +24,22 @@
     sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
      -->
 	<base
-		orgTag="sp"
-		isLowPower="false"
-		onlyDealRtus=""
-		onlyOneProtocol="false"
-		downComandMaxResendTimes="1"
-		commandSendInterval="10"
-		cachWaitResultTimeout="120"
-		offLineCachTimeout="86400"
-		lastUpDataTimeLive="500"
-		dbDataIdSuffix="0"
-		cacheUpDownDataWarnCount="100000"
-		cacheUpDownDataMaxCount="110000"
-		disconnectedByNoUpDataMinutes="3"
-		workReportDealOneByTimes="5"
-		intakeAlarmLossMinValue="1.0"
-		sendDingDingAlarmMsInterval="60"
+			orgTag="sp"
+			isLowPower="false"
+			onlyDealRtus=""
+			onlyOneProtocol="false"
+			downComandMaxResendTimes="1"
+			commandSendInterval="3"
+			cachWaitResultTimeout="120"
+			offLineCachTimeout="86400"
+			lastUpDataTimeLive="500"
+			dbDataIdSuffix="0"
+			cacheUpDownDataWarnCount="100000"
+			cacheUpDownDataMaxCount="110000"
+			disconnectedByNoUpDataMinutes="3"
+			workReportDealOneByTimes="5"
+			intakeAlarmLossMinValue="1.0"
+			sendDingDingAlarmMsInterval="60"
 	/>
 
 	<!--
@@ -49,19 +49,21 @@
     synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
      -->
 	<protocol
-		centerAddr="1"
-		synchroRtuClock="true"
-		synchroRtuClockTimepieces="300000"
+			centerAddr="1"
+			synchroRtuClock="true"
+			synchroRtuClockTimepieces="300000"
 	/>
 
 	<!-- 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"
@@ -83,15 +85,15 @@
     enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
      -->
 	<support
-		short_maxThread="6"
-		short_minThread="6"
-		short_freeTimeout="60"
-		short_busyTimeout="5"
-		long_maxThread="6"
-		long_minThread="6"
-		long_freeTimeout="60"
-		long_busyTimeout="-1"
-		enableThreadPool="true"
+			short_maxThread="6"
+			short_minThread="6"
+			short_freeTimeout="60"
+			short_busyTimeout="5"
+			long_maxThread="6"
+			long_minThread="6"
+			long_freeTimeout="60"
+			long_busyTimeout="-1"
+			enableThreadPool="true"
 	/>
 
 	<!--
@@ -103,11 +105,11 @@
     saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
      -->
 	<resource
-		rtuLogDir="rtuLogs/"
-		rtuLogFileMaxSize="100000"
-		rtuLogFileMaxCount="2"
-		monitorInterval="2"
-		saveDbInterval="10"
+			rtuLogDir="rtuLogs/"
+			rtuLogFileMaxSize="100000"
+			rtuLogFileMaxCount="2"
+			monitorInterval="2"
+			saveDbInterval="10"
 	/>
 
 
@@ -128,10 +130,10 @@
     queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
      -->
 	<core
-		sleepBigBusy="100"
-		sleepSmallBusy="500"
-		queueWarnSize="100000"
-		queueMaxSize="300000"
+			sleepBigBusy="100"
+			sleepSmallBusy="500"
+			queueWarnSize="100000"
+			queueMaxSize="300000"
 	/>
 
 	<!--

--
Gitblit v1.8.0