From d9d08181a94d727a4fe5933ac9efd1ff5c8a7c5a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 16 七月 2025 13:49:13 +0800
Subject: [PATCH] 中间件修改内容： 1、当没农业综合站时即没相关配置项目内容为空时，启动时会产生bug； 2、整理优化代码。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java
index 3c775b5..1c92e9d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java
@@ -1,9 +1,17 @@
package com.dy.rtuMw.server.mqtt;
import com.dy.common.mw.channel.mqtt.MqttClientPool;
+import com.dy.common.mw.protocol4Mqtt.MqttNotify;
+import com.dy.common.mw.protocol4Mqtt.MqttNotifyInfo;
+import com.dy.common.mw.protocol4Mqtt.status.DevOnLineInfo;
+import com.dy.common.mw.protocol4Mqtt.status.DevRunInfo;
+import com.dy.rtuMw.server.ServerProperties;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.eclipse.paho.client.mqttv3.MqttClient;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* @Author: liurunyu
@@ -20,6 +28,8 @@
private MqttClientPool pool;
+ private List<MqttClient> subClients ;
+
private MqttManager(){
}
@@ -33,13 +43,18 @@
this.configVo = configVo;
}
+ /**
+ * 鍒涘缓杩炴帴姹� + 璁㈤槄涓婚
+ * @throws Exception
+ */
public void start()throws Exception{
+ subClients = new ArrayList<>();
String URL = "tcp://" + this.configVo.svIp + ":" + this.configVo.svPort;
- this.pool = new MqttClientPool(URL, this.configVo.svUserName, this.configVo.svUserPassword, this.configVo.poolMaxSize);
+ this.pool = new MqttClientPool(URL, this.configVo.svUserName, this.configVo.svUserPassword, this.configVo.poolMaxSize, this.configVo.useMemoryPersistence);
if(this.pool.isClose()){
throw new Exception("Mqtt杩炴帴姹犲垵濮嬪寲澶辫触");
}
- MqttClient clientSub = null ;
+ MqttClient clientSub ;
try {
clientSub = pool.popClient();//鏂板垱寤轰竴涓狢lient鏃讹紝姝lient瀹為檯鍘昏繛鎺QTT鏈嶅姟鍣紝濡傛灉杩炴帴涓嶄笂锛屽氨浼氭姏鍑哄紓甯�
}catch (Exception e){
@@ -48,12 +63,57 @@
if(clientSub == null || !clientSub.isConnected()){
throw new Exception("Mqtt杩炴帴姹犺幏寰楄闃呰繛鎺ヤ笉鍙敤");
}
- for(int i = 0; i < this.configVo.subTopics.length; i++){
- clientSub.subscribe(this.configVo.subTopics[i], this.configVo.topicsQos[i], new MqttMessageListener());
+ subClients.add(clientSub) ;
+
+ // 璁㈤槄涓婚
+ if(this.configVo.subTopics != null && this.configVo.subTopics.length > 0){
+ if(this.configVo.protocolAndDeviceIds != null || this.configVo.protocolAndDeviceIds.length > 0){
+ for(int i = 0; i < this.configVo.subTopics.length; i++){
+ for(int j = 0 ; j < this.configVo.protocolAndDeviceIds.length; j++){
+ clientSub.subscribe(ServerProperties.orgTag + "/"
+ + this.configVo.protocolAndDeviceIds[j] + "/"
+ + this.configVo.subTopics[i],
+ this.configVo.subTopicsQos[i],
+ //姣忎竴涓闃呬富棰橀兘鏈変竴涓狹qttMessageListener瀹炰緥
+ new MqttMessageListener(new MqttNotify(){
+ @Override
+ public void notify(String devId, MqttNotifyInfo... infos) {
+ if(devId != null && infos != null && infos.length > 0){
+ for(MqttNotifyInfo info : infos){
+ if(info instanceof DevOnLineInfo){
+ DevOnLineInfo onLineSt = (DevOnLineInfo)info;
+ if(onLineSt.onLine != null && onLineSt.onLine.booleanValue()){
+ DevStatusDealer.onLine(devId, ((DevOnLineInfo)info).protocol);
+ }else{
+ DevStatusDealer.offLine(devId);
+ }
+ } else if(info instanceof DevRunInfo){
+ DevStatusDealer.setStatus(devId, (DevRunInfo)info);
+ }
+ }
+ }
+ }
+ })
+ );
+ }
+ }
+ }
}
}
public void stop()throws Exception{
+ if(subClients != null && subClients.size() > 0){
+ for (MqttClient client : subClients) {
+ if(client != null && client.isConnected()){
+ try{
+ client.disconnect();
+ client.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }
+ }
if(this.pool != null){
// 鍏抽棴杩炴帴姹�
this.pool.close();
@@ -69,12 +129,12 @@
}
public void publishMsg(MqttClient client, String topic, byte[] msg) throws Exception{
- client.publish(topic, msg, this.configVo.publishQos, false);
+ client.publish(topic, msg, this.configVo.pubTopicQos, false);
}
public void publishMsg(MqttClient client, String topic, String msg) throws Exception{
byte[] bs = msg.getBytes("UTF-8") ;
- client.publish(topic, bs, this.configVo.publishQos, false);
+ client.publish(topic, bs, this.configVo.pubTopicQos, false);
}
public boolean poolIsClose(){
--
Gitblit v1.8.0