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/IrGroupClientMapper.xml | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrGroupClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrGroupClientMapper.xml
index 992f079..e4053cd 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrGroupClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrGroupClientMapper.xml
@@ -105,28 +105,4 @@
where id = #{id,jdbcType=BIGINT}
</update>
- <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇杞亴缁勬暟閲�-->
- <select id="getGroupCountByClientId" resultType="java.lang.Long">
- SELECT
- count(*)
- FROM ir_irrigate_group grp
- INNER JOIN ir_group_client gc ON gc.group_id = grp.id
- WHERE grp.deleted = 0 AND gc.client_id = #{clientId}
- </select>
-
- <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇杞亴缁勫垪琛�-->
- <select id="getGroupsByClientId" resultType="com.dy.pipIrrGlobal.voIr.VoGroupSimple">
- SELECT
- grp.id AS groupId,
- grp.group_code AS groupCode
- FROM ir_irrigate_group grp
- INNER JOIN ir_group_client gc ON gc.group_id = grp.id
- WHERE grp.deleted = 0 AND gc.client_id = #{clientId}
- ORDER BY grp.group_code
- <trim prefix="limit ">
- <if test="start != null and count != null">
- #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
- </if>
- </trim>
- </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0