From b2c928eac40c4b7f495f8164eeb59005219fa350 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 六月 2025 17:55:29 +0800
Subject: [PATCH] 1、MQTT协议，增加设备参数命令及相关数据； 2、完善上行数据值对象； 3、完善其他代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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 03d1e8d..c654c22 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
@@ -2,8 +2,12 @@
import com.dy.common.mw.protocol4Mqtt.MqttPubMsg;
import com.dy.common.mw.protocol4Mqtt.MqttSubMsg;
+import com.dy.common.mw.protocol4Mqtt.MqttTopic;
+import com.dy.common.mw.protocol4Mqtt.pSdV1.upVos.StateVo;
+import com.dy.common.mw.protocol4Mqtt.Vo4Up;
import com.dy.common.util.Callback;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @Author: liurunyu
@@ -11,16 +15,17 @@
* @Description 鏀跺埌鐨勮闃呮秷鎭�
*/
@Data
+@EqualsAndHashCode(callSuper=false)
public class MqttSubMsgSdV1 extends MqttSubMsg {
- public Integer address ;//瀵勫瓨鍣ㄥ湴鍧�
- public String value ;//瀵勫瓨鍣ㄥ��
+ public Vo4Up vo4Up;//璁㈤槄鐨勬秷鎭暟鎹�煎璞�
public MqttSubMsgSdV1(){}
- public MqttSubMsgSdV1(String deviceId, String topic, String msg) {
- this.deviceId = deviceId ;
- this.topic = topic ;
- this.msg = msg ;
+ public MqttSubMsgSdV1(MqttTopic subTopic, String msg) {
+ this.deviceId = subTopic.devId ;
+ this.protocol = subTopic.protocol ;
+ this.topic = subTopic ;
+ this.metaData = msg ;
}
public String toString(){
StringBuilder sb = new StringBuilder();
@@ -30,19 +35,25 @@
.append("\n") ;
}
sb.append("涓婚:")
- .append(topic)
+ .append(topic.longName())
.append("\n") ;
- sb.append("娑堟伅:")
- .append(msg)
- .append("\n") ;
-
+ if(vo4Up != null){
+ sb.append("鏁版嵁:")
+ .append(vo4Up.toString())
+ .append("\n") ;
+ }else{
+ sb.append("鍏冩暟鎹�:")
+ .append(metaData)
+ .append("\n") ;
+ }
return sb.toString() ;
}
public boolean subMsgMatchPubMsg(MqttPubMsg pubMsg){
if (pubMsg instanceof MqttPubMsgSdV1) {
- MqttPubMsgSdV1 pubMsgSdV1 = (MqttPubMsgSdV1) pubMsg;
- if(this.address.intValue() == pubMsgSdV1.getAddress().intValue()){
+ //MqttPubMsgSdV1 pubMsgSdV1 = (MqttPubMsgSdV1) pubMsg;
+ if(this.vo4Up != null && this.vo4Up instanceof StateVo){
+ //鍙涓婃姤鐨勬槸鐘舵�佹暟鎹紝璇存槑璁惧鍝嶅簲浜嗗懡浠�
return true ;
}
}
@@ -54,7 +65,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