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/protocol/Command.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
index f7334b8..f7b490a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
@@ -41,7 +41,7 @@
public Short protocolVersion;
/**
- * RTU 鍦板潃
+ * RTU鍦板潃 鍜� FBox璁惧鍙�
*/
public String rtuAddr ;
@@ -76,7 +76,12 @@
s += (protocol == null ? "" : ("鍗忚=" + protocol + "\n"));
s += (protocolVersion == null ? "" : ("鍗忚鐗堟湰鍙�=" + protocolVersion + "\n"));
s += (rtuAddr == null ? "" : ("Rtu鍦板潃=" + rtuAddr + "\n"));
- s += "鍛戒护绫诲瀷=" + (type.equals(CommandType.innerCommand)?"鍐呴儴鍛戒护":"RTU鍛戒护") + "\n" ;
+ s += "鍛戒护绫诲瀷=" + (
+ type.equals(CommandType.innerCommand)?"鍐呴儴鍛戒护":(
+ type.equals(CommandType.outerCommand)?"RTU鍛戒护":(
+ type.equals(CommandType.mqttCommand)?"MQTT鍛戒护":(
+ type.equals(CommandType.outerTransCommand)?"閫忎紶鍛戒护":
+ "")))) + "\n" ;
s += (code == null ? "" : ("鍔熻兘鐮�=" + code + "\n")) ;
s += (rtuResultSendWebUrl == null ? "" : ("鍥炶皟缃戝潃=" + rtuResultSendWebUrl + "\n"));
if(param != null){
--
Gitblit v1.8.0