From 566d6dba9ac3309a716efa43ecbeaaf09e46e394 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 16:33:48 +0800
Subject: [PATCH] 表阀一体机协议增加35、36、37、38、9D功能码协议实现
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java
index 67b1245..697991e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java
@@ -14,20 +14,21 @@
@AllArgsConstructor
public class MqttTopic {
public String orgTag ;//缁勭粐鏍囪瘑
- public String protocol ;//鍗忚鍚嶇О
- public String devId ;//璁惧锛團Box锛塈D
- public String topic ;//娑堟伅涓婚
+ public String protocol ;//鍗忚鍚嶇О(鍚嶇О+鐗堟湰)
+ public String devId ;//璁惧ID(FBox搴忓垪鍙�)
+ public String type;//鏁版嵁锛堝懡浠わ級绫诲瀷
+ public Integer no;//娴嬬珯缂栧彿
public boolean isEmpty(){
- return orgTag == null || protocol == null || devId == null || topic == null
- || orgTag.trim().length() == 0 || protocol.trim().length() == 0 || devId.trim().length() == 0 || topic.trim().length() == 0 ;
+ return orgTag == null || protocol == null || devId == null || type == null || no == null
+ || orgTag.trim().length() == 0 || protocol.trim().length() == 0 || devId.trim().length() == 0 || type.trim().length() == 0 || no <= 0 ;
}
public String shortName(){
- return topic ;
+ return type + "/" + no;
}
public String longName(){
- return orgTag + "/" + protocol + "/" + devId + "/" + topic ;
+ return orgTag + "/" + protocol + "/" + devId + "/" + type + "/" + no;
}
}
--
Gitblit v1.8.0