From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 170 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 129 insertions(+), 41 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
old mode 100644
new mode 100755
index 594c319..be0924a
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -2,48 +2,52 @@
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 org.apache.ibatis.annotations.*;
-import org.omg.PortableInterceptor.INACTIVE;
import org.springframework.stereotype.Repository;
-import java.util.Collection;
import java.util.List;
@Mapper
@Repository
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}' )")
+ @Insert("INSERT INTO wvp_stream_push (app, stream, total_reader_count, origin_type, origin_type_str, " +
+ "push_time, alive_second, media_server_id, update_time, create_time, push_ing, self) VALUES" +
+ "(#{app}, #{stream}, #{totalReaderCount}, #{originType}, #{originTypeStr}, " +
+ "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{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 wvp_stream_push " +
+ "SET update_time=#{updateTime}" +
+ "<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
+ "<if test=\"totalReaderCount != null\">, total_reader_count=#{totalReaderCount}</if>" +
+ "<if test=\"originType != null\">, origin_type=#{originType}</if>" +
+ "<if test=\"originTypeStr != null\">, origin_type_str=#{originTypeStr}</if>" +
+ "<if test=\"pushTime != null\">, push_time=#{pushTime}</if>" +
+ "<if test=\"aliveSecond != null\">, alive_second=#{aliveSecond}</if>" +
+ "<if test=\"pushIng != null\">, push_ing=#{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}")
+ @Delete("DELETE FROM wvp_stream_push WHERE app=#{app} AND stream=#{stream}")
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 " +
+ "DELETE sp FROM wvp_stream_push sp left join wvp_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) " +
+ "(sp.app=#{item.app} and sp.stream=#{item.stream} and gs.gb_id is null) " +
"</foreach>" +
"</script>")
int delAllWithoutGBId(List<StreamPushItem> streamPushItems);
@Delete("<script> "+
- "DELETE FROM stream_push where " +
+ "DELETE FROM wvp_stream_push where " +
"<foreach collection='streamPushItems' item='item' separator='or'>" +
"(app=#{item.app} and stream=#{item.stream}) " +
"</foreach>" +
@@ -51,7 +55,7 @@
int delAll(List<StreamPushItem> streamPushItems);
@Delete("<script> "+
- "DELETE FROM stream_push where " +
+ "DELETE FROM wvp_stream_push where " +
"<foreach collection='gbStreams' item='item' separator='or'>" +
"(app=#{item.app} and stream=#{item.stream}) " +
"</foreach>" +
@@ -62,48 +66,132 @@
@Select(value = {" <script>" +
"SELECT " +
"st.*, " +
- "gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude, gs.gbStreamId " +
+ "gs.gb_id, gs.name, gs.longitude, gs.latitude, gs.gb_stream_id " +
"from " +
- "stream_push st " +
- "LEFT JOIN gb_stream gs " +
+ "wvp_stream_push st " +
+ "LEFT join wvp_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" +
+ " <if test='query != null'> AND (st.app LIKE concat('%',#{query},'%') OR st.stream LIKE concat('%',#{query},'%') OR gs.gb_id LIKE concat('%',#{query},'%') OR gs.name LIKE concat('%',#{query},'%'))</if> " +
+ " <if test='pushing == true' > AND (gs.gb_id is null OR st.push_ing=1)</if>" +
+ " <if test='pushing == false' > AND (st.push_ing is null OR st.push_ing=0) </if>" +
+ " <if test='mediaServerId != null' > AND st.media_server_id=#{mediaServerId} </if>" +
+ "order by st.create_time desc" +
" </script>"})
- List<StreamPushItem> selectAllForList(String query, Boolean pushing, String mediaServerId);
+ List<StreamPushItem> selectAllForList(@Param("query") String query, @Param("pushing") Boolean pushing, @Param("mediaServerId") 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")
+ @Select("SELECT st.*, gs.gb_id, gs.name, gs.longitude, gs.latitude FROM wvp_stream_push st LEFT join wvp_gb_stream gs on st.app = gs.app AND st.stream = gs.stream order by st.create_time desc")
List<StreamPushItem> selectAll();
- @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);
+ @Select("SELECT st.*, gs.gb_id, gs.name, gs.longitude, gs.latitude FROM wvp_stream_push st LEFT join wvp_gb_stream gs on st.app = gs.app AND st.stream = gs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
+ StreamPushItem selectOne(@Param("app") String app, @Param("stream") String stream);
@Insert("<script>" +
- "Insert IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond, mediaServerId) " +
+ "Insert INTO wvp_stream_push (app, stream, total_reader_count, origin_type, origin_type_str, " +
+ "create_time, alive_second, media_server_id, status, push_ing) " +
"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.createTime}, #{item.aliveSecond}, #{item.mediaServerId}, #{item.status} ," +
+ " #{item.pushIng} )" +
" </foreach>" +
"</script>")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
int addAll(List<StreamPushItem> streamPushItems);
- @Delete("DELETE FROM stream_push")
+ @Delete("DELETE FROM wvp_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 ")
+ @Delete("delete" +
+ " from wvp_stream_push " +
+ " where id in " +
+ " (select temp.id from " +
+ " (select wgs.gb_stream_id as id " +
+ " from wvp_gb_stream wgs" +
+ " left join wvp_stream_push sp on sp.id = wgs.gb_stream_id" +
+ " where wgs.gb_id is null and wgs.media_server_id = #{mediaServerId}) temp)"
+ )
void deleteWithoutGBId(String mediaServerId);
- @Select("SELECT * FROM stream_push WHERE mediaServerId=#{mediaServerId}")
+ @Select("SELECT * FROM wvp_stream_push WHERE media_server_id=#{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")
+ @Select("SELECT sp.* FROM wvp_stream_push sp left join wvp_gb_stream gs on gs.app = sp.app and gs.stream= sp.stream WHERE sp.media_server_id=#{mediaServerId} and gs.gb_id is null")
List<StreamPushItem> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
+ @Update("UPDATE wvp_stream_push " +
+ "SET status=#{status} " +
+ "WHERE app=#{app} AND stream=#{stream}")
+ int updateStatus(@Param("app") String app, @Param("stream") String stream, @Param("status") boolean status);
+
+ @Update("UPDATE wvp_stream_push " +
+ "SET push_ing=#{pushIng} " +
+ "WHERE app=#{app} AND stream=#{stream}")
+ int updatePushStatus(@Param("app") String app, @Param("stream") String stream, @Param("pushIng") boolean pushIng);
+
+ @Update("UPDATE wvp_stream_push " +
+ "SET status=#{status} " +
+ "WHERE media_server_id=#{mediaServerId}")
+ void updateStatusByMediaServerId(@Param("mediaServerId") String mediaServerId, @Param("status") boolean status);
+
+
+ @Select("<script> "+
+ "SELECT gs.* FROM wvp_stream_push sp left join wvp_gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream " +
+ "where sp.status = true 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 wvp_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 wvp_stream_push sp left join wvp_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 wvp_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 wvp_stream_push sp left join wvp_gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream where sp.status = true")
+ List<GbStream> getOnlinePusherForGb();
+
+ @Update("UPDATE wvp_stream_push SET status=0")
+ void setAllStreamOffline();
+
+ @Select("SELECT CONCAT(app,stream) from wvp_gb_stream")
+ List<String> getAllAppAndStream();
+
+ @Select("select count(1) from wvp_stream_push ")
+ int getAllCount();
+
+ @Select(value = {" <script>" +
+ " <if test='pushIngAsOnline == true'> select count(1) from wvp_stream_push where push_ing = true </if>" +
+ " <if test='pushIngAsOnline == false'> select count(1)from wvp_stream_push where status = true </if>" +
+ " </script>"})
+ int getAllOnline(Boolean usePushingAsStatus);
+
+ @Select("<script> " +
+ "select app, stream from wvp_stream_push where (app, stream) in " +
+ "<foreach collection='streamPushItems' item='item' separator=','>" +
+ "(#{item.app}, #{item.stream}) " +
+ "</foreach>" +
+ "</script>")
+ List<StreamPushItem> getListIn(List<StreamPushItem> streamPushItems);
}
--
Gitblit v1.8.0