From 6bb9b053abede2ad978d4416c4f0fdd87833e583 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 21 Feb 2025 17:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/DeviceMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 0689429..6f4e503 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -67,9 +67,10 @@
         delete from device where id = #{id}
     </delete>
     <select id="list" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
-        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name, d.keepalive_at, d.online
+        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name, d.keepalive_at, d.online, p.wvp_device_no as device_no, p.wvp_channel_no channel_no
         from device d
         left join scenic s on d.scenic_id = s.id
+        left join device_preview_config p on d.id = p.device_id and p.status = 1
         <where>
             <if test="name!= null and name!= ''">
                 and d.`name` like concat('%', #{name}, '%')