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/IrIrrigateGroupMapper.xml | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 40 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 e91b8ae..a2636b2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -230,22 +230,8 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勮褰曟暟-->
<select id="getSimpleGroupCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
-<!-- FROM ir_irrigate_group grp-->
-<!-- INNER JOIN ir_project_group pg ON pg.group_id = grp.id-->
-<!-- INNER JOIN ir_project pro ON pg.project_id = pro.id-->
-<!-- <where>-->
-<!-- AND grp.deleted = 0-->
-
-<!-- <if test="projectId != null and projectId != ''">-->
-<!-- AND pro.id = #{projectId}-->
-<!-- </if>-->
-
-<!-- <if test="groupCode != null and groupCode != ''">-->
-<!-- AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')-->
-<!-- </if>-->
-<!-- </where>-->
FROM ir_irrigate_group grp
- INNER JOIN ir_project_group pg ON pg.group_id = grp.id
+ LEFT JOIN ir_project_group pg ON pg.group_id = grp.id
<where>
AND grp.deleted = 0
<if test="projectId != null">
@@ -259,35 +245,15 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勫垪琛�-->
<select id="getSimpleGroups" resultType="com.dy.pipIrrGlobal.voIr.VoGroupSimple">
-<!-- SELECT-->
-<!-- grp.id AS groupId,-->
-<!-- grp.group_code AS groupCode,-->
-<!-- (SELECT COUNT(*) FROM ir_group_intake WHERE group_id = grp.id) AS intakeCount,-->
-<!-- grp.default_duration AS defaultDuration,-->
-<!-- pg.sort-->
-<!-- FROM ir_irrigate_group grp-->
-<!-- INNER JOIN ir_project_group pg ON pg.group_id = grp.id-->
-<!-- INNER JOIN ir_project pro ON pg.project_id = pro.id-->
-<!-- <where>-->
-<!-- AND grp.deleted = 0-->
-
-<!-- <if test="projectId != null and projectId != ''">-->
-<!-- AND pro.id = #{projectId}-->
-<!-- </if>-->
-
-<!-- <if test="groupCode != null and groupCode != ''">-->
-<!-- AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')-->
-<!-- </if>-->
-<!-- </where>-->
-<!-- ORDER BY pg.sort-->
- SELECT
+ SELECT DISTINCT
grp.id AS groupId,
grp.group_code AS groupCode,
(SELECT COUNT(*) FROM ir_group_intake WHERE group_id = grp.id) AS intakeCount,
grp.default_duration AS defaultDuration,
- 0 as sort
+ pg.sort,
+ grp.operate_time
FROM ir_irrigate_group grp
- INNER JOIN ir_project_group pg ON pg.group_id = grp.id
+ LEFT JOIN ir_project_group pg ON pg.group_id = grp.id
<where>
AND grp.deleted = 0
@@ -299,7 +265,7 @@
AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
</if>
</where>
- ORDER BY grp.operate_time DESC
+ ORDER BY pg.sort
<trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
@@ -325,4 +291,51 @@
) irrigateGroup
GROUP BY groupCode,defaultDuration
</select>
+
+ <select id="getGroupResult" resultType="com.dy.pipIrrGlobal.voIr.VoGroupResult">
+ SELECT
+ grp.id AS groupId,
+ grp.group_code AS groupCode,
+ IF(sche.current_state = 2, 5,
+ IF(NOW() < sche.start_time, 2,
+ IF(NOW() > sche.start_time AND NOW() < DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), 3, 4))) AS state,
+ sche.start_time AS startTime,
+ DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE) AS stopTime,
+ sche.duration,
+ NULL AS publishResult
+ FROM ir_irrigate_group grp
+ INNER JOIN ir_irrigate_schedule sche ON sche.group_id = grp.id
+ INNER JOIN ir_plan_schedule ps ON ps.schedule_id = sche.id
+ WHERE ps.plan_id = #{planId};
+
+ </select>
+
+ <!--鏍规嵁鐏屾簤璁″垝ID鑾峰彇杞亴缁勭粓姝㈢粨鏋�-->
+ <select id="getGroupResult_terminate" resultType="com.dy.pipIrrGlobal.voIr.VoGroupResult">
+ SELECT
+ grp.id AS groupId,
+ grp.group_code AS groupCode,
+ IF(#{terminateTime} < sche.start_time, 6,
+ IF(#{terminateTime} < DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), 5, 4)) AS state,
+ IF(#{terminateTime} > sche.start_time, sche.start_time, NULL) AS startTime,
+ IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
+ IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL)) AS stopTime,
+ <!--sche.duration,-->
+ IF(
+ TIMESTAMPDIFF(MINUTE,
+ IF(#{terminateTime} > sche.start_time, sche.start_time, NULL),
+ IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
+ IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL))
+ ) = 0, 1,
+ TIMESTAMPDIFF(MINUTE,
+ IF(#{terminateTime} > sche.start_time, sche.start_time, NULL),
+ IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
+ IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL))
+ )) AS duration,
+ NULL AS publishResult
+ FROM ir_irrigate_group grp
+ INNER JOIN ir_irrigate_schedule sche ON sche.group_id = grp.id
+ INNER JOIN ir_plan_schedule ps ON ps.schedule_id = sche.id
+ WHERE ps.plan_id = #{planId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0