From e5370bbd6e74b7746db12ced5302ef97ef58a4ce Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期四, 03 三月 2022 19:52:16 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 2c63c82..230b23b 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
@@ -42,15 +42,15 @@
"SELECT gs.* FROM gb_stream gs " +
"WHERE " +
"1=1 " +
- " <if test='catalogId != null'> AND gs.gbStreamId in" +
+ " <if test='catalogId != null'> AND gs.gbId in" +
"(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId} and pgs.catalogId=#{catalogId})</if> " +
- " <if test='catalogId == null'> AND gs.gbStreamId not in" +
+ " <if test='catalogId == null'> AND gs.gbId not in" +
"(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId}) </if> " +
" <if test='query != null'> AND (gs.app LIKE '%${query}%' OR gs.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " +
" <if test='pushing == true' > AND gs.status=1</if>" +
" <if test='pushing == false' > AND gs.status=0</if>" +
" <if test='mediaServerId != null' > AND gs.mediaServerId=#{mediaServerId} </if>" +
- " order by gs.gbStreamId asc " +
+ " order by gs.gbId asc " +
"</script>")
List<GbStream> selectAll(String platformId, String catalogId, String query, Boolean pushing, String mediaServerId);
@@ -61,18 +61,18 @@
List<GbStream> selectByGBId(String gbId);
@Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " +
- "LEFT JOIN platform_gb_stream pgs ON gs.gbStreamId = pgs.catalogId " +
+ "LEFT JOIN platform_gb_stream pgs ON gs.gbId = pgs.gbStreamId " +
"WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'")
GbStream queryStreamInPlatform(String platformId, String gbId);
@Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " +
- "LEFT JOIN platform_gb_stream pgs ON gs.gbStreamId = pgs.gbStreamId " +
+ "LEFT JOIN platform_gb_stream pgs ON gs.gbId = pgs.gbStreamId " +
"WHERE pgs.platformId = #{platformId}")
List<GbStream> queryGbStreamListInPlatform(String platformId);
@Select("SELECT gs.* FROM gb_stream gs LEFT JOIN platform_gb_stream pgs " +
- "ON gs.gbStreamId = pgs.gbStreamId WHERE pgs.gbStreamId is NULL")
+ "ON gs.gbId = pgs.gbStreamId WHERE pgs.gbStreamId is NULL")
List<GbStream> queryStreamNotInPlatform();
@Update("UPDATE gb_stream " +
@@ -129,10 +129,10 @@
int updateStreamGPS(List<GPSMsgInfo> gpsMsgInfos);
@Select("<script> "+
- "SELECT * FROM gb_stream where " +
- "<foreach collection='streamPushItems' item='item' separator='or'>" +
- "(app=#{item.app} and stream=#{item.stream}) " +
- "</foreach>" +
- "</script>")
+ "SELECT * FROM gb_stream where " +
+ "<foreach collection='streamPushItems' item='item' separator='or'>" +
+ "(app=#{item.app} and stream=#{item.stream}) " +
+ "</foreach>" +
+ "</script>")
List<GbStream> selectAllForAppAndStream(List<StreamPushItem> streamPushItems);
}
--
Gitblit v1.8.0