From bd4598e6767265f424704820d9dc48d0046a31f2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 04 三月 2024 14:33:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 30ffd2b..c6b4852 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
@@ -43,7 +43,6 @@
"geo_coord_sys," +
"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);
@@ -159,7 +158,6 @@
"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>"+
@@ -249,7 +247,6 @@
"<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=\"switchPrimarySubStream != null\">, switch_primary_sub_stream=#{switchPrimarySubStream}</if>" +
"<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
"WHERE device_id=#{deviceId}"+
" </script>"})
@@ -267,8 +264,7 @@
"as_message_channel,"+
"geo_coord_sys,"+
"on_line,"+
- "media_server_id,"+
- "switch_primary_sub_stream"+
+ "media_server_id"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -281,8 +277,7 @@
"#{asMessageChannel}," +
"#{geoCoordSys}," +
"#{onLine}," +
- "#{mediaServerId}," +
- "#{switchPrimarySubStream}" +
+ "#{mediaServerId}" +
")")
void addCustomDevice(Device device);
--
Gitblit v1.8.0