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/SeVirtualCardMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
index dfa7059..6bc3433 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -168,11 +168,11 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateVcCardNoUseStateByIntakeId" parameterType="java.lang.Long">
+  <update id="updateVcCardNoUseStateByIntakeId">
     update se_virtual_card
     set in_use = 0,
       intake_id = null
-    where intake_id = #{intakeId,jdbcType=BIGINT}
+    where intake_id = #{intakeId,jdbcType=BIGINT} and open_time &lt; #{now,jdbcType=TIMESTAMP}
   </update>
   <update id="updateMoney" >
     update se_virtual_card
@@ -245,11 +245,12 @@
     SELECT id FROM se_virtual_card WHERE state = 1 AND vc_num = #{vcNum}
   </select>
 
-  <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱ID-->
+  <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栧啘鎴穒d銆佸鍚嶃�佸湴鍧�-->
   <select id="getClientIdAndNameByVsCardNo" resultType="java.util.Map">
     SELECT
     cli.id AS clientId,
-    cli.name AS clientName
+    cli.name AS clientName,
+    cli.address AS clientAddress
     FROM se_virtual_card card
     INNER JOIN se_client cli ON card.client_id = cli.id
     WHERE card.state = 1 AND card.vc_num = #{vcNum}

--
Gitblit v1.8.0