XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
648540858
2024-07-17 17:56:26 +08:00
parent 15f44b0d23
commit e46ad4e66a
11 changed files with 149 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/streamPush/bean/StreamPush.java
View File

@@ -68,7 +68,7 @@ public class StreamPush extends CommonGBChannel implements Comparable<StreamPush
* 是否正在推流
*/
@Schema(description = "是否正在推流")
private boolean pushIng;
private boolean pushing;
@Override
public int compareTo(@NotNull StreamPush streamPushItem) {

2
src/main/java/com/genersoft/iot/vmp/streamPush/controller/StreamPushController.java
View File

@@ -236,7 +236,7 @@ public class StreamPushController {
throw new ControllerException(ErrorCode.ERROR400.getCode(), "app或stream不可为空");
}
stream.setGbStatus("OFF");
stream.setPushIng(false);
stream.setPushing(false);
if (!streamPushService.add(stream)) {
throw new ControllerException(ErrorCode.ERROR100);
}

22
src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
View File

@@ -13,8 +13,8 @@ import java.util.Set;
@Repository
public interface StreamPushMapper {
@Insert("INSERT INTO wvp_stream_push (app, stream, media_server_id, server_id, push_time, update_time, create_time, push_ing) VALUES" +
"(#{app}, #{stream}, #{mediaServerId} , #{serverId} , #{pushTime} ,#{updateTime}, #{createTime}, #{pushIng})")
@Insert("INSERT INTO wvp_stream_push (app, stream, media_server_id, server_id, push_time, update_time, create_time, pushing) VALUES" +
"(#{app}, #{stream}, #{mediaServerId} , #{serverId} , #{pushTime} ,#{updateTime}, #{createTime}, #{pushing})")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
int add(StreamPush streamPushItem);
@@ -27,7 +27,7 @@ public interface StreamPushMapper {
"<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
"<if test=\"serverId != null\">, server_id=#{serverId}</if>" +
"<if test=\"pushTime != null\">, push_time=#{pushTime}</if>" +
"<if test=\"pushIng != null\">, push_ing=#{pushIng}</if>" +
"<if test=\"pushing != null\">, pushing=#{pushing}</if>" +
"WHERE id = #{id}"+
" </script>"})
int update(StreamPush streamPushItem);
@@ -49,21 +49,21 @@ public interface StreamPushMapper {
" 1=1 " +
" <if test='query != null'> AND (st.app LIKE concat('%',#{query},'%') OR st.stream LIKE concat('%',#{query},'%') " +
" OR wdc.gb_device_id LIKE concat('%',#{query},'%') OR wdc.gb_name LIKE concat('%',#{query},'%'))</if> " +
" <if test='pushing == true' > AND st.push_ing=1</if>" +
" <if test='pushing == false' > AND st.push_ing=0 </if>" +
" <if test='pushing == true' > AND st.pushing=1</if>" +
" <if test='pushing == false' > AND st.pushing=0 </if>" +
" <if test='mediaServerId != null' > AND st.media_server_id=#{mediaServerId} </if>" +
" order by st.create_time desc" +
" </script>"})
List<StreamPush> selectAllForList(@Param("query") String query, @Param("pushing") Boolean pushing, @Param("mediaServerId") String mediaServerId);
List<StreamPush> selectAll(@Param("query") String query, @Param("pushing") Boolean pushing, @Param("mediaServerId") String mediaServerId);
@Select("SELECT st.*, st.id as stream_push_id, wdc.*, wdc.id as gb_id FROM wvp_stream_push st LEFT join wvp_device_channel wdc on st.id = wdc.stream_push_id WHERE st.app=#{app} AND st.stream=#{stream}")
StreamPush selectByAppAndStream(@Param("app") String app, @Param("stream") String stream);
@Insert("<script>" +
"Insert INTO wvp_stream_push ( " +
" app, stream, media_server_id, server_id, push_time, update_time, create_time, push_ing) " +
" app, stream, media_server_id, server_id, push_time, update_time, create_time, pushing) " +
" VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
" ( #{item.app}, #{item.stream}, #{item.mediaServerId},#{item.serverId} ,#{item.pushTime}, #{item.updateTime}, #{item.createTime}, #{item.pushIng} )" +
" ( #{item.app}, #{item.stream}, #{item.mediaServerId},#{item.serverId} ,#{item.pushTime}, #{item.updateTime}, #{item.createTime}, #{item.pushing} )" +
" </foreach>" +
" </script>")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
@@ -76,9 +76,9 @@ public interface StreamPushMapper {
List<StreamPush> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
@Update("UPDATE wvp_stream_push " +
"SET push_ing=#{pushIng} " +
"SET pushing=#{pushing} " +
"WHERE id=#{id}")
int updatePushStatus(@Param("id") int id, @Param("pushIng") boolean pushIng);
int updatePushStatus(@Param("id") int id, @Param("pushing") boolean pushing);
@Select("<script> "+
@@ -98,7 +98,7 @@ public interface StreamPushMapper {
int getAllCount();
@Select(value = {" <script>" +
" select count(1) from wvp_stream_push where push_ing = true" +
" select count(1) from wvp_stream_push where pushing = true" +
" </script>"})
int getAllPushing(Boolean usePushingAsStatus);

16
src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
View File

@@ -93,7 +93,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
StreamPush streamPushInDb = getPush(event.getApp(), event.getStream());
if (streamPushInDb == null) {
StreamPush streamPush = StreamPush.getInstance(event, userSetting.getServerId());
streamPush.setPushIng(true);
streamPush.setPushing(true);
streamPush.setUpdateTime(DateUtil.getNow());
streamPush.setPushTime(DateUtil.getNow());
add(streamPush);
@@ -151,7 +151,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
if (push == null) {
return;
}
push.setPushIng(false);
push.setPushing(false);
if (push.getGbDeviceId() != null) {
if (userSetting.isUsePushingAsStatus()) {
push.setGbStatus("OFF");
@@ -187,7 +187,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
@Override
public PageInfo<StreamPush> getPushList(Integer page, Integer count, String query, Boolean pushing, String mediaServerId) {
PageHelper.startPage(page, count);
List<StreamPush> all = streamPushMapper.selectAllForList(query, pushing, mediaServerId);
List<StreamPush> all = streamPushMapper.selectAll(query, pushing, mediaServerId);
return new PageInfo<>(all);
}
@@ -236,7 +236,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
log.info("[删除推流]失败， 不存在 app: {}, stream: {}, ", app, stream);
return;
}
if (streamPush.isPushIng()) {
if (streamPush.isPushing()) {
stop(streamPush);
}
if (streamPush.getGbId() > 0) {
@@ -294,7 +294,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
if (mediaServer != null) {
mediaServerService.closeStreams(mediaServer, streamPush.getApp(), streamPush.getStream());
}
streamPush.setPushIng(false);
streamPush.setPushing(false);
if (userSetting.isUsePushingAsStatus()) {
gbChannelService.offline(streamPush.buildCommonGBChannel());
}
@@ -463,7 +463,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
@Override
public void allOffline() {
List<StreamPush> streamPushList = streamPushMapper.selectAllForList(null, null, null);
List<StreamPush> streamPushList = streamPushMapper.selectAll(null, null, null);
if (streamPushList.isEmpty()) {
return;
}
@@ -537,7 +537,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
@Override
public void updatePushStatus(Integer streamPushId, boolean pushIng) {
StreamPush streamPushInDb = streamPushMapper.select(streamPushId);
streamPushInDb.setPushIng(pushIng);
streamPushInDb.setPushing(pushIng);
if (userSetting.isUsePushingAsStatus()) {
streamPushInDb.setGbStatus(pushIng?"ON":"OFF");
}
@@ -578,7 +578,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
if (streamPush == null) {
return 0;
}
if(streamPush.isPushIng()) {
if(streamPush.isPushing()) {
MediaServer mediaServer = mediaServerService.getOne(streamPush.getMediaServerId());
mediaServerService.closeStreams(mediaServer, streamPush.getApp(), streamPush.getStream());
}