From 66cadafd1c4f6a7c84fec90cf7c073060a0b9d5f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 27 一月 2022 17:40:59 +0800
Subject: [PATCH] 优化直播推流的CivilCode
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 21 ++++++++++++++++-----
1 files changed, 16 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 6a1093c..08b7c82 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
@@ -33,6 +33,14 @@
int del(String app, String stream);
@Delete("<script> "+
+ "DELETE sp FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream where " +
+ "<foreach collection='streamPushItems' item='item' separator='or'>" +
+ "(sp.app=#{item.app} and sp.stream=#{item.stream} and gs.gbId is null) " +
+ "</foreach>" +
+ "</script>")
+ int delAllWithoutGBId(List<StreamPushItem> streamPushItems);
+
+ @Delete("<script> "+
"DELETE FROM stream_push where " +
"<foreach collection='streamPushItems' item='item' separator='or'>" +
"(app=#{item.app} and stream=#{item.stream}) " +
@@ -40,7 +48,7 @@
"</script>")
int delAll(List<StreamPushItem> streamPushItems);
- @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream")
+ @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream order by st.createStamp desc")
List<StreamPushItem> selectAll();
@Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}")
@@ -50,11 +58,11 @@
StreamPushItem selectOne(String app, String stream);
@Insert("<script>" +
- "INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
+ "REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
"createStamp, aliveSecond, mediaServerId) " +
"VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
- "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', '${item.originType}', " +
- "'${item.originTypeStr}','${item.createStamp}', '${item.aliveSecond}', '${item.mediaServerId}' )" +
+ "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " +
+ "'${item.originTypeStr}',#{item.createStamp}, #{item.aliveSecond}, '${item.mediaServerId}' )" +
" </foreach>" +
"</script>")
void addAll(List<StreamPushItem> streamPushItems);
@@ -62,10 +70,13 @@
@Delete("DELETE FROM stream_push")
void clear();
- @Delete("DELETE FROM stream_push WHERE mediaServerId=#{mediaServerId}")
+ @Delete("DELETE sp FROM stream_push sp left join gb_stream gs on gs.app = sp.app and gs.stream= sp.stream WHERE sp.mediaServerId=#{mediaServerId} and gs.gbId is null ")
void deleteWithoutGBId(String mediaServerId);
@Select("SELECT * FROM stream_push WHERE mediaServerId=#{mediaServerId}")
List<StreamPushItem> selectAllByMediaServerId(String mediaServerId);
+ @Select("SELECT sp.* FROM stream_push sp left join gb_stream gs on gs.app = sp.app and gs.stream= sp.stream WHERE sp.mediaServerId=#{mediaServerId} and gs.gbId is null")
+ List<StreamPushItem> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
+
}
--
Gitblit v1.8.0