From 0c870ae5b2af348e19b10cc1a99f103f95c5a1cc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 六月 2025 11:47:09 +0800
Subject: [PATCH] 1、通信中间件重构MQTT相关下行命令的逻辑； 2、remote模块完善MQTT相关下行命令解除报警、搅拌启停、注肥启停、灌溉启停功能类；

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 3d08c73..174c558 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,6 +10,7 @@
 #   鐢樺窞锛� gz
 #   鍑夊窞锛� lz
 #   閲戝窛锛� jc
+#   鍢夊唱鍏筹細 jyg
 base.orgTag=ym
 
 # 233鏈嶅姟鍣細
@@ -24,7 +25,8 @@
 #   鐢樺窞锛� 60103
 #   鍑夊窞锛� 60104
 #   閲戝窛锛� 60105
-tcp.port=60000ba_divide
+#   鍢夊唱鍏筹細 60106
+tcp.port=60000
 
 #RTU涓婅鏁版嵁鏈�灏忛棿闅旓紝澶т簬杩欎釜闂撮殧璁や负璁惧绂荤嚎浜嗭紝娴嬫帶涓�浣撻榾鏄�3锛岃〃闃�涓�浣撴満鏄�6锛岄粯璁ら噰鐢ㄦ椂闂存渶闀跨殑6
 base.upData.min.interval=6
@@ -45,8 +47,13 @@
 #   鐢樺窞锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
 #   鍑夊窞锛� mqtt.enable=false  mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
 #   閲戝窛锛� mqtt.enable=true  mqtt.protocolAndDeviceIds=? mqtt.topicAndQos=weather/1,1;soil/1,1;manure/1,1;state/1,1
-mqtt.enable=false
-mqtt.protocolAndDeviceIds=sd1/338220031439,sd1/338220031440
-mqtt.subTopicAndQos=weather/1,1;soil/1,1;manure/1,1;state/1,1
+#   鍢夊唱鍏筹細 mqtt.enable=true  mqtt.protocolAndDeviceIds=? mqtt.topicAndQos=weather/1,1;soil/1,1;manure/1,1;state/1,1
+mqtt.enable=true
+mqtt.ip=121.199.41.121
+mqtt.port=1883
+mqtt.user=dyyjy
+mqtt.password=Dyyjy2025,;.abc!@#
+mqtt.protocolAndDeviceIds=sd1/123456789
+mqtt.subTopicAndQos=weather/1,1;soil/1,1;manure/1,1
 #MQtt璁惧鍦ㄤ竴瀹氭椂闂达紙鍒嗛挓锛夊悗鏈彂甯冩秷鎭紝璁や负璁惧绂荤嚎
 mqtt.noSubThenOff=10

--
Gitblit v1.8.0