From 080c76ddb23b9f199ed2f59f3871b0058347d43e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 05 六月 2025 20:27:52 +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 |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 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 ee2f5ed..5f0b6b9 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
@@ -25,7 +25,7 @@
     sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
      -->
 	<base
-			orgTag="ym"
+			orgTag="${base.orgTag}"
 			isLowPower="false"
 			onlyDealRtus=""
 			onlyOneProtocol="false"
@@ -38,8 +38,8 @@
 			dbDataIdSuffix="0"
 			cacheUpDownDataWarnCount="100000"
 			cacheUpDownDataMaxCount="110000"
-			disconnectedByNoUpDataMinutes="3"
-			workReportDealOneByTimes="5"
+			disconnectedByNoUpDataMinutes="${base.upData.min.interval}"
+			workReportDealOneByTimes="1"
 			intakeAlarmLossMinValue="1.0"
 			sendDingDingAlarmMsInterval="60"
 	/>
@@ -54,6 +54,14 @@
 			centerAddr="1"
 			synchroRtuClock="true"
 			synchroRtuClockTimepieces="300000"
+	/>
+
+	<!-- RTU 娑堟伅涓績
+	enable: 妯″潡鏄惁鍚姩
+	notifyInterval: 娑堟伅閫氱煡闂撮殧锛堢锛�
+	-->
+	<msCenter enable="true"
+			  notifyInterval="5"
 	/>
 
 	<!-- RTU 杞欢鍗囩骇
@@ -118,7 +126,7 @@
 	<resource
 			rtuLogDir="rtuLogs/"
 			rtuLogFileMaxSize="1000000"
-			rtuLogFileMaxCount="2"
+			rtuLogFileMaxCount="3"
 			monitorInterval="2"
 			saveDbInterval="10"
 	/>
@@ -151,9 +159,27 @@
     idle: 鍙戝憜鏃堕暱锛堢锛�
      -->
 	<tcp enable="true"
-		 port="60000"
+		 port="${tcp.port}"
 		 processors="3"
 		 idle="10"
 	/>
 
+
+	<!--
+	topicAndQos: 涓婚涓嶲os锛屼富棰樺悕涓庡叾Qos鐢ㄩ�楀彿闅斿紑锛屽涓富棰樺強Qos鐢ㄥ垎鍙烽殧寮�锛屼緥濡傦細ym/topic1,1;ym/topic2,1;ym/topic3,1锛屽鏋滄湁澶氫釜OrgTag锛屼富棰樺墠缂�鐢ㄥ叾OrgTag
+	publishQos: 鍙戝竷娑堟伅鐨凲os锛屽彇鍊艰寖鍥达細
+		0	鑷冲涓�娆★紙At most once锛�	娑堟伅鍙戦�佸悗涓嶄繚璇佸埌杈撅紝鍙兘涓㈠け鎴栭噸澶嶏紝寮�閿�鏈�灏忥紝鍙潬鎬ф渶浣庛��
+    	1	鑷冲皯涓�娆★紙At least once锛�	娑堟伅鑷冲皯浼氬埌杈句竴娆★紝鍙兘閲嶅锛屼絾涓嶄細涓㈠け锛屽彲闈犳�т腑绛夛紝閫傜敤浜庡鏁板満鏅��
+    	2	鎭板ソ涓�娆★紙Exactly once锛�	娑堟伅浠呬細鍒拌揪涓�娆★紝涓嶉噸澶嶄笖涓嶄涪澶憋紝鍙潬鎬ф渶楂橈紝浣嗗紑閿�鏈�澶э紝瀹炵幇鏈�澶嶆潅銆�
+     -->
+	<mqtt enable="${mqtt.enable}"
+		  svIp="121.199.41.121"
+		  svPort="1883"
+		  svUserName="dyyjy"
+		  svUserPassword="Dyyjy2025,;.abc!@#"
+		  poolMaxSize="10"
+		  topicAndQos="${mqtt.topicAndQos}"
+		  publishQos="1"
+	/>
+
 </config>
\ No newline at end of file

--
Gitblit v1.8.0