From 9a332594f1efa890997f9ba8d3a4d964f1b68b72 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 六月 2025 08:57:39 +0800
Subject: [PATCH] 1、中间件设备日志文件针对FBox设备优化；2、表阀一体机功能码92返回结果判断bug修改；3、remote模块中实现表阀一体机协议的功能码9D(正常远程关阀)。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/MqttPubMsg.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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..89e4058 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 deviceId ;//璁惧ID
+ public String cd ;//鍔熻兘鐮�
+
+ public String deviceId ;//璁惧ID(FBox搴忓垪鍙�)
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