From 8acd3fa521f6f4bf0ad03562f21e285b09fe3fe1 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Fri, 6 Jun 2025 15:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=B8=A2=E5=A4=B1=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=BC=96=E8=BE=91=E5=90=8E=E9=83=BD?=
 =?UTF-8?q?=E6=98=AF=E5=BF=83=E8=B7=B3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/dao/DeviceMapper.java     | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
index 81ab26f3a..6627985f4 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
@@ -346,38 +346,41 @@ public interface DeviceMapper {
 
     @Select(" <script>" +
             "SELECT " +
-            "id, " +
-            "device_id, " +
             "coalesce(custom_name, name) as name, " +
-            "password, " +
-            "manufacturer, " +
-            "model, " +
-            "firmware, " +
-            "transport," +
-            "stream_mode," +
-            "ip,"+
-            "sdp_ip,"+
-            "local_ip,"+
-            "port,"+
-            "host_address,"+
-            "expires,"+
-            "register_time,"+
-            "keepalive_time,"+
-            "create_time,"+
-            "update_time,"+
-            "charset,"+
-            "subscribe_cycle_for_catalog,"+
-            "subscribe_cycle_for_mobile_position,"+
-            "mobile_position_submission_interval,"+
-            "subscribe_cycle_for_alarm,"+
-            "ssrc_check,"+
-            "as_message_channel,"+
-            "broadcast_push_after_ack,"+
-            "geo_coord_sys,"+
-            "on_line,"+
-            "media_server_id,"+
-            "server_id,"+
-            "(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = #{dataType} and dc.data_device_id= de.id) as channel_count " +
+            "id" +
+            ",device_id" +
+            ",manufacturer" +
+            ",model" +
+            ",firmware" +
+            ",transport" +
+            ",stream_mode" +
+            ",on_line" +
+            ",register_time" +
+            ",keepalive_time" +
+            ",ip" +
+            ",create_time" +
+            ",update_time" +
+            ",port" +
+            ",expires" +
+            ",subscribe_cycle_for_catalog" +
+            ",subscribe_cycle_for_mobile_position" +
+            ",mobile_position_submission_interval" +
+            ",subscribe_cycle_for_alarm" +
+            ",host_address" +
+            ",charset" +
+            ",ssrc_check" +
+            ",geo_coord_sys" +
+            ",media_server_id" +
+            ",sdp_ip" +
+            ",local_ip" +
+            ",password" +
+            ",as_message_channel" +
+            ",heart_beat_interval" +
+            ",heart_beat_count" +
+            ",position_capability" +
+            ",broadcast_push_after_ack" +
+            ",server_id" +
+            ",(SELECT count(0) FROM wvp_device_channel dc WHERE dc.data_type = #{dataType} and dc.data_device_id= de.id) as channel_count " +
             " FROM wvp_device de" +
             " where 1 = 1 "+
             " <if test='status != null'> AND de.on_line=${status}</if>"+