From d2fc819dc069c7b8d338ae52a90a7f38704fac08 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 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..088dc27 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,12 +12,53 @@
*/
@Data
public class SoilVo implements Vo4Up {
+ @JSONField(name = "flexem_message_id")
+ public Integer messageId ;//娑堟伅ID
+
+ public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
+
+ @JSONField(name = "鍦熷￥婀垮害1")
+ public Float soilHumidity1 ;
+
+ @JSONField(name = "鍦熷￥婀垮害2")
+ public Float soilHumidity2 ;
+
+ @JSONField(name = "鍦熷￥婀垮害3")
+ public Float soilHumidity3 ;
+
+ @JSONField(name = "鍦熷￥婀垮害4")
+ public Float soilHumidity4 ;
+
+ @JSONField(name = "鍦熷￥婀垮害5")
+ public Float soilHumidity5 ;
+
+ @JSONField(name = "鍦熷￥娓╁害1")
+ public Float soilTemperature1 ;
+
+ @JSONField(name = "鍦熷￥娓╁害2")
+ public Float soilTemperature2 ;
+
+ @JSONField(name = "鍦熷￥娓╁害3")
+ public Float soilTemperature3 ;
+
+ @JSONField(name = "鍦熷￥娓╁害4")
+ public Float soilTemperature4 ;
+
+ @JSONField(name = "鍦熷￥娓╁害5")
+ public Float soilTemperature5 ;
+
@JSONField(name = "flexem_timestamp")
public Long devDt ;//璁惧鏃堕棿
public String devDtStr ;//璁惧鏃堕棿
+
+ @Override
+ public void setNo(Integer no ){
+ this.no = no ;
+ }
+
public String getDevDtStr() {
- if(devDt == null){
+ if(devDt != null){
return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
}else{
return "" ;
@@ -27,10 +68,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