From 21de9eefe1a98ba0f154febf268d551600deff04 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 23 六月 2025 17:25:16 +0800
Subject: [PATCH] 1、配置文件增加MQTT远程命令结果回调URL; 2、MQTT远程命令bug修改; 3、增加两说明文档; 4、配置文件规范。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttTopic.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 d088e08..5bc518e 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,18 +16,19 @@
     public String orgTag ;//缁勭粐鏍囪瘑
     public String protocol ;//鍗忚鍚嶇О
     public String devId ;//璁惧锛團Box锛塈D
-    public String name;//娑堟伅涓婚鏈鍚嶇О
+    public String type;//鏁版嵁锛堝懡浠わ級绫诲瀷
+    public Integer no;//娴嬬珯缂栧彿
 
     public boolean isEmpty(){
-        return orgTag == null || protocol == null || devId == null || name == null
-                || orgTag.trim().length() == 0 || protocol.trim().length() == 0 || devId.trim().length() == 0 || name.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 name;
+        return type + "/" + no;
     }
 
     public String longName(){
-        return orgTag + "/" + protocol + "/" + devId + "/" + name;
+        return orgTag + "/" + protocol + "/" + devId + "/" + type + "/" + no;
     }
 }

--
Gitblit v1.8.0