From 60dffa58131cb501480cc95b078ba8ce1ec46a9e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 14 十二月 2023 09:30:21 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 96773fe..77867bc 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -43,6 +44,7 @@
"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);
@@ -73,6 +75,7 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
"on_line"+
") VALUES (" +
@@ -101,6 +104,7 @@
"#{subscribeCycleForAlarm}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
"#{onLine}" +
")")
@@ -155,6 +159,7 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
"on_line,"+
"media_server_id,"+
@@ -196,6 +201,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")
@@ -226,10 +232,11 @@
"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}")
- Device getDeviceByHostAndPort(String host, int port);
+ Device getDeviceByHostAndPort(@Param("host") String host, @Param("port") int port);
@Update(value = {" <script>" +
"UPDATE wvp_device " +
@@ -247,6 +254,7 @@
"<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>" +
@@ -264,6 +272,7 @@
"charset,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcastPushAfterAck,"+
"geo_coord_sys,"+
"on_line,"+
"media_server_id,"+
@@ -278,6 +287,7 @@
"#{charset}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
"#{onLine}," +
"#{mediaServerId}," +
--
Gitblit v1.8.0