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/IrPlanOperateMapper.xml | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrPlanOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrPlanOperateMapper.xml
index f7d1670..94accdf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrPlanOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrPlanOperateMapper.xml
@@ -99,4 +99,29 @@
operate_time = #{operateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鏍规嵁璁″垝ID鑾峰彇缁堟鏃堕棿-->
+ <select id="getTerminateTime" resultType="java.util.Date">
+ SELECT operate_time AS operateTime FROM ir_plan_operate WHERE operate_type = 5 AND plan_id = #{planId} LIMIT 0,1
+ </select>
+
+ <!--鑾峰彇鏈�杩戜竴娆¤鍒掔粓姝㈢殑鏃堕棿锛屼笖缁堟鏃堕棿鍦ㄩ厤缃殑鏃堕棿闂撮殧鍐�-->
+ <select id="getLastTerminateTime" resultType="java.util.Date">
+ SELECT operate_time AS operateTime
+ FROM ir_plan_operate
+ WHERE operate_type = 5
+ AND operate_time >= DATE_SUB(NOW(), INTERVAL #{planTerminateLimitMinutes} MINUTE)
+ ORDER BY operate_time DESC
+ LIMIT 0,1
+ </select>
+
+ <!--鑾峰彇鏈�杩戜竴娆＄粓姝㈢殑璁″垝ID-->
+ <select id="getLastTerminatedPlanId" resultType="java.lang.Long">
+ SELECT plan_id
+ FROM ir_plan_operate
+ WHERE operate_type = 5
+ AND operate_time >= DATE_SUB(NOW(), INTERVAL #{planTerminateLimitMinutes} MINUTE)
+ ORDER BY operate_time DESC
+ LIMIT 0,1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0