From eb5a6e5a54efa997971beffc909bcadc06dc8886 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 21 四月 2025 10:45:16 +0800 Subject: [PATCH] 1、江海测试系统设备类型默认为阀; 2、完善通信中间件测试消息推送代码; 3、增加队列数据结构注释; 4、121服务器相关的初始化配置文件bug修改; 5、其他注释完善。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrUnitClientMapper.xml | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrUnitClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrUnitClientMapper.xml index 6d74a8b..154ca20 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrUnitClientMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrUnitClientMapper.xml @@ -99,4 +99,32 @@ operate_time = #{operateTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=BIGINT} </update> + + <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鐏屾簤鍗曞厓鏁伴噺--> + <select id="getUnitCountByClientId" resultType="java.lang.Long"> + SELECT + count(*) + FROM ir_irrigate_unit uni + INNER JOIN pr_intake inta ON inta.id = uni.intake_id + INNER JOIN ir_unit_client uc ON uc.unit_id = uni.id + WHERE uni.deleted = 0 AND uc.client_id = #{clientId} + </select> + + <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鐏屾簤鍗曞厓鍒楄〃--> + <select id="getUnitsByClientId" resultType="com.dy.pipIrrGlobal.voIr.VoUnitSimple"> + SELECT + uni.id AS unitId, + inta.`name` AS intakeNo, + uni.remarks + FROM ir_irrigate_unit uni + INNER JOIN pr_intake inta ON inta.id = uni.intake_id + INNER JOIN ir_unit_client uc ON uc.unit_id = uni.id + WHERE uni.deleted = 0 AND uc.client_id = #{clientId} + ORDER BY uni.id + <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