From fa62ab9a0143433a5d058ab3229a37e4a9a0f696 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 20 六月 2023 14:16:46 +0800
Subject: [PATCH] Merge pull request #893 from sxh-netizen/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
index 12e550f..96773fe 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -42,6 +42,7 @@
             "geo_coord_sys," +
             "on_line," +
             "media_server_id," +
+            "switch_primary_sub_stream," +
             "(SELECT count(0) FROM wvp_device_channel WHERE device_id=wvp_device.device_id) as channel_count "+
             " FROM wvp_device WHERE device_id = #{deviceId}")
     Device getDeviceByDeviceId(String deviceId);
@@ -157,6 +158,7 @@
             "geo_coord_sys,"+
             "on_line,"+
             "media_server_id,"+
+            "switch_primary_sub_stream switchPrimarySubStream,"+
             "(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " +
             "FROM wvp_device de" +
             "<if test=\"onLine != null\"> where on_line=${onLine}</if>"+
@@ -246,6 +248,7 @@
             "<if test=\"ssrcCheck != null\">, ssrc_check=#{ssrcCheck}</if>" +
             "<if test=\"asMessageChannel != null\">, as_message_channel=#{asMessageChannel}</if>" +
             "<if test=\"geoCoordSys != null\">, geo_coord_sys=#{geoCoordSys}</if>" +
+            "<if test=\"switchPrimarySubStream != null\">, switch_primary_sub_stream=#{switchPrimarySubStream}</if>" +
             "<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
             "WHERE device_id=#{deviceId}"+
             " </script>"})
@@ -263,7 +266,8 @@
             "as_message_channel,"+
             "geo_coord_sys,"+
             "on_line,"+
-            "media_server_id"+
+            "media_server_id,"+
+            "switch_primary_sub_stream"+
             ") VALUES (" +
             "#{deviceId}," +
             "#{name}," +
@@ -276,7 +280,8 @@
             "#{asMessageChannel}," +
             "#{geoCoordSys}," +
             "#{onLine}," +
-            "#{mediaServerId}" +
+            "#{mediaServerId}," +
+            "#{switchPrimarySubStream}" +
             ")")
     void addCustomDevice(Device device);
 

--
Gitblit v1.8.0