From e170c6e3119d6e26f7142b26394350a855e89bb0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 18 十月 2024 16:36:54 +0800
Subject: [PATCH] 2024-10-18 朱宝民 待关阀列表
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
index 5a14b0e..f69c0b4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -212,10 +212,13 @@
'toClose' AS state,
CASE
WHEN com.command_code = 'A1' OR com.command_code = 'A2' THEN 0
- END AS planned
+ ELSE 0
+ END AS planned,
+ com.send_time AS sendTime
FROM rm_command_history com
- INNER JOIN pr_intake inta ON inta.id = com.intake_id
- INNER JOIN JSON_TABLE(
+ INNER JOIN pr_controller con ON com.rtu_addr = con.rtuAddr
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
+ LEFT JOIN JSON_TABLE(
<!-- '[{"rtuAddr":"620201000030","isOnLine":true}]',-->
#{onLineMap},
'$[*]' COLUMNS (
@@ -233,7 +236,9 @@
AND param ->> '$.orderNo' = com.param ->> '$.orderNo'
)
</where>
- GROUP BY inta.name, rtus.isOnLine, com.rtu_addr, com.param ->> '$.icCardNo', com.command_code
+ GROUP BY inta.name, rtus.isOnLine, com.rtu_addr, com.param ->> '$.icCardNo', com.command_code, com.send_time
+ ORDER BY com.send_time DESC
+ LIMIT 1
</select>
<!--鏍规嵁鍙栨按鍙D鑾峰彇璇ュ彇姘村彛鏈叧闃�鍙傛暟-->
--
Gitblit v1.8.0