From c19de84fa332a00c651f28e3a52292fd14f143a1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 23 九月 2025 17:30:07 +0800
Subject: [PATCH] 陆常丽反应软件系统财务对账时而数据不准确,分析源码,找到bug原因是,财务对账统计只有用户点击后才会触发统计功能,把历史上及当天进行了统计,如果当天统计时未下班,例如是中午触发统计了,而下午又进行了充值售水,但下班后未再点击触发对账统计,那么今天的对账统计完成了但数据不对。编写自动任务,在下半夜进行对账统计。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 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 9f3a71e..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
@@ -18,34 +18,34 @@
     public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏跺湪涓婚涓�
 
     @JSONField(name = "鍦熷¥婀垮害1")
-    public Integer soilHumidity1 ;
+    public Float soilHumidity1 ;
 
     @JSONField(name = "鍦熷¥婀垮害2")
-    public Integer soilHumidity2 ;
+    public Float soilHumidity2 ;
 
     @JSONField(name = "鍦熷¥婀垮害3")
-    public Integer soilHumidity3 ;
+    public Float soilHumidity3 ;
 
     @JSONField(name = "鍦熷¥婀垮害4")
-    public Integer soilHumidity4 ;
+    public Float soilHumidity4 ;
 
     @JSONField(name = "鍦熷¥婀垮害5")
-    public Integer soilHumidity5 ;
+    public Float soilHumidity5 ;
 
-    @JSONField(name = "鍦熷¥婀垮害1")
-    public Integer soilTemperature1 ;
+    @JSONField(name = "鍦熷¥娓╁害1")
+    public Float soilTemperature1 ;
 
     @JSONField(name = "鍦熷¥娓╁害2")
-    public Integer soilTemperature2 ;
+    public Float soilTemperature2 ;
 
     @JSONField(name = "鍦熷¥娓╁害3")
-    public Integer soilTemperature3 ;
+    public Float soilTemperature3 ;
 
     @JSONField(name = "鍦熷¥娓╁害4")
-    public Integer soilTemperature4 ;
+    public Float soilTemperature4 ;
 
     @JSONField(name = "鍦熷¥娓╁害5")
-    public Integer soilTemperature5 ;
+    public Float soilTemperature5 ;
 
     @JSONField(name = "flexem_timestamp")
     public Long devDt ;//璁惧鏃堕棿
@@ -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() ;
 

--
Gitblit v1.8.0