From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 18 十月 2022 22:18:49 +0800 Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java index 9921a70..675a8bc 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java @@ -15,9 +15,10 @@ public interface StreamPushMapper { @Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " + - "pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime, pushIng) VALUES" + + "pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime, pushIng, self) VALUES" + "('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " + - "'${pushTime}', '${aliveSecond}', '${mediaServerId}' , '${serverId}' , '${updateTime}' , '${createTime}', ${pushIng} )") + "'${pushTime}', '${aliveSecond}', '${mediaServerId}' , '${serverId}' , '${updateTime}' , '${createTime}', " + + "${pushIng}, ${self} )") int add(StreamPushItem streamPushItem); @@ -31,6 +32,7 @@ "<if test=\"pushTime != null\">, pushTime='${pushTime}'</if>" + "<if test=\"aliveSecond != null\">, aliveSecond='${aliveSecond}'</if>" + "<if test=\"pushIng != null\">, pushIng=${pushIng}</if>" + + "<if test=\"self != null\">, self=${self}</if>" + "WHERE app=#{app} AND stream=#{stream}"+ " </script>"}) int update(StreamPushItem streamPushItem); @@ -74,8 +76,8 @@ "WHERE " + "1=1 " + " <if test='query != null'> AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " + - " <if test='pushing == true' > AND (gs.gbId is null OR st.status=1)</if>" + - " <if test='pushing == false' > AND st.status=0</if>" + + " <if test='pushing == true' > AND (gs.gbId is null OR st.pushIng=1)</if>" + + " <if test='pushing == false' > AND (st.pushIng is null OR st.pushIng=0) </if>" + " <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" + "order by st.createTime desc" + " </script>"}) @@ -119,7 +121,7 @@ @Update("UPDATE stream_push " + "SET pushIng=${pushIng} " + "WHERE app=#{app} AND stream=#{stream}") - int updatePushStatus(String app, String stream, boolean status); + int updatePushStatus(String app, String stream, boolean pushIng); @Update("UPDATE stream_push " + "SET status=#{status} " + @@ -166,4 +168,7 @@ @Update("UPDATE stream_push SET status=0") void setAllStreamOffline(); + + @Select("SELECT CONCAT(app,stream) FROM gb_stream") + List<String> getAllAppAndStream(); } -- Gitblit v1.8.0