From 62afcbeaa5cc328bff01ae1facb18a6b8c03c5bc Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 24 六月 2025 16:57:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 b72f3d0..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 ;//璁惧鏃堕棿
@@ -107,6 +120,8 @@
sb.append(" 鑲ユ枡娴侀噺锛�" + manureFlow + ", ") ;
sb.append(" 娉ㄨ偉缁忚繃鏃堕棿锛�" + manureTime + ", ") ;
sb.append(" 鎼呮媽缁忚繃鏃堕棿锛�" + stirTime + ", ") ;
+ sb.append(" 娉ㄨ偉璁惧畾鏃堕棿锛�" + injectDuration + ", ") ;
+ sb.append(" 鎼呮媽璁惧畾鏃堕棿锛�" + stirDuration + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr()) ;
sb.append("\n") ;
--
Gitblit v1.8.0