From 70f61b0638e32274d0e5f9b972ce2a18f139f1b4 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 12 六月 2025 09:51:30 +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 |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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 f038514..a2f9ae8 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
@@ -12,6 +12,18 @@
  */
 @Data
 public class ManureVo implements Vo4Up {
+    @JSONField(name = "flexem_message_id")
+    public Integer messageId ;//娑堟伅ID
+
+    @JSONField(name = "鑲ユ枡娴侀噺")
+    public Float manureFlow ;//鑲ユ枡娴侀噺
+
+    @JSONField(name = "娉ㄨ偉鏃堕暱")
+    public Integer manureTime ;//娉ㄨ偉鏃堕暱
+
+    @JSONField(name = "鎼呮媽鏃堕暱")
+    public Integer stirTime ;//鎼呮媽鏃堕暱
+
     @JSONField(name = "flexem_timestamp")
     public Long devDt ;//璁惧鏃堕棿
 
@@ -27,9 +39,13 @@
     @Override
     public String toString(){
         StringBuilder sb = new StringBuilder();
-        sb.append("姘磋偉鏁版嵁锛�") ;
-        sb.append(" 璁惧鏃堕棿锛�"+devDt) ;
-        sb.append(" 璁惧鏃堕棿锛�"+ this.getDevDtStr()) ;
+        sb.append("姘磋偉鏁版嵁=>") ;
+        sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
+        sb.append(" 鑲ユ枡娴侀噺锛�" + manureFlow + ", ") ;
+        sb.append(" 娉ㄨ偉鏃堕暱锛�" + manureTime + ", ") ;
+        sb.append(" 鎼呮媽鏃堕暱锛�" + stirTime + ", ") ;
+        sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
+        sb.append(" 璁惧鏃堕棿锛�" +  this.getDevDtStr() + ", ") ;
         sb.append("\n") ;
         return sb.toString() ;
     }

--
Gitblit v1.8.0