From 9ef1a0277b23c0302891d74648e0b559423dcbb8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 18 五月 2022 15:36:33 +0800
Subject: [PATCH] 更新jessibuca播放器
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 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 9a5d3be..909d3a8 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
@@ -1,7 +1,9 @@
package com.genersoft.iot.vmp.storager.dao;
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import org.apache.ibatis.annotations.*;
+// import org.omg.PortableInterceptor.INACTIVE;
import org.springframework.stereotype.Repository;
import java.util.Collection;
@@ -33,6 +35,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,32 +50,60 @@
"</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 order by st.createStamp desc")
+ @Delete("<script> "+
+ "DELETE FROM stream_push where " +
+ "<foreach collection='gbStreams' item='item' separator='or'>" +
+ "(app=#{item.app} and stream=#{item.stream}) " +
+ "</foreach>" +
+ "</script>")
+ int delAllForGbStream(List<GbStream> gbStreams);
+
+
+ @Select(value = {" <script>" +
+ "SELECT " +
+ "st.*, " +
+ "gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude, gs.gbStreamId " +
+ "from " +
+ "stream_push st " +
+ "LEFT JOIN gb_stream gs " +
+ "on st.app = gs.app AND st.stream = gs.stream " +
+ "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 gs.status=1)</if>" +
+ " <if test='pushing == false' > AND gs.status=0</if>" +
+ " <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" +
+ "order by st.createStamp desc" +
+ " </script>"})
+ List<StreamPushItem> selectAllForList(String query, Boolean pushing, String mediaServerId);
+
+ @Select("SELECT st.*, gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.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}")
- List<StreamPushItem> selectForEnable(boolean enable);
-
- @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.app=#{app} AND st.stream=#{stream}")
+ @Select("SELECT st.*, gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
StreamPushItem selectOne(String app, String stream);
@Insert("<script>" +
- "REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
+ "Insert IGNORE 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);
+ @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+ int addAll(List<StreamPushItem> streamPushItems);
@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