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/resources/mapper/Temp4ChangeMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
index 20d37a3..e37d911 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
@@ -44,8 +44,8 @@
     </update>
 
 
-    <delete id="deleteAllIntakeAmountDay">
-        delete from rm_intake_amount_day
+    <delete id="deleteSomeIntakeAmountDay">
+        delete from rm_intake_amount_day where times is null
     </delete>
 
     <!--  -->
@@ -55,8 +55,8 @@
         sum(cl_this_money) as money,
         count(id) as times
         from  rm_open_close_valve_history
-        where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=DATE}
-        and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=DATE}
+        where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=TIMESTAMP}
+        and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=TIMESTAMP}
         group by intake_id
     </select>
     <select id="selectStIntakeDayStatisticsByDate" resultType="com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay">

--
Gitblit v1.8.0