From 5c514cf50eb825b02c839b5b0e6ba2a5880586bd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 10:52:00 +0800
Subject: [PATCH] 基于酒泉水肥机FBox配置,进行协议与值对象等调整

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 9244e7f..10e0875 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
@@ -15,16 +15,28 @@
     @JSONField(name = "flexem_message_id")
     public Integer messageId ;//娑堟伅ID
 
-    public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏朵腑涓婚涓�
+    public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
+
+    @JSONField(name = "鎼呮媽杩愯")
+    public Byte stirRunning ;//鎼呮媽杩愯
+
+    @JSONField(name = "娉ㄨ偉杩愯")
+    public Byte injectRunning ;//娉ㄨ偉杩愯
+
+    @JSONField(name = "鐏屾簤杩愯")
+    public Byte irrRunning ;//鐏屾簤杩愯
+
+    @JSONField(name = "鎶ヨ")
+    public Byte alarm ;//鎶ヨ
 
     @JSONField(name = "鑲ユ枡娴侀噺")
-    public Float manureFlow ;//鑲ユ枡娴侀噺
+    public Float manureFlow ;
 
-    @JSONField(name = "娉ㄨ偉鏃堕暱")
-    public Integer manureTime ;//娉ㄨ偉鏃堕暱
+    @JSONField(name = "娉ㄨ偉缁忚繃鏃堕棿")
+    public Integer manureTime ;
 
-    @JSONField(name = "鎼呮媽鏃堕暱")
-    public Integer stirTime ;//鎼呮媽鏃堕暱
+    @JSONField(name = "鎼呮媽缁忚繃鏃堕棿")
+    public Integer stirTime ;
 
     @JSONField(name = "flexem_timestamp")
     public Long devDt ;//璁惧鏃堕棿
@@ -49,9 +61,13 @@
         StringBuilder sb = new StringBuilder();
         sb.append("姘磋偉鏁版嵁=>") ;
         sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
+        sb.append(" 鎼呮媽杩愯锛�" + stirRunning + ", ") ;
+        sb.append(" 娉ㄨ偉杩愯锛�" + injectRunning + ", ") ;
+        sb.append(" 鐏屾簤杩愯锛�" + irrRunning + ", ") ;
+        sb.append(" 鎶ヨ锛�" + alarm + ", ") ;
         sb.append(" 鑲ユ枡娴侀噺锛�" + manureFlow + ", ") ;
-        sb.append(" 娉ㄨ偉鏃堕暱锛�" + manureTime + ", ") ;
-        sb.append(" 鎼呮媽鏃堕暱锛�" + stirTime + ", ") ;
+        sb.append(" 娉ㄨ偉缁忚繃鏃堕棿锛�" + manureTime + ", ") ;
+        sb.append(" 鎼呮媽缁忚繃鏃堕棿锛�" + stirTime + ", ") ;
         sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
         sb.append(" 璁惧鏃堕棿锛�" +  this.getDevDtStr() + ", ") ;
         sb.append("\n") ;

--
Gitblit v1.8.0