From 4b859aa82882e5b4e7bd8a56e9624237376e0d08 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 4 Dec 2025 14:54:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(base):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8F=82=E6=95=B0=E6=9C=80=E6=96=B0=E5=80=BC=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改selectLatestBaseDeviceParamValList SQL，限制最多返回200条最新记录
- 调整SQL排序和过滤条件，提升查询准确性和性能
- 在BaseDeviceParamValServiceImpl中添加异常捕获，防止查询失败导致程序崩溃
- 如果查询结果为空或异常，返回空列表，保证调用方安全
- 增加日志输出，方便定位查询异常原因
---
 .../impl/BaseDeviceParamValServiceImpl.java   | 16 ++++++-
 .../mapper/base/BaseDeviceParamValMapper.xml  | 44 +++++++------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java
index a960d0b..eaf30a4 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseDeviceParamValServiceImpl.java
@@ -1,6 +1,9 @@
 package com.aucma.base.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.aucma.base.mapper.BaseDeviceParamValMapper;
@@ -16,6 +19,8 @@ import com.aucma.base.service.IBaseDeviceParamValService;
 @Service
 public class BaseDeviceParamValServiceImpl implements IBaseDeviceParamValService 
 {
+    private static final Logger log = LoggerFactory.getLogger(BaseDeviceParamValServiceImpl.class);
+
     @Autowired
     private BaseDeviceParamValMapper baseDeviceParamValMapper;
 
@@ -52,7 +57,16 @@ public class BaseDeviceParamValServiceImpl implements IBaseDeviceParamValService
     @Override
     public List<BaseDeviceParamVal> selectLatestBaseDeviceParamValList(BaseDeviceParamVal baseDeviceParamVal)
     {
-        return baseDeviceParamValMapper.selectLatestBaseDeviceParamValList(baseDeviceParamVal);
+        try {
+            if (baseDeviceParamVal == null) {
+                baseDeviceParamVal = new BaseDeviceParamVal();
+            }
+            List<BaseDeviceParamVal> list = baseDeviceParamValMapper.selectLatestBaseDeviceParamValList(baseDeviceParamVal);
+            return list != null ? list : Collections.emptyList();
+        } catch (Exception e) {
+            log.error("查询设备参数最新值失败: {}", e.getMessage());
+            return Collections.emptyList();
+        }
     }
 
     /**
diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml
index 011b854..66bcabc 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml
@@ -91,34 +91,24 @@
         </foreach>
     </delete>
 
-    <!-- 最新参数聚合查询：每设备每参数取最新一条记录 -->
+    <!-- 最新参数聚合查询：每设备每参数取最新一条记录，限制返回200条 -->
     <select id="selectLatestBaseDeviceParamValList" parameterType="BaseDeviceParamVal" resultMap="BaseDeviceParamValResult">
-        WITH t AS (
+        SELECT * FROM (
             SELECT
-                record_id,
-                param_code,
-                device_code,
-                device_id,
-                param_name,
-                param_value,
-                collect_time,
-                record_time,
-                ROW_NUMBER() OVER (PARTITION BY device_code, device_id, param_code ORDER BY NVL(record_time, collect_time) DESC, record_id DESC) AS rn
-            FROM base_device_param_val
-            <where>
-                <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</if>
-                <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
-                <if test="deviceId != null "> and device_id = #{deviceId}</if>
-                <if test="paramName != null  and paramName != ''"> and param_name like concat(concat('%', #{paramName}), '%')</if>
-                <if test="paramValue != null  and paramValue != ''"> and param_value = #{paramValue}</if>
-                <!-- 时间条件若提供，将在给定范围内取最新记录 -->
-                <if test="collectTime != null "> and collect_time = #{collectTime}</if>
-                <if test="recordTime != null "> and record_time = #{recordTime}</if>
-            </where>
-        )
-        SELECT record_id, param_code, device_code, device_id, param_name, param_value, collect_time, record_time
-        FROM t
-        WHERE rn = 1
-        ORDER BY device_code, device_id, param_code
+                record_id, param_code, device_code, device_id, param_name, param_value, collect_time, record_time,
+                ROW_NUMBER() OVER (ORDER BY device_code, param_code) AS row_num
+            FROM (
+                SELECT
+                    record_id, param_code, device_code, device_id, param_name, param_value, collect_time, record_time,
+                    ROW_NUMBER() OVER (PARTITION BY device_code, param_code ORDER BY NVL(record_time, collect_time) DESC) AS rn
+                FROM base_device_param_val
+                <where>
+                    <if test="deviceCode != null and deviceCode != ''">and device_code = #{deviceCode}</if>
+                    <if test="paramCode != null and paramCode != ''">and param_code = #{paramCode}</if>
+                    <if test="deviceId != null">and device_id = #{deviceId}</if>
+                    <if test="paramName != null and paramName != ''">and param_name like '%' || #{paramName} || '%'</if>
+                </where>
+            ) WHERE rn = 1
+        ) WHERE row_num &lt;= 200
     </select>
 </mapper>
\ No newline at end of file