From 5f514e032986ae9d116aaa55a91c4b0617b6e57a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 17:36:40 +0800
Subject: [PATCH] 修改水肥机、气象、墒情值对象中的bug
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java | 4 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java | 9 ++++++---
3 files changed, 9 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 f6b5647..b72f3d0 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
@@ -85,7 +85,7 @@
}
public String getDevDtStr() {
- if(devDt == null){
+ if(devDt != null){
return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
}else{
return "" ;
@@ -97,7 +97,10 @@
StringBuilder sb = new StringBuilder();
sb.append("姘磋偉鏁版嵁=>") ;
sb.append(" 娑堟伅ID锛�" + messageId + ", ") ;
- sb.append(" 鎼呮媽杩愯锛�" + stirRunning1 + ", ") ;
+ sb.append(" 鎼呮媽杩愯1锛�" + stirRunning1 + ", ") ;
+ sb.append(" 鎼呮媽杩愯2锛�" + stirRunning2 + ", ") ;
+ sb.append(" 鎼呮媽杩愯3锛�" + stirRunning3 + ", ") ;
+ sb.append(" 鎼呮媽杩愯4锛�" + stirRunning4 + ", ") ;
sb.append(" 娉ㄨ偉杩愯锛�" + injectRunning + ", ") ;
sb.append(" 鐏屾簤杩愯锛�" + irrRunning + ", ") ;
sb.append(" 鎶ヨ锛�" + alarm + ", ") ;
@@ -105,7 +108,7 @@
sb.append(" 娉ㄨ偉缁忚繃鏃堕棿锛�" + manureTime + ", ") ;
sb.append(" 鎼呮媽缁忚繃鏃堕棿锛�" + stirTime + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr()) ;
sb.append("\n") ;
return sb.toString() ;
}
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 1f51b63..7a01088 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
@@ -58,7 +58,7 @@
}
public String getDevDtStr() {
- if(devDt == null){
+ if(devDt != null){
return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
}else{
return "" ;
@@ -79,7 +79,7 @@
sb.append(" 鍦熷￥娓╁害3锛�" + soilTemperature3 + ", ") ;
sb.append(" 鍦熷￥娓╁害4锛�" + soilTemperature4 + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr()) ;
sb.append("\n") ;
return sb.toString() ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
index 2891399..573e631 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
@@ -79,7 +79,7 @@
sb.append(" 椋庨�燂細" + windSpeed + ", ") ;
sb.append(" 椋庡悜锛�" + windDirection + ", ") ;
sb.append(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() ) ;
sb.append("\n") ;
return sb.toString() ;
}
--
Gitblit v1.8.0