From d730e2a289b38356e28a04b35a0cb2e7b4c6c282 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 七月 2025 10:27:56 +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 |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 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 7ed1dbe..74792d9 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
@@ -38,7 +38,7 @@
 			dbDataIdSuffix="0"
 			cacheUpDownDataWarnCount="100000"
 			cacheUpDownDataMaxCount="110000"
-			disconnectedByNoUpDataMinutes="3"
+			disconnectedByNoUpDataMinutes="${base.upData.min.interval}"
 			workReportDealOneByTimes="1"
 			intakeAlarmLossMinValue="1.0"
 			sendDingDingAlarmMsInterval="60"
@@ -164,4 +164,41 @@
 		 idle="10"
 	/>
 
+
+	<!--
+	enable 鏄惁鍚姩
+	svIp MQTT鏈嶅姟鍣↖P
+	svUserName MQTT鏈嶅姟鍣ㄧ敤鎴峰悕
+	svUserPassword MQTT鏈嶅姟鍣ㄧ敤鎴峰瘑鐮�
+	poolMaxSize 杩炴帴姹犳渶澶ц繛鎺ユ暟
+	sendInterval 鍛戒护鍙戦�侀棿闅旓紙鍗曚綅绉掞級锛屽彇鍊艰寖鍥存槸1~3600
+	reSendTimesByNoResult 鏈敹鍒板懡浠ょ粨鏋滄椂锛屾渶澶ч噸澶嶅彂閫佹鏁帮紝鍙栧�艰寖鍥存槸0~100, 0鏃惰〃绀轰笉閲嶅鍙戦��
+	comCacheTimeout: 鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)锛屽彇鍊艰寖鍥存槸1~3600
+	acceptDataMinInterval:鍥犱负涓婅鏁版嵁瀵嗗害杈冨ぇ锛堝10绉掍笂琛屼竴鏉℃暟鎹級锛屾暟鎹鐞嗕笌瀛樺偍鍘嬪姏澶э紝鎵�浠ユ渶灏忛棿闅斾竴瀹氭椂闂达紙鍒嗛挓锛夌湡姝f帴鏀跺鐞嗕竴鏉′笂琛屾暟鎹�
+	useMemoryPersistence 浣跨敤鍐呭瓨鎸佷箙鍖栬�岄潪榛樿鐨勬枃浠舵寔涔呭寲(true鏄� false鍚�)
+	protocolAndDeviceIds 鍦ㄥ瓙绯荤粺锛坥rgTag锛変腑鎺ュ叆鐨勮澶�(FBox)鎵�鐢ㄥ崗璁強璁惧id闆嗗悎,澶氫釜鐢ㄩ�楀彿闅斿紑锛屽崗璁笌ID鐢ㄦ鏂滄潬闅斿紑锛屼緥濡傦細sd1/338220031439,sd1/338220031440
+	subTopicAndQos: 璁㈤槄涓婚涓嶲os锛屼富棰樺悕涓庡叾Qos鐢ㄩ�楀彿闅斿紑锛屽涓富棰樺強Qos鐢ㄥ垎鍙烽殧寮�锛屼緥濡傦細ym/topic1,1;ym/topic2,1;ym/topic3,1锛屽鏋滄湁澶氫釜OrgTag锛屼富棰樺墠缂�鐢ㄥ叾OrgTag
+	pubTopicQos: 鍙戝竷涓婚鐨凲os锛屽彇鍊艰寖鍥达細
+		0	鑷冲涓�娆★紙At most once锛�	娑堟伅鍙戦�佸悗涓嶄繚璇佸埌杈撅紝鍙兘涓㈠け鎴栭噸澶嶏紝寮�閿�鏈�灏忥紝鍙潬鎬ф渶浣庛��
+    	1	鑷冲皯涓�娆★紙At least once锛�	娑堟伅鑷冲皯浼氬埌杈句竴娆★紝鍙兘閲嶅锛屼絾涓嶄細涓㈠け锛屽彲闈犳�т腑绛夛紝閫傜敤浜庡鏁板満鏅��
+    	2	鎭板ソ涓�娆★紙Exactly once锛�	娑堟伅浠呬細鍒拌揪涓�娆★紝涓嶉噸澶嶄笖涓嶄涪澶憋紝鍙潬鎬ф渶楂橈紝浣嗗紑閿�鏈�澶э紝瀹炵幇鏈�澶嶆潅銆�
+    noSubThenOff: MQtt璁惧鍦ㄤ竴瀹氭椂闂达紙鍒嗛挓锛夊悗鏈彂甯冩秷鎭紝璁や负璁惧绂荤嚎
+     -->
+	<mqtt enable="${mqtt.enable}"
+		  svIp="${mqtt.ip}"
+		  svPort="${mqtt.port}"
+		  svUserName="${mqtt.user}"
+		  svUserPassword="${mqtt.password}"
+		  poolMaxSize="10"
+		  sendInterval="60"
+		  reSendTimesByNoResult="0"
+		  comCacheTimeout="30"
+		  acceptDataMinInterval="60"
+		  useMemoryPersistence="true"
+		  protocolAndDeviceIds="${mqtt.protocolAndDeviceIds}"
+		  subTopicAndQos="${mqtt.subTopicAndQos}"
+		  pubTopicQos="1"
+		  noSubThenOff="${mqtt.noSubThenOff}"
+	/>
+
 </config>
\ No newline at end of file

--
Gitblit v1.8.0