From e851bdc3f70e68b3c1efbfa91e4c807db95267ea Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 13 Mar 2026 10:02:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=8A=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tplink/camera/mapper/xml/CameraInfoMapper.xml     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
index 40d6a5f0..53ea502b 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml
@@ -274,13 +274,13 @@
 
     <select id="previewList" parameterType="com.nu.modules.tplink.camera.entity.CameraInfo" resultType="com.nu.modules.tplink.camera.entity.CameraInfo">
         select a.*,b.nu_name from (
-        select id,nu_id,device_index,device_model,device_type,device_status from nu_iot_tplink_camera
+        select id,nu_id,device_index,device_model,device_type,device_status,dimension from nu_iot_tplink_camera
         union all
-        select id,nu_id,cid as device_index,'' as device_model,'sb' as device_type,relay_state as device_status from nu_iot_tq_water_meter
+        select id,nu_id,cid as device_index,'' as device_model,'sb' as device_type,relay_state as device_status,'' as dimension from nu_iot_tq_water_meter
         union all
-        select id,nu_id,cid as device_index,'' as device_model,'db' as device_type,relay_state as device_status from nu_iot_tq_electricity_meter
+        select id,nu_id,cid as device_index,'' as device_model,'db' as device_type,relay_state as device_status,'' as dimension from nu_iot_tq_electricity_meter
         union all
-        select id,nu_id,sn as device_index,'' as device_model,'wsdj' as device_type,status as device_status from nu_iot_yiweilian_humid_device
+        select id,nu_id,sn as device_index,'' as device_model,'wsdj' as device_type,status as device_status,'' as dimension from nu_iot_yiweilian_humid_device
         ) a
         left join nu_base_info b on a.nu_id = b.nu_id
             <where>
@@ -293,6 +293,9 @@
                 <if test="params.deviceType != null and params.deviceType != ''">
                     and a.device_type = #{params.deviceType}
                 </if>
+                <if test="params.dimension != null and params.dimension != ''">
+                    and a.dimension = #{params.dimension}
+                </if>
             </where>
     </select>