From 985082d33930868c3cc1723f28fd9aaae9013a8f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 09:11:22 +0800
Subject: [PATCH] 添加缺少的内容
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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
old mode 100644
new mode 100755
index 4bbf51b..96773fe
--- 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,9 @@
"ssrc_check," +
"as_message_channel," +
"geo_coord_sys," +
- "tree_type," +
"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);
@@ -74,7 +74,6 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line"+
") VALUES (" +
"#{deviceId}," +
@@ -103,7 +102,6 @@
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
- "#{treeType}," +
"#{onLine}" +
")")
int add(Device device);
@@ -158,9 +156,9 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
"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>"+
@@ -199,7 +197,6 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line"+
" FROM wvp_device WHERE on_line = true")
List<Device> getOnlineDevices();
@@ -230,7 +227,6 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line"+
" FROM wvp_device WHERE ip = #{host} AND port=#{port}")
Device getDeviceByHostAndPort(String host, int port);
@@ -252,7 +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=\"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>"})
@@ -269,9 +265,9 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
"on_line,"+
- "media_server_id"+
+ "media_server_id,"+
+ "switch_primary_sub_stream"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -283,9 +279,9 @@
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
- "#{treeType}," +
"#{onLine}," +
- "#{mediaServerId}" +
+ "#{mediaServerId}," +
+ "#{switchPrimarySubStream}" +
")")
void addCustomDevice(Device device);
--
Gitblit v1.8.0