From d502caad139eb06678c89a281bf63dbc19adb228 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 六月 2025 09:54:21 +0800
Subject: [PATCH] 水肥机、墒情站、气象站历史数据、最新数据查询
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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 992a58e..7cd3168 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -323,6 +323,35 @@
LIMIT 0,1
</select>
+ <!--鏍规嵁鍙栨按鍙D鑾峰彇璇ュ彇姘村彛鏈叧闃�鍙傛暟-->
+ <select id="getUncloseParamByCd" resultType="com.dy.pipIrrGlobal.voRm.VoUnclosedParam">
+ SELECT com.rtu_addr AS rtuAddr,
+ com.param ->> '$.orderNo' AS orderNo,
+ com.param ->> '$.icCardNo' AS vcNum
+ FROM rm_command_history com
+ INNER JOIN pr_controller con ON com.rtu_addr = con.rtuAddr
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
+ INNER JOIN JSON_TABLE(
+ <!-- '[{"rtuAddr":"620201000029","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
+ #{onLineMap},
+ '$[*]' COLUMNS (
+ rtuAddr VARCHAR(20) PATH '$.rtuAddr',
+ isOnLine BOOLEAN PATH '$.isOnLine'
+ )
+ ) rtus ON com.rtu_addr = rtus.rtuAddr
+ WHERE com.command_code = #{code}
+ AND con.intakeId = #{intakeId}
+ AND NOT EXISTS(
+ SELECT *
+ FROM rm_command_history
+ WHERE (result IS NULL OR result = 1)
+ AND (command_code = '93' OR command_code = 'A3' OR command_code = '98')
+ AND param ->> '$.orderNo' = com.param ->> '$.orderNo'
+ )
+ ORDER BY com.send_time DESC
+ LIMIT 0,1
+ </select>
+
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍛戒护鏃ュ織鍘嗗彶璁板綍鎬绘暟-->
<select id="getCommandHistoriesCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
@@ -393,4 +422,15 @@
FROM rm_command_history
WHERE com_id = #{commId}
</select>
+
+ <!--鏍规嵁鍛戒护鏃ュ織ID鑾峰彇寮�闃�淇℃伅锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃�-->
+ <select id="getValveOpen" resultType="com.dy.pipIrrGlobal.voRm.VoIntakeVc">
+ SELECT
+ rtu_addr AS rtuAddr,
+ param ->> '$.icCardNo' AS vcNum,
+ param ->> '$.orderNo' AS orderNo
+ FROM rm_command_history
+ WHERE com_id = #{commandId}
+ LIMIT 0, 1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0