From 6b828ba1310db528aa8172bd14a0253ebca5a844 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 10 六月 2025 18:34:29 +0800
Subject: [PATCH] 基于mqtt的水肥机、气象站、墒情站协议、功能模块继续开发

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
index 08e4d72..b692e83 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
@@ -10,7 +10,7 @@
 #   鐢樺窞锛� gz
 #   鍑夊窞锛� lz
 #   閲戝窛锛� jc
-base.orgTag=ym
+base.orgTag=mq
 
 # 233鏈嶅姟鍣細
 #   鍏冭皨锛� 60000
@@ -30,19 +30,23 @@
 base.upData.min.interval=6
 
 # MQTT鏈嶅姟閰嶇疆
+#   mqtt.enable 鏄惁鍚姩
+#   mqtt.protocolAndDeviceIds 鍦ㄥ瓙绯荤粺锛坥rgTag锛変腑鎺ュ叆鐨勮澶�(FBox)鎵�鐢ㄥ崗璁強璁惧id闆嗗悎,澶氫釜鐢ㄩ�楀彿闅斿紑锛屽崗璁笌ID鐢ㄦ鏂滄潬闅斿紑锛屼緥濡傦細sd1/338220031439,sd1/338220031440
+#   mqtt.subTopicAndQos 璁㈤槄涓婚涓嶲os锛屼富棰樺悕涓庡叾Qos鐢ㄩ�楀彿闅斿紑锛屽涓富棰樺強Qos鐢ㄥ垎鍙烽殧寮�锛屼緥濡傦細topic1,1;topic2,1;topic3,1
 # 233鏈嶅姟鍣細
-#   鍏冭皨锛� mqtt.enable=false
-#   娌欑洏锛� mqtt.enable=false
-#   娴嬭瘯锛� mqtt.enable=false
-#   姊呮睙锛� mqtt.enable=false
+#   鍏冭皨锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
+#   娌欑洏锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
+#   娴嬭瘯锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
+#   姊呮睙锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
 # 121鏈嶅姟鍣細
-#   姘戝嫟锛� mqtt.enable=true
-#   寤跺簡锛� mqtt.enable=false
-#   榛戦緳姹燂細 mqtt.enable=false
-#   鐢樺窞锛� mqtt.enable=false
-#   鍑夊窞锛� mqtt.enable=false
-#   閲戝窛锛� mqtt.enable=true
-# mq/sd1/338220031439/weather
+#   姘戝嫟锛� mqtt.enable=true  mqtt.protocolAndDeviceIds=? mqtt.topicAndQos=weather,1;soil,1;manure,1;state,1
+#   寤跺簡锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
+#   榛戦緳姹燂細 mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
+#   鐢樺窞锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
+#   鍑夊窞锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
+#   閲戝窛锛� mqtt.enable=true  mqtt.protocolAndDeviceIds=? mqtt.topicAndQos=weather,1;soil,1;manure,1;state,1
 mqtt.enable=true
-mqtt.topicAndQos=ym/sd1/10000/control/m1,1;ym/sd1/10000/control/m2,1;ym/sd1/control/m4,1;ym/sd1/10000/control/m80,1
-
+mqtt.protocolAndDeviceIds=sd1/338220031439,sd1/338220031440
+mqtt.subTopicAndQos=weather,1;soil,1;manure,1;state,1
+#MQtt璁惧鍦ㄤ竴瀹氭椂闂达紙鍒嗛挓锛夊悗鏈彂甯冩秷鎭紝璁や负璁惧绂荤嚎
+mqtt.noSubThenOff=10

--
Gitblit v1.8.0