From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +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 |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 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 dcd78cc..bc4b74c 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
@@ -12,9 +12,10 @@
     onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
     downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
     commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
-    cachWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
-    offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
-    lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂)
+    fastCommandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝揩閫熷懡浠わ紙濡傚崌绾у懡浠わ級鐨勬椂闂撮棿闅�(姣)锛屾閰嶇疆浣滅敤鍔涘彈涓嬮潰閰嶇疆椤筶astUpDataTimeLive闄愬埗
+    cacheWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+    offLineCacheTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+    lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�
     dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
     cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
     cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
@@ -24,20 +25,21 @@
     sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
      -->
 	<base
-			orgTag="ym"
+			orgTag="mq"
 			isLowPower="false"
 			onlyDealRtus=""
 			onlyOneProtocol="false"
 			downComandMaxResendTimes="1"
 			commandSendInterval="3"
-			cachWaitResultTimeout="120"
-			offLineCachTimeout="86400"
+			fastCommandSendInterval="500"
+			cacheWaitResultTimeout="120"
+			offLineCacheTimeout="86400"
 			lastUpDataTimeLive="500"
 			dbDataIdSuffix="0"
 			cacheUpDownDataWarnCount="100000"
 			cacheUpDownDataMaxCount="110000"
 			disconnectedByNoUpDataMinutes="3"
-			workReportDealOneByTimes="5"
+			workReportDealOneByTimes="1"
 			intakeAlarmLossMinValue="1.0"
 			sendDingDingAlarmMsInterval="60"
 	/>
@@ -52,6 +54,14 @@
 			centerAddr="1"
 			synchroRtuClock="true"
 			synchroRtuClockTimepieces="300000"
+	/>
+
+	<!-- RTU 娑堟伅涓績
+	enable: 妯″潡鏄惁鍚姩
+	notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛�
+	-->
+	<msCenter enable="true"
+			  notifyInterval="5"
 	/>
 
 	<!-- RTU 杞欢鍗囩骇
@@ -115,8 +125,8 @@
      -->
 	<resource
 			rtuLogDir="rtuLogs/"
-			rtuLogFileMaxSize="100000"
-			rtuLogFileMaxCount="2"
+			rtuLogFileMaxSize="1000000"
+			rtuLogFileMaxCount="3"
 			monitorInterval="2"
 			saveDbInterval="10"
 	/>
@@ -149,7 +159,7 @@
     idle: 鍙戝憜鏃堕暱锛堢锛�
      -->
 	<tcp enable="true"
-		 port="60000"
+		 port="60100"
 		 processors="3"
 		 idle="10"
 	/>

--
Gitblit v1.8.0