From 431bbfaddba9f39496359bc0c1e2dcaf2bb6fca2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 23 六月 2025 15:09:04 +0800
Subject: [PATCH] 采用模拟软件MQTTX进行模拟测试,发现并修改MQTT相关水肥机上行数据与下行命令逻辑bug.

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttPubMsg.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttPubMsg.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttPubMsg.java
index bd864d3..2c1c6f1 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttPubMsg.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttPubMsg.java
@@ -1,23 +1,37 @@
 package com.dy.common.mw.protocol4Mqtt;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * @Author: liurunyu
  * @Date: 2025/6/5 11:44
  * @Description
  */
-public abstract class MqttPubMsg {
+@Data
+public class MqttPubMsg {
     public String commandId ;//鍛戒护ID
+
+    public String cd ;//鍔熻兘鐮�
 
     public String deviceId ;//璁惧ID
 
     public String mqttResultSendWebUrl ;//Mqtt杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
 
-    public String topic ;//娑堟伅涓婚
+    public MqttTopic topic ;//娑堟伅涓婚
     public String msg ;//娑堟伅
 
     public boolean isCacheForOffLine ;//涓嬭鍛戒护鎺у埗锛屾秷鎭腑闂翠欢涓嶅湪绾挎槸鍚︾紦瀛樺懡浠�
     public boolean hasResponse ;//涓嬭鍛戒护鎺у埗锛屽懡浠ゆ槸鍚︽湁搴旂瓟
 
-    public abstract boolean valid();
+    public boolean valid(){
+        if (topic == null || topic.isEmpty()) {
+            return false;
+        }
+        if (msg == null || msg.isEmpty()) {
+            return false;
+        }
+        return true;
+    }
 
 }

--
Gitblit v1.8.0