From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒; 2、修改向水肥机下发命令相关逻辑; 3、修改水肥机回复命令结果处理逻辑; 4、去除前端webSocket关闭产生异常日志记录。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
index e216f9d..f7c4f9f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoTiming.java
@@ -39,40 +39,48 @@
     /**
      * 鏈勾绱娴侀噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterTotalAmountYear;
 
     /**
      * 姘磋〃绱娴侀噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterTotalAmountMeter;
 
     /**
      * 鏈勾绱鐢甸噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double eleTotalAmountYear;
 
     /**
      * 鐢佃〃绱鐢甸噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double eleTotalAmountMeter;
 
     /**
      * 褰撴棩姘磋〃鍑�娴侀噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterTotalAmountDay;
 
     /**
      * 褰撴棩鐢ㄦ埛鐢ㄦ按閲�
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterUserTotalAmountDay;
 
     /**
      * 婕忔崯姘撮噺
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double lossTotalAmountDay;
 
     /**
      * 鍚庡鐢垫睜鐢靛帇
      */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double batteryVolt;
 }

--
Gitblit v1.8.0