From e9d04864135236c8b39b06f62d001631524197e6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 17:02:58 +0800
Subject: [PATCH] 1、协议细化，处理小数； 2、水肥机、气象站、墒情站实体增加属性fboxId(FBox序列号)；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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 10e0875..f6b5647 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
@@ -17,24 +17,60 @@
public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
- @JSONField(name = "鎼呮媽杩愯")
- public Byte stirRunning ;//鎼呮媽杩愯
+ /**
+ * 鎼呮媽鏈�1鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
+ */
+ @JSONField(name = "鎼呮媽杩愯1")
+ public Byte stirRunning1;//鎼呮媽1杩愯鐘舵��
+ /**
+ * 鎼呮媽鏈�2鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
+ * (褰撳墠澶х搴旂敤涓嶅瓨鍦�)
+ */
+ @JSONField(name = "鎼呮媽杩愯2")
+ public Byte stirRunning2;//鎼呮媽2杩愯鐘舵��
+ /**
+ * 鎼呮媽鏈�3鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
+ * (褰撳墠澶х搴旂敤涓嶅瓨鍦�)
+ */
+ @JSONField(name = "鎼呮媽杩愯3")
+ public Byte stirRunning3;//鎼呮媽3杩愯鐘舵��
+ /**
+ * 鎼呮媽鏈�4鏄惁杩愯锛涳紙姘磋偉鏈鸿繕鍙瓨鍦ㄦ悈鎷屾満2銆佹悈鎷屾満3銆佹悈鎷屾満4 ......锛� 杩愯鏃�1锛屽仠姝�0.
+ * (褰撳墠澶х搴旂敤涓嶅瓨鍦�)
+ */
+ @JSONField(name = "鎼呮媽杩愯4")
+ public Byte stirRunning4;//鎼呮媽4杩愯鐘舵��
+ /**
+ * 涓�涓按鑲ユ満鍙湁涓�涓敞鑲ユ车
+ */
@JSONField(name = "娉ㄨ偉杩愯")
- public Byte injectRunning ;//娉ㄨ偉杩愯
+ public Byte injectRunning ;//娉ㄨ偉杩愯鐘舵��
@JSONField(name = "鐏屾簤杩愯")
- public Byte irrRunning ;//鐏屾簤杩愯
+ public Byte irrRunning ;//鐏屾簤杩愯鐘舵��
+ /**
+ * 1:娉ㄨ偉娉垫湁鏁呴殰銆�0:娉ㄨ偉娉垫病鏈夋晠闅�
+ */
@JSONField(name = "鎶ヨ")
- public Byte alarm ;//鎶ヨ
+ public Byte alarm ;//娉ㄨ偉娉垫晠闅�
+ /**
+ * 鑲ユ枡娴侀噺锛屽崟浣嶅崌
+ */
@JSONField(name = "鑲ユ枡娴侀噺")
public Float manureFlow ;
+ /**
+ * 鍗曚綅绉�
+ */
@JSONField(name = "娉ㄨ偉缁忚繃鏃堕棿")
public Integer manureTime ;
+ /**
+ * 鍗曚綅绉�
+ */
@JSONField(name = "鎼呮媽缁忚繃鏃堕棿")
public Integer stirTime ;
@@ -61,7 +97,7 @@
StringBuilder sb = new StringBuilder();
sb.append("姘磋偉鏁版嵁=>") ;
sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
- sb.append(" 鎼呮媽杩愯锛�" + stirRunning + ", ") ;
+ sb.append(" 鎼呮媽杩愯锛�" + stirRunning1 + ", ") ;
sb.append(" 娉ㄨ偉杩愯锛�" + injectRunning + ", ") ;
sb.append(" 鐏屾簤杩愯锛�" + irrRunning + ", ") ;
sb.append(" 鎶ヨ锛�" + alarm + ", ") ;
--
Gitblit v1.8.0