From 269ad8cedbb07ca207a6f33af23085894dab4aa6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 23 四月 2023 14:36:13 +0800
Subject: [PATCH] 修身目录刷新，优化公网下远程IP端口的获取
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 96 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 594c319..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
@@ -2,8 +2,10 @@
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.omg.PortableInterceptor.INACTIVE;
import org.springframework.stereotype.Repository;
import java.util.Collection;
@@ -14,21 +16,26 @@
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}")
@@ -62,33 +69,34 @@
@Select(value = {" <script>" +
"SELECT " +
"st.*, " +
- "gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude, gs.gbStreamId " +
+ "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 '%${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='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.createStamp desc" +
+ "order by st.createTime 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")
+ @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.*, 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}")
+ @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 IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond, mediaServerId) " +
+ "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.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")
@@ -106,4 +114,68 @@
@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