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, 9 insertions(+), 9 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 8162df9..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
@@ -40,10 +40,10 @@
"ssrc_check," +
"as_message_channel," +
"geo_coord_sys," +
- "tree_type," +
"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);
@@ -74,8 +74,8 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line"+
") VALUES (" +
"#{deviceId}," +
@@ -103,8 +103,8 @@
"#{subscribeCycleForAlarm}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
- "#{treeType}," +
"#{onLine}" +
")")
int add(Device device);
@@ -158,8 +158,8 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line,"+
"media_server_id,"+
"switch_primary_sub_stream switchPrimarySubStream,"+
@@ -200,8 +200,8 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line"+
" FROM wvp_device WHERE on_line = true")
List<Device> getOnlineDevices();
@@ -231,8 +231,8 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line"+
" FROM wvp_device WHERE ip = #{host} AND port=#{port}")
Device getDeviceByHostAndPort(String host, int port);
@@ -253,8 +253,8 @@
"<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=\"treeType != null\">, tree_type=#{treeType}</if>" +
"<if test=\"switchPrimarySubStream != null\">, switch_primary_sub_stream=#{switchPrimarySubStream}</if>" +
"<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
"WHERE device_id=#{deviceId}"+
@@ -271,8 +271,8 @@
"charset,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcastPushAfterAck,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line,"+
"media_server_id,"+
"switch_primary_sub_stream"+
@@ -286,8 +286,8 @@
"#{charset}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
- "#{treeType}," +
"#{onLine}," +
"#{mediaServerId}," +
"#{switchPrimarySubStream}" +
--
Gitblit v1.8.0