From bd41451d60c2d7143a67d3eaa03d4d09679340a4 Mon Sep 17 00:00:00 2001
From: 6485840858 <6485840858@qq.com>
Date: 星期二, 15 八月 2023 10:41:12 +0800
Subject: [PATCH] 优化国标级联语音对讲流程
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 18 ++++++++++++++++--
1 files changed, 16 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..e2497a7 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,8 @@
"geo_coord_sys," +
"on_line," +
"media_server_id," +
+ "switch_primary_sub_stream," +
+ "broadcast_push_after_ack," +
"(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);
@@ -72,6 +74,7 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
"on_line"+
") VALUES (" +
@@ -100,6 +103,7 @@
"#{subscribeCycleForAlarm}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
"#{onLine}" +
")")
@@ -154,9 +158,11 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"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>"+
@@ -194,6 +200,7 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
"on_line"+
" FROM wvp_device WHERE on_line = true")
@@ -224,6 +231,7 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
"on_line"+
" FROM wvp_device WHERE ip = #{host} AND port=#{port}")
@@ -245,7 +253,9 @@
"<if test=\"subscribeCycleForAlarm != null\">, subscribe_cycle_for_alarm=#{subscribeCycleForAlarm}</if>" +
"<if test=\"ssrcCheck != null\">, ssrc_check=#{ssrcCheck}</if>" +
"<if test=\"asMessageChannel != null\">, as_message_channel=#{asMessageChannel}</if>" +
+ "<if test=\"broadcastPushAfterAck != null\">, broadcast_push_after_ack=#{broadcastPushAfterAck}</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>"})
@@ -261,9 +271,11 @@
"charset,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcastPushAfterAck,"+
"geo_coord_sys,"+
"on_line,"+
- "media_server_id"+
+ "media_server_id,"+
+ "switch_primary_sub_stream"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -274,9 +286,11 @@
"#{charset}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
"#{onLine}," +
- "#{mediaServerId}" +
+ "#{mediaServerId}," +
+ "#{switchPrimarySubStream}" +
")")
void addCustomDevice(Device device);
--
Gitblit v1.8.0