From 5a83f5e163ae7fe61c639eefba73d7e7fc37b4e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 11:48:50 +0800
Subject: [PATCH] 参数设置器,增加不肥机MQTT相关设置部分

---
 pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java
index b5234a5..18a1dc2 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java
@@ -123,6 +123,14 @@
                     newLine = "base.upData.min.interval=" + paramMap.get(ParamKey.UpDataMinInterval);
                 }else if(newLine != null && newLine.trim().startsWith("mqtt.enable=")){
                     newLine = "mqtt.enable=" + paramMap.get(ParamKey.MqttEnable);
+                }else if(newLine != null && newLine.trim().startsWith("mqtt.ip=")){
+                    newLine = "mqtt.ip=" + paramMap.get(ParamKey.mqttServerIp);
+                }else if(newLine != null && newLine.trim().startsWith("mqtt.port=")){
+                    newLine = "mqtt.port=" + paramMap.get(ParamKey.mqttServerPort);
+                }else if(newLine != null && newLine.trim().startsWith("mqtt.protocolAndDeviceIds=")){
+                    newLine = "mqtt.protocolAndDeviceIds=" + paramMap.get(ParamKey.mqttProtocolAndDeviceIds);
+                }else if(newLine != null && newLine.trim().startsWith("mqtt.subTopicAndQos=")){
+                    newLine = "mqtt.subTopicAndQos=" + paramMap.get(ParamKey.mqttSubTopicAndQos);
                 }else if(newLine != null && newLine.trim().startsWith("mqtt.noSubThenOff=")){
                     newLine = "mqtt.noSubThenOff=" + paramMap.get(ParamKey.MqttNoSubThenOff);
                 }
@@ -154,16 +162,28 @@
         key = ParamKey.WebPort;
         this.getConfig(env, map, paramNamePre + key, key);
 
+        key = ParamKey.ActutorPort;
+        this.getConfig(env, map, paramNamePre + key, key);
+
+        key = ParamKey.DbName;
+        this.getConfig(env, map, paramNamePre + key, key);
+
         key = ParamKey.MqttEnable;
         this.getConfig(env, map, paramNamePre + key, key);
 
         key = ParamKey.MqttNoSubThenOff;
         this.getConfig(env, map, paramNamePre + key, key);
 
-        key = ParamKey.ActutorPort;
+        key = ParamKey.mqttProtocolAndDeviceIds;
         this.getConfig(env, map, paramNamePre + key, key);
 
-        key = ParamKey.DbName;
+        key = ParamKey.mqttServerIp;
+        this.getConfig(env, map, paramNamePre + key, key);
+
+        key = ParamKey.mqttServerPort;
+        this.getConfig(env, map, paramNamePre + key, key);
+
+        key = ParamKey.mqttSubTopicAndQos;
         this.getConfig(env, map, paramNamePre + key, key);
 
         return map ;

--
Gitblit v1.8.0