pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamKey.java
@@ -31,8 +31,12 @@ public static final String TcpPort = "tcpPort" ; public static final String UpDataMinInterval = "upDataMinInterval" ; public static final String WebPort = "webPort" ; public static final String MqttEnable = "mqttEnable" ; public static final String MqttNoSubThenOff = "noSubThenOff" ; public static final String ActutorPort = "actutorPort" ; public static final String DbName = "dbName" ; public static final String MqttEnable = "mqttEnable" ; public static final String MqttNoSubThenOff = "mqttNoSubThenOff" ; public static final String mqttServerIp = "mqttServerIp" ; public static final String mqttServerPort = "mqttServerPort" ; public static final String mqttProtocolAndDeviceIds = "mqttProtocolAndDeviceIds" ; public static final String mqttSubTopicAndQos = "mqttSubTopicAndQos" ; } 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 ; pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml
@@ -4,99 +4,143 @@ orgTag: ym tcpPort: 60000 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8070 actutorPort: 9070 dbName: pipIrr_ym mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: sp: orgTag: sp tcpPort: 62000 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8073 actutorPort: 9073 dbName: pipIrr_sp mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: test: orgTag: test tcpPort: 65000 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8072 actutorPort: 9072 dbName: pipIrr_test mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: mj: orgTag: mj tcpPort: 61000 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8071 actutorPort: 9071 dbName: pipIrr_mj mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: sv121: mq: orgTag: mq tcpPort: 60100 upDataMinInterval: 6 mqttEnable: true noSubThenOff: 10 webPort: 8100 actutorPort: 9100 dbName: pipIrr_mq mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: yq: orgTag: yq tcpPort: 60101 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8101 actutorPort: 9101 dbName: pipIrr_yq mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: hlj: orgTag: hlj tcpPort: 60102 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8102 actutorPort: 9102 dbName: pipIrr_hlj mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: gz: orgTag: gz tcpPort: 60103 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8103 actutorPort: 9103 dbName: pipIrr_gz mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: lz: orgTag: lz tcpPort: 60104 upDataMinInterval: 6 mqttEnable: false noSubThenOff: 10 webPort: 8104 actutorPort: 9104 dbName: pipIrr_lz mqttEnable: false mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: jc: orgTag: jc tcpPort: 60105 upDataMinInterval: 6 mqttEnable: true noSubThenOff: 10 webPort: 8105 actutorPort: 9105 dbName: pipIrr_jc mqttEnable: true mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: mqttSubTopicAndQos: jyg: orgTag: jyg tcpPort: 60106 upDataMinInterval: 6 mqttEnable: true noSubThenOff: 10 webPort: 8106 actutorPort: 9106 dbName: pipIrr_jyg mqttEnable: true mqttNoSubThenOff: 10 mqttServerIp: 127.0.0.1 mqttServerPort: 1883 mqttProtocolAndDeviceIds: sd1/2430002404000840,sd1/2430002404000840 mqttSubTopicAndQos: weather/1,1;soil/1,1;manure/1,1
