From 17258f1e704c8e91fdcc4fce33eee9a1f827d71b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 11:23:38 +0800
Subject: [PATCH] 通信中间件，水肥机相关修改bug，优化配置
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 9e9b323..abe6d4b 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,7 +38,7 @@
dbDataIdSuffix="0"
cacheUpDownDataWarnCount="100000"
cacheUpDownDataMaxCount="110000"
- disconnectedByNoUpDataMinutes="3"
+ disconnectedByNoUpDataMinutes="${base.upData.min.interval}"
workReportDealOneByTimes="1"
intakeAlarmLossMinValue="1.0"
sendDingDingAlarmMsInterval="60"
@@ -159,9 +159,38 @@
idle: 鍙戝憜鏃堕暱锛堢锛�
-->
<tcp enable="true"
- port="60000"
+ port="${tcp.port}"
processors="3"
idle="10"
/>
+
+ <!--
+ enable 鏄惁鍚姩
+ svIp MQTT鏈嶅姟鍣↖P
+ svUserName MQTT鏈嶅姟鍣ㄧ敤鎴峰悕
+ svUserPassword MQTT鏈嶅姟鍣ㄧ敤鎴峰瘑鐮�
+ poolMaxSize 杩炴帴姹犳渶澶ц繛鎺ユ暟
+ 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"
+ useMemoryPersistence="true"
+ protocolAndDeviceIds="${mqtt.protocolAndDeviceIds}"
+ subTopicAndQos="${mqtt.subTopicAndQos}"
+ pubTopicQos="1"
+ noSubThenOff="${mqtt.noSubThenOff}"
+ />
+
</config>
\ No newline at end of file
--
Gitblit v1.8.0