From 92cb1fcd63e58f189182af8df47c8a747f01480c Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Thu, 28 Aug 2025 19:48:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=A8=E7=A6=81=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=86=E5=8C=96=E6=97=A0=E6=B3=95=E6=92=AD=E6=94=BE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/sis/domain/model/SisAcDevice.java | 40 +++++++++++++++++++
 .../mapper/sis/SisAcDeviceRefMapper.xml       | 15 +++++--
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java
index 22088fbb..4d13565b 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/model/SisAcDevice.java
@@ -10,4 +10,44 @@ public class SisAcDevice extends SisDeviceManage {
 
     private Long acId;
 
+    /**
+     * 设备通道编号
+     */
+    private String channelNo;
+
+    /**
+     * 通道状态.0-离线；1-在线
+     */
+    private Integer channelState;
+
+    /**
+     * nvr 设备厂商编号
+     */
+    private String nvrFactoryNo;
+
+    /**
+     * nvr设备ip
+     */
+    private String nvrIp;
+
+    /**
+     * nvr 端口
+     */
+    private Integer nvrPort;
+
+    /**
+     * nvr 账号
+     */
+    private String nvrAccount;
+
+    /**
+     * nvr 密码
+     */
+    private String nvrPwd;
+
+    /**
+     * nvr 通道编号
+     */
+    private String nvrChannelNo;
+
 }
diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAcDeviceRefMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAcDeviceRefMapper.xml
index 9119e40f..d533b0fa 100644
--- a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAcDeviceRefMapper.xml
+++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAcDeviceRefMapper.xml
@@ -7,10 +7,19 @@
     <select id="queryByAcIds" resultType="org.dromara.sis.domain.model.SisAcDevice">
         SELECT
             b.*,
-            a.ac_id
+            a.ac_id,
+            c.channel_no,
+            c.channel_state,
+            c.nvr_factory_no,
+            c.nvr_ip,
+            c.nvr_port,
+            c.nvr_account,
+            c.nvr_pwd,
+            c.nvr_channel_no
         FROM
-        sis_ac_device_ref a
-        LEFT JOIN sis_device_manage b ON a.dp_id = b.id
+            sis_ac_device_ref a
+            LEFT JOIN sis_device_manage b ON a.dp_id = b.id
+            LEFT JOIN sis_device_channel c on c.device_id = b.id
         where a.ac_id IN
         <foreach collection="acIds" index="index" item="item" open="(" separator="," close=")">
             #{item}