From 9889f908c80cfc69bb3d240ce1705fcddfb5e9fb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 七月 2023 11:08:14 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 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 7546545..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,9 +40,10 @@
"ssrc_check," +
"as_message_channel," +
"geo_coord_sys," +
- "tree_type," +
- "online," +
+ "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,9 +74,9 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online"+
+ "on_line"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -102,9 +103,9 @@
"#{subscribeCycleForAlarm}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
- "#{treeType}," +
- "#{online}" +
+ "#{onLine}" +
")")
int add(Device device);
@@ -120,7 +121,7 @@
"<if test=\"localIp != null\">, local_ip=#{localIp}</if>" +
"<if test=\"port != null\">, port=#{port}</if>" +
"<if test=\"hostAddress != null\">, host_address=#{hostAddress}</if>" +
- "<if test=\"online != null\">, online=#{online}</if>" +
+ "<if test=\"onLine != null\">, on_line=#{onLine}</if>" +
"<if test=\"registerTime != null\">, register_time=#{registerTime}</if>" +
"<if test=\"keepaliveTime != null\">, keepalive_time=#{keepaliveTime}</if>" +
"<if test=\"keepaliveIntervalTime != null\">, keepalive_interval_time=#{keepaliveIntervalTime}</if>" +
@@ -157,17 +158,18 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online,"+
+ "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 online=${online}</if>"+
+ "<if test=\"onLine != null\"> where on_line=${onLine}</if>"+
" order by create_time desc "+
" </script>"
)
- List<Device> getDevices(Boolean online);
+ List<Device> getDevices(Boolean onLine);
@Delete("DELETE FROM wvp_device WHERE device_id=#{deviceId}")
int del(String deviceId);
@@ -198,10 +200,10 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online"+
- " FROM wvp_device WHERE online = true")
+ "on_line"+
+ " FROM wvp_device WHERE on_line = true")
List<Device> getOnlineDevices();
@Select("SELECT " +
"device_id,"+
@@ -229,9 +231,9 @@
"subscribe_cycle_for_alarm,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcast_push_after_ack,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online"+
+ "on_line"+
" FROM wvp_device WHERE ip = #{host} AND port=#{port}")
Device getDeviceByHostAndPort(String host, int port);
@@ -251,8 +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=\"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}"+
" </script>"})
@@ -268,10 +271,11 @@
"charset,"+
"ssrc_check,"+
"as_message_channel,"+
+ "broadcastPushAfterAck,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online,"+
- "media_server_id"+
+ "on_line,"+
+ "media_server_id,"+
+ "switch_primary_sub_stream"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -282,10 +286,11 @@
"#{charset}," +
"#{ssrcCheck}," +
"#{asMessageChannel}," +
+ "#{broadcastPushAfterAck}," +
"#{geoCoordSys}," +
- "#{treeType}," +
- "#{online}," +
- "#{mediaServerId}" +
+ "#{onLine}," +
+ "#{mediaServerId}," +
+ "#{switchPrimarySubStream}" +
")")
void addCustomDevice(Device device);
--
Gitblit v1.8.0