From 019827fd35f84465ee503fcc248b12a045da44d2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 十一月 2021 18:09:49 +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/GbStreamMapper.java | 15 ++++++++++-----
1 files changed, 10 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 2ada231..ebf4239 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 " +
@@ -24,9 +25,10 @@
"name=#{name}," +
"streamType=#{streamType}," +
"longitude=#{longitude}, " +
- "latitude=#{latitude} " +
+ "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}")
@@ -51,5 +53,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