From 86cd03ce701555483e32bd3f5e21bd2614a859ab Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 06 十二月 2021 10:47:24 +0800
Subject: [PATCH] 修复rtsp端口配置未从zlm获取的问题
---
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
index 80397d2..84c04a1 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
@@ -12,9 +12,10 @@
public interface GbStreamMapper {
@Insert("INSERT INTO gb_stream (app, stream, gbId, name, " +
- "longitude, latitude, streamType, status) VALUES" +
+ "longitude, latitude, streamType, mediaServerId, status) VALUES" +
"('${app}', '${stream}', '${gbId}', '${name}', " +
- "'${longitude}', '${latitude}', '${streamType}', ${status})")
+ "'${longitude}', '${latitude}', '${streamType}', " +
+ "'${mediaServerId}', ${status})")
int add(GbStream gbStream);
@Update("UPDATE gb_stream " +
@@ -25,8 +26,9 @@
"streamType=#{streamType}," +
"longitude=#{longitude}, " +
"latitude=#{latitude}," +
+ "mediaServerId=#{mediaServerId}," +
"status=${status} " +
- "WHERE app=#{app} AND stream=#{stream} AND gbId=#{gbId}")
+ "WHERE app=#{app} AND stream=#{stream}")
int update(GbStream gbStream);
@Delete("DELETE FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
@@ -38,10 +40,13 @@
@Select("SELECT * FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
StreamProxyItem selectOne(String app, String stream);
+ @Select("SELECT * FROM gb_stream WHERE gbId=#{gbId}")
+ List<GbStream> selectByGBId(String gbId);
+
@Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
"WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'")
- GbStream queryStreamInPlatform(String platformId, String gbId);
+ List<GbStream> queryStreamInPlatform(String platformId, String gbId);
@Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
@@ -51,5 +56,8 @@
@Update("UPDATE gb_stream " +
"SET status=${status} " +
"WHERE app=#{app} AND stream=#{stream}")
- void setStatus(String app, String stream, boolean status);
+ int setStatus(String app, String stream, boolean status);
+
+ @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream WHERE mediaServerId=#{mediaServerId} ")
+ List<GbStream> selectAllByMediaServerId(String mediaServerId);
}
--
Gitblit v1.8.0