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/SoilVo.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java
index a465609..f5bb1e0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java
@@ -12,6 +12,33 @@
*/
@Data
public class SoilVo implements Vo4Up {
+ @JSONField(name = "flexem_message_id")
+ public Integer messageId ;//娑堟伅ID
+
+ @JSONField(name = "鍦熷￥婀垮害1")
+ public Float soilHumidity1 ;//鍦熷￥婀垮害1
+
+ @JSONField(name = "鍦熷￥婀垮害2")
+ public Float soilHumidity2 ;//鍦熷￥婀垮害2
+
+ @JSONField(name = "鍦熷￥婀垮害3")
+ public Float soilHumidity3 ;//鍦熷￥婀垮害3
+
+ @JSONField(name = "鍦熷￥婀垮害4")
+ public Float soilHumidity4 ;//鍦熷￥婀垮害4
+
+ @JSONField(name = "鍦熷￥婀垮害1")
+ public Float soilTemperature1 ;//鍦熷￥娓╁害1
+
+ @JSONField(name = "鍦熷￥娓╁害2")
+ public Float soilTemperature2 ;//鍦熷￥娓╁害2
+
+ @JSONField(name = "鍦熷￥娓╁害3")
+ public Float soilTemperature3 ;//鍦熷￥娓╁害3
+
+ @JSONField(name = "鍦熷￥娓╁害4")
+ public Float soilTemperature4 ;//鍦熷￥娓╁害4
+
@JSONField(name = "flexem_timestamp")
public Long devDt ;//璁惧鏃堕棿
@@ -27,10 +54,20 @@
@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(" 鍦熷￥婀垮害1锛�" + soilHumidity1 + ", ") ;
+ sb.append(" 鍦熷￥婀垮害2锛�" + soilHumidity2 + ", ") ;
+ sb.append(" 鍦熷￥婀垮害3锛�" + soilHumidity3 + ", ") ;
+ sb.append(" 鍦熷￥婀垮害4锛�" + soilHumidity4 + ", ") ;
+ sb.append(" 鍦熷￥娓╁害1锛�" + soilTemperature1 + ", ") ;
+ sb.append(" 鍦熷￥娓╁害2锛�" + soilTemperature2 + ", ") ;
+ sb.append(" 鍦熷￥娓╁害3锛�" + soilTemperature3 + ", ") ;
+ sb.append(" 鍦熷￥娓╁害4锛�" + soilTemperature4 + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
sb.append("\n") ;
return sb.toString() ;
+
}
}
--
Gitblit v1.8.0