From d849352441eaf2ef3398eb25cd0f933ff59beec9 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 12 五月 2023 10:37:03 +0800 Subject: [PATCH] 重构以适配postgresql --- src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 96 +++++++++++++++++++++++------------------------ 1 files changed, 47 insertions(+), 49 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 492dfe3..fefdab3 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 @@ -5,18 +5,16 @@ 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 @Repository public interface StreamPushMapper { - @Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " + - "pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime, pushIng, self) VALUES" + + @Insert("INSERT INTO wvp_stream_push (app, stream, total_reader_count, origin_type, origin_type_str, " + + "push_time, alive_second, media_server_id, server_id, update_time, create_time, push_ing, self) VALUES" + "(#{app}, #{stream}, #{totalReaderCount}, #{originType}, #{originTypeStr}, " + "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{serverId} , #{updateTime} , #{createTime}, " + "#{pushIng}, #{self} )") @@ -24,33 +22,33 @@ @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>" + + "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>" + @@ -58,7 +56,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>" + @@ -69,30 +67,30 @@ @Select(value = {" <script>" + "SELECT " + "st.*, " + - "gs.gbId, 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 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" + + " <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); - @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") + @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.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.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(String app, String stream); @Insert("<script>" + - "Insert IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " + - "createTime, aliveSecond, mediaServerId, status, pushIng) " + + "Insert IGNORE 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.createTime}, #{item.aliveSecond}, #{item.mediaServerId}, #{item.status} ," + @@ -102,37 +100,37 @@ @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 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 ") 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 stream_push " + + @Update("UPDATE wvp_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} " + + @Update("UPDATE wvp_stream_push " + + "SET push_ing=#{pushIng} " + "WHERE app=#{app} AND stream=#{stream}") int updatePushStatus(String app, String stream, boolean pushIng); - @Update("UPDATE stream_push " + + @Update("UPDATE wvp_stream_push " + "SET status=#{status} " + - "WHERE mediaServerId=#{mediaServerId}") + "WHERE media_server_id=#{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 (" + + "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>" + @@ -140,7 +138,7 @@ List<GbStream> getOnlinePusherForGbInList(List<StreamPushItemFromRedis> offlineStreams); @Update("<script> "+ - "UPDATE stream_push SET status=0 where (app, stream) in (" + + "UPDATE wvp_stream_push SET status=0 where (app, stream) in (" + "<foreach collection='offlineStreams' item='item' separator=','>" + "(#{item.app}, #{item.stream}) " + "</foreach>" + @@ -148,7 +146,7 @@ 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 " + + "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}) " + @@ -157,25 +155,25 @@ List<GbStream> getOfflinePusherForGbInList(List<StreamPushItemFromRedis> onlineStreams); @Update("<script> "+ - "UPDATE stream_push SET status=1 where (app, stream) in (" + + "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 stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream where sp.status = 1") + @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 stream_push SET status=0") + @Update("UPDATE wvp_stream_push SET status=0") void setAllStreamOffline(); - @Select("SELECT CONCAT(app,stream) FROM gb_stream") + @Select("SELECT CONCAT(app,stream) from wvp_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>" + + " <if test='pushIngAsOnline == true'> select count(1) as total, sum(push_ing) as online from wvp_stream_push </if>" + + " <if test='pushIngAsOnline == false'> select count(1) as total, sum(status) as online from wvp_stream_push </if>" + " </script>"}) ResourceBaceInfo getOverview(boolean pushIngAsOnline); } -- Gitblit v1.8.0