From 5fefff8c747cbf5d526f6108a215bd813ac36034 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 六月 2025 13:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java
index 001b8c3..9615da3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java
@@ -24,8 +24,8 @@
public MqttSubMsgSdV1(MqttTopic subTopic, String msg) {
this.deviceId = subTopic.devId ;
this.protocol = subTopic.protocol ;
- this.topic = subTopic.topic ;
- this.msg = msg ;
+ this.topic = subTopic ;
+ this.metaData = msg ;
}
public String toString(){
StringBuilder sb = new StringBuilder();
@@ -35,17 +35,17 @@
.append("\n") ;
}
sb.append("涓婚:")
- .append(topic)
- .append("\n") ;
- sb.append("娑堟伅:")
- .append(msg)
+ .append(topic.longName())
.append("\n") ;
if(vo4Up != null){
sb.append("鏁版嵁:")
.append(vo4Up.toString())
.append("\n") ;
+ }else{
+ sb.append("鍏冩暟鎹�:")
+ .append(metaData)
+ .append("\n") ;
}
-
return sb.toString() ;
}
@@ -64,7 +64,7 @@
if (topic == null || topic.isEmpty()) {
return false;
}
- if (msg == null || msg.isEmpty()) {
+ if (metaData == null || metaData.isEmpty()) {
return false;
}
return true;
--
Gitblit v1.8.0