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 | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 5121d98..a2636b2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -250,7 +250,7 @@
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
LEFT JOIN ir_project_group pg ON pg.group_id = grp.id
@@ -265,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}
@@ -318,14 +318,20 @@
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,
+ 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,-->
- TIMESTAMPDIFF(MINUTE,
- IF('2025-04-15 15:27' > sche.start_time, sche.start_time, NULL),
- IF('2025-04-15 15:27' > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
- IF('2025-04-15 15:27' > sche.start_time, '2025-04-15 15:27', NULL))
- ) AS 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
--
Gitblit v1.8.0