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/pSdV1/upVos/ManureVo.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java
index f6b5647..98acc81 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java
@@ -20,59 +20,72 @@
/**
* 鎼呮媽鏈�1鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
*/
- @JSONField(name = "鎼呮媽杩愯1")
+ @JSONField(alternateNames = {"鎼呮媽杩愯1", "stirRunning1"})
public Byte stirRunning1;//鎼呮媽1杩愯鐘舵��
/**
* 鎼呮媽鏈�2鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
* (褰撳墠澶х搴旂敤涓嶅瓨鍦�)
*/
- @JSONField(name = "鎼呮媽杩愯2")
+ @JSONField(alternateNames = {"鎼呮媽杩愯2", "stirRunning2"})
public Byte stirRunning2;//鎼呮媽2杩愯鐘舵��
/**
* 鎼呮媽鏈�3鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
* (褰撳墠澶х搴旂敤涓嶅瓨鍦�)
*/
- @JSONField(name = "鎼呮媽杩愯3")
+ @JSONField(alternateNames = {"鎼呮媽杩愯3", "stirRunning3"})
public Byte stirRunning3;//鎼呮媽3杩愯鐘舵��
/**
* 鎼呮媽鏈�4鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
* (褰撳墠澶х搴旂敤涓嶅瓨鍦�)
*/
- @JSONField(name = "鎼呮媽杩愯4")
+ @JSONField(alternateNames = {"鎼呮媽杩愯4", "stirRunning4"})
public Byte stirRunning4;//鎼呮媽4杩愯鐘舵��
/**
* 涓�涓按鑲ユ満鍙湁涓�涓敞鑲ユ车
*/
- @JSONField(name = "娉ㄨ偉杩愯")
+ @JSONField(alternateNames = {"娉ㄨ偉杩愯", "injectRunning"})
public Byte injectRunning ;//娉ㄨ偉杩愯鐘舵��
- @JSONField(name = "鐏屾簤杩愯")
+
+ @JSONField(alternateNames = {"鐏屾簤杩愯", "irrRunning"})
public Byte irrRunning ;//鐏屾簤杩愯鐘舵��
/**
* 1:娉ㄨ偉娉垫湁鏁呴殰銆�0:娉ㄨ偉娉垫病鏈夋晠闅�
*/
- @JSONField(name = "鎶ヨ")
+ @JSONField(alternateNames = {"鎶ヨ", "alarm"})
public Byte alarm ;//娉ㄨ偉娉垫晠闅�
/**
* 鑲ユ枡娴侀噺锛屽崟浣嶅崌
*/
- @JSONField(name = "鑲ユ枡娴侀噺")
+ @JSONField(alternateNames = {"鑲ユ枡娴侀噺", "manureFlow"})
public Float manureFlow ;
/**
* 鍗曚綅绉�
*/
- @JSONField(name = "娉ㄨ偉缁忚繃鏃堕棿")
+ @JSONField(alternateNames = {"娉ㄨ偉缁忚繃鏃堕棿", "manureTime"})
public Integer manureTime ;
/**
* 鍗曚綅绉�
*/
- @JSONField(name = "鎼呮媽缁忚繃鏃堕棿")
+ @JSONField(alternateNames = {"鎼呮媽缁忚繃鏃堕棿", "stirTime"})
public Integer stirTime ;
+
+ /**
+ * 鍗曚綅绉�
+ */
+ @JSONField(alternateNames = {"鎼呮媽璁惧畾鏃堕棿", "stirDuration"})
+ public Integer stirDuration ;
+
+ /**
+ * 鍗曚綅绉�
+ */
+ @JSONField(alternateNames = {"娉ㄨ偉璁惧畾鏃堕棿", "injectDuration"})
+ public Integer injectDuration ;
@JSONField(name = "flexem_timestamp")
public Long devDt ;//璁惧鏃堕棿
@@ -85,7 +98,7 @@
}
public String getDevDtStr() {
- if(devDt == null){
+ if(devDt != null){
return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
}else{
return "" ;
@@ -97,15 +110,20 @@
StringBuilder sb = new StringBuilder();
sb.append("姘磋偉鏁版嵁=>") ;
sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
- sb.append(" 鎼呮媽杩愯锛�" + stirRunning1 + ", ") ;
+ sb.append(" 鎼呮媽杩愯1锛�" + stirRunning1 + ", ") ;
+ sb.append(" 鎼呮媽杩愯2锛�" + stirRunning2 + ", ") ;
+ sb.append(" 鎼呮媽杩愯3锛�" + stirRunning3 + ", ") ;
+ sb.append(" 鎼呮媽杩愯4锛�" + stirRunning4 + ", ") ;
sb.append(" 娉ㄨ偉杩愯锛�" + injectRunning + ", ") ;
sb.append(" 鐏屾簤杩愯锛�" + irrRunning + ", ") ;
sb.append(" 鎶ヨ锛�" + alarm + ", ") ;
sb.append(" 鑲ユ枡娴侀噺锛�" + manureFlow + ", ") ;
sb.append(" 娉ㄨ偉缁忚繃鏃堕棿锛�" + manureTime + ", ") ;
sb.append(" 鎼呮媽缁忚繃鏃堕棿锛�" + stirTime + ", ") ;
+ sb.append(" 娉ㄨ偉璁惧畾鏃堕棿锛�" + injectDuration + ", ") ;
+ sb.append(" 鎼呮媽璁惧畾鏃堕棿锛�" + stirDuration + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr()) ;
sb.append("\n") ;
return sb.toString() ;
}
--
Gitblit v1.8.0