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/IrIrrigateGroupMapper.xml |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
index 115fe2b..5305c81 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -362,4 +362,21 @@
            INNER JOIN pr_controller con ON con.intakeId = gi.intake_id
     WHERE gi.group_id = #{groupId}
   </select>
+  
+  <!--鏍规嵁杞亴缁勫悕绉扮粺璁¤褰曟暟-->
+  <select id="countByGroupCode" resultType="java.lang.Integer">
+    SELECT COUNT(*) 
+    FROM ir_irrigate_group 
+    WHERE group_code = #{groupCode} 
+    AND deleted = 0
+  </select>
+  
+  <!--鏍规嵁杞亴缁勫悕绉扮粺璁¤褰曟暟锛堟帓闄ゆ寚瀹欼D锛�-->
+  <select id="countByGroupCodeExcludeId" resultType="java.lang.Integer">
+    SELECT COUNT(*) 
+    FROM ir_irrigate_group 
+    WHERE group_code = #{groupCode} 
+    AND id != #{excludeId} 
+    AND deleted = 0
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0