From 713aa00acc398e44cb2a59e4f5c3f55b4e0784d8 Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期三, 22 三月 2023 15:21:22 +0800
Subject: [PATCH] perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 24 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 41e4c44..492dfe3 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,9 +1,14 @@
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 com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.apache.ibatis.annotations.*;
+// import org.omg.PortableInterceptor.INACTIVE;
import org.springframework.stereotype.Repository;
+import java.util.Collection;
import java.util.List;
@Mapper
@@ -11,46 +16,166 @@
public interface StreamPushMapper {
@Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond, mediaServerId) VALUES" +
- "('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " +
- "'${createStamp}', '${aliveSecond}', '${mediaServerId}' )")
+ "pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime, pushIng, self) VALUES" +
+ "(#{app}, #{stream}, #{totalReaderCount}, #{originType}, #{originTypeStr}, " +
+ "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{serverId} , #{updateTime} , #{createTime}, " +
+ "#{pushIng}, #{self} )")
int add(StreamPushItem streamPushItem);
- @Update("UPDATE stream_push " +
- "SET app=#{app}," +
- "stream=#{stream}," +
- "mediaServerId=#{mediaServerId}," +
- "totalReaderCount=#{totalReaderCount}, " +
- "originType=#{originType}," +
- "originTypeStr=#{originTypeStr}, " +
- "createStamp=#{createStamp}, " +
- "aliveSecond=#{aliveSecond} " +
- "WHERE app=#{app} AND stream=#{stream}")
+
+ @Update(value = {" <script>" +
+ "UPDATE stream_push " +
+ "SET updateTime=#{updateTime}" +
+ "<if test=\"mediaServerId != null\">, mediaServerId=#{mediaServerId}</if>" +
+ "<if test=\"totalReaderCount != null\">, totalReaderCount=#{totalReaderCount}</if>" +
+ "<if test=\"originType != null\">, originType=#{originType}</if>" +
+ "<if test=\"originTypeStr != null\">, originTypeStr=#{originTypeStr}</if>" +
+ "<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);
@Delete("DELETE FROM stream_push WHERE app=#{app} AND stream=#{stream}")
int del(String app, String 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")
+ @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}) " +
+ "</foreach>" +
+ "</script>")
+ int delAll(List<StreamPushItem> streamPushItems);
+
+ @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.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 concat('%',#{query},'%') OR st.stream LIKE concat('%',#{query},'%') OR gs.gbId LIKE concat('%',#{query},'%') OR gs.name LIKE concat('%',#{query},'%'))</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>"})
+ List<StreamPushItem> selectAllForList(String query, Boolean pushing, String mediaServerId);
+
+ @Select("SELECT st.*, gs.gbId, 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.createTime 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.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>" +
- "INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond, mediaServerId) " +
- "VALUES <foreach collection='streamPushItems' item='item' index='index' >" +
- "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', '${item.originType}', " +
- "'${item.originTypeStr}','${item.createStamp}', '${item.aliveSecond}', '${item.mediaServerId}' )" +
+ "Insert IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
+ "createTime, aliveSecond, mediaServerId, status, pushIng) " +
+ "VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
+ "( #{item.app}, #{item.stream}, #{item.totalReaderCount}, #{item.originType}, " +
+ "#{item.originTypeStr},#{item.createTime}, #{item.aliveSecond}, #{item.mediaServerId}, #{item.status} ," +
+ " #{item.pushIng} )" +
" </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 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);
+
+ @Update("UPDATE stream_push " +
+ "SET status=#{status} " +
+ "WHERE app=#{app} AND stream=#{stream}")
+ int updateStatus(String app, String stream, boolean status);
+
+ @Update("UPDATE stream_push " +
+ "SET pushIng=#{pushIng} " +
+ "WHERE app=#{app} AND stream=#{stream}")
+ int updatePushStatus(String app, String stream, boolean pushIng);
+
+ @Update("UPDATE stream_push " +
+ "SET status=#{status} " +
+ "WHERE mediaServerId=#{mediaServerId}")
+ void updateStatusByMediaServerId(String mediaServerId, boolean status);
+
+
+ @Select("<script> "+
+ "SELECT gs.* FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream " +
+ "where sp.status = 1 and (gs.app, gs.stream) in (" +
+ "<foreach collection='offlineStreams' item='item' separator=','>" +
+ "(#{item.app}, #{item.stream}) " +
+ "</foreach>" +
+ ")</script>")
+ List<GbStream> getOnlinePusherForGbInList(List<StreamPushItemFromRedis> offlineStreams);
+
+ @Update("<script> "+
+ "UPDATE stream_push SET status=0 where (app, stream) in (" +
+ "<foreach collection='offlineStreams' item='item' separator=','>" +
+ "(#{item.app}, #{item.stream}) " +
+ "</foreach>" +
+ ")</script>")
+ void offline(List<StreamPushItemFromRedis> offlineStreams);
+
+ @Select("<script> "+
+ "SELECT * FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream " +
+ "where sp.status = 0 and (gs.app, gs.stream) in (" +
+ "<foreach collection='onlineStreams' item='item' separator=','>" +
+ "(#{item.app}, #{item.stream}) " +
+ "</foreach>" +
+ ") </script>")
+ List<GbStream> getOfflinePusherForGbInList(List<StreamPushItemFromRedis> onlineStreams);
+
+ @Update("<script> "+
+ "UPDATE stream_push SET status=1 where (app, stream) in (" +
+ "<foreach collection='onlineStreams' item='item' separator=','>" +
+ "(#{item.app}, #{item.stream}) " +
+ "</foreach>" +
+ ")</script>")
+ void online(List<StreamPushItemFromRedis> onlineStreams);
+
+ @Select("SELECT gs.* FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream where sp.status = 1")
+ List<GbStream> getOnlinePusherForGb();
+
+ @Update("UPDATE stream_push SET status=0")
+ void setAllStreamOffline();
+
+ @Select("SELECT CONCAT(app,stream) FROM gb_stream")
+ List<String> getAllAppAndStream();
+
+ @Select(value = {" <script>" +
+ " <if test='pushIngAsOnline == true'> select count(1) as total, sum(pushIng) as online from stream_push </if>" +
+ " <if test='pushIngAsOnline == false'> select count(1) as total, sum(status) as online from stream_push </if>" +
+ " </script>"})
+ ResourceBaceInfo getOverview(boolean pushIngAsOnline);
}
--
Gitblit v1.8.0