From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 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 a2636b2..5305c81 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -338,4 +338,45 @@
INNER JOIN ir_plan_schedule ps ON ps.schedule_id = sche.id
WHERE ps.plan_id = #{planId}
</select>
+
+ <!--鏍规嵁杞亴缁処D鑾峰彇杞亴缁勮鎯�-->
+ <select id="getGroupIntakes" resultType="com.dy.pipIrrGlobal.voIr.VoGroupIntakes">
+ SELECT
+ pro.project_name AS projectName,
+ gro.group_code AS groupName,
+ NULL AS intakes
+ FROM ir_irrigate_group gro
+ INNER JOIN ir_project_group pg ON pg.group_id = gro.id
+ INNER JOIN ir_project pro ON pro.id = pg.project_id
+ WHERE gro.deleted = 0 AND gro.id = #{groupId}
+ </select>
+
+ <!--鏍规嵁杞亴缁処D鑾峰彇杞亴缁勮鎯呭垪琛�-->
+ <select id="getGroupIntakesList" resultType="com.dy.pipIrrGlobal.voIr.VoIntake">
+ SELECT
+ con.rtuAddr,
+ inta.name AS intakeName,
+ NULL AS isOnLine
+ FROM ir_group_intake gi
+ INNER JOIN pr_intake inta ON inta.id = gi.intake_id
+ 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