From 39688299c37a4afc68afb705127948bf1e5e7e7f Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期四, 19 六月 2025 09:49:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 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 8403a73..da40d12 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 @@ -16,6 +16,19 @@ public String orgTag ;//缁勭粐鏍囪瘑 public String protocol ;//鍗忚鍚嶇О public String devId ;//璁惧锛團Box锛塈D - public String topic ;//娑堟伅涓婚 + public String type;//娴嬬珯绫诲瀷 + public Integer no;//娴嬬珯缂栧彿 + public boolean isEmpty(){ + 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 type + "/" + no; + } + + public String longName(){ + return orgTag + "/" + protocol + "/" + devId + "/" + type + "/" + no; + } } -- Gitblit v1.8.0