From fa8b0cfca7875cb038102332aae50b7ca57c78df Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 5 Feb 2026 14:07:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(base):=20=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=8F=82=E6=95=B0=E5=80=BC=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在窗口函数排序中添加参数名称优先级排序规则 - 添加参数值为'TRUE'的过滤条件 - 调整设备状态查询的时间范围条件 - 优化三色灯机器状态参数的排序逻辑 --- .../mapper/base/BaseDeviceParamValMapper.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml index 7210dd9..f4ed610 100644 --- a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml @@ -143,9 +143,19 @@ SELECT /*+ PARALLEL(4) */ device_code, param_name, - ROW_NUMBER() OVER (PARTITION BY device_code ORDER BY NVL(record_time, collect_time) DESC) AS rn + ROW_NUMBER() OVER ( + PARTITION BY device_code + ORDER BY NVL(record_time, collect_time) DESC, + DECODE(param_name, + '机台状态-三色灯机器报警', 1, + '机台状态-三色灯机器暂停', 2, + '机台状态-三色灯机器待机', 3, + '机台状态-三色灯机器运行', 4, + 9) ASC + ) AS rn FROM base_device_param_val WHERE param_name IN ('机台状态-三色灯机器运行', '机台状态-三色灯机器暂停', '机台状态-三色灯机器待机', '机台状态-三色灯机器报警') + AND UPPER(param_value) = 'TRUE' AND collect_time >= TRUNC(SYSDATE) AND collect_time < TRUNC(SYSDATE) + 1 ), device_status AS ( @@ -181,6 +191,7 @@ ROW_NUMBER() OVER (PARTITION BY device_code ORDER BY NVL(record_time, collect_time) DESC) AS rn FROM base_device_param_val WHERE param_name IN ('机台状态-三色灯机器运行', '机台状态-三色灯机器暂停', '机台状态-三色灯机器待机','机台状态-三色灯机器报警') + AND UPPER(param_value) = 'TRUE' AND collect_time >= SYSDATE - (2/24) AND collect_time < SYSDATE ), device_status AS (