From 44b4628c549b9131dc2ef6d06d8c66e07b1cd4e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 25 Mar 2026 14:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=97=B6=E5=9B=A0=E4=B8=BAid=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nu/modules/tplink/camera/entity/CameraInfo.java   | 2 +-
 .../modules/tplink/camera/mapper/xml/CameraInfoMapper.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
index ca059a83..b4fe9b63 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/entity/CameraInfo.java
@@ -32,7 +32,7 @@ public class CameraInfo implements Serializable {
 	/**ID*/
 	@TableId(type = IdType.AUTO)
 	@ApiModelProperty(value = "ID")
-	private Integer id;
+	private String id;
 	/**设备编码*/
 	@Excel(name = "设备编码", width = 15)
 	@ApiModelProperty(value = "设备编码")
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 47f6f8a4..ea4c9f3c 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
@@ -283,25 +283,25 @@
     <select id="previewList" parameterType="com.nu.modules.tplink.camera.entity.CameraInfo" resultType="com.nu.modules.tplink.camera.entity.CameraInfo">
         select a.*,b.nu_name,b.area_flag
         from (
-            select id,nu_id,device_index,mac as sn,device_model,device_type,
+            select mac as id,nu_id,device_index,mac as sn,device_model,device_type,
             ( case device_status when '0' then '离线' when '1' then '在线' end ) as device_status,
             dimension,
             maintain_status
             from nu_iot_tplink_camera
             union all
-            select id,nu_id,sn as device_index,sn,'' as device_model,'db' as device_type,
+            select sn as id,nu_id,sn as device_index,sn,'' as device_model,'db' as device_type,
             ( case relay_state when '0' then '拉闸' else '合闸' end ) as device_status,
             dimension,
             maintain_status
             from nu_iot_ds_electricity_meter
             union all
-            select id,nu_id,cid as device_index,cid as sn,'' as device_model,'sb' as device_type,
+            select cid as id,nu_id,cid as device_index,cid as sn,'' as device_model,'sb' as device_type,
             ( case relay_state when '0' then '关阀' else '开阀' end ) as device_status,
             dimension,
             maintain_status
             from nu_iot_tq_water_meter
             union all
-            select id,nu_id,sn as device_index,sn,'' as device_model,'wsdj' as device_type,
+            select sn as id,nu_id,sn as device_index,sn,'' as device_model,'wsdj' as device_type,
             ( case status when '0' then '在线' else '离线' end ) as device_status,
             dimension,
             maintain_status