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-16 17:33:18 +08:00
parent 90d298f7a7
commit d7abe7fb75
22 changed files with 1154 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
View File

@@ -71,7 +71,7 @@ public class StreamProxy extends CommonGBChannel {
@Schema(description = "创建时间")
private String createTime;
public CommonGBChannel getCommonGBChannel() {
public CommonGBChannel buildCommonGBChannel() {
if (ObjectUtils.isEmpty(this.getGbDeviceId())) {
return null;
}

16
src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java
View File

@@ -169,7 +169,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
streamProxy.setUpdateTime(now);
if (streamProxyMapper.add(streamProxy) > 0 && !ObjectUtils.isEmpty(streamProxy.getGbDeviceId())) {
gbChannelService.add(streamProxy.getCommonGBChannel());
gbChannelService.add(streamProxy.buildCommonGBChannel());
}
return true;
}
@@ -183,9 +183,9 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
if (streamProxyMapper.update(streamProxy) > 0 && !ObjectUtils.isEmpty(streamProxy.getGbDeviceId())) {
if (streamProxy.getGbId() > 0) {
gbChannelService.update(streamProxy.getCommonGBChannel());
gbChannelService.update(streamProxy.buildCommonGBChannel());
}else {
gbChannelService.add(streamProxy.getCommonGBChannel());
gbChannelService.add(streamProxy.buildCommonGBChannel());
}
}
return true;
@@ -303,7 +303,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
redisCatchStorage.addStream(mediaServer, "pull", streamInfo.getApp(), streamInfo.getStream(), streamInfo.getMediaInfo());
if ("OFF".equalsIgnoreCase(streamProxy.getGbStatus()) && streamProxy.getGbId() > 0) {
streamProxy.setGbStatus("ON");
channelListForOnline.add(streamProxy.getCommonGBChannel());
channelListForOnline.add(streamProxy.buildCommonGBChannel());
}
streamProxyMapForDb.remove(key);
}
@@ -319,7 +319,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
for (StreamProxy streamProxy : streamProxyMapForDb.values()) {
if ("ON".equalsIgnoreCase(streamProxy.getGbStatus()) && streamProxy.getGbId() > 0) {
streamProxy.setGbStatus("OFF");
channelListForOffline.add(streamProxy.getCommonGBChannel());
channelListForOffline.add(streamProxy.buildCommonGBChannel());
}
// 移除开启了无人观看自动移除的流
if (streamProxy.getGbDeviceId() == null && streamProxy.isEnableRemoveNoneReader()) {
@@ -360,7 +360,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
for (StreamProxy streamProxy : streamProxies) {
if (streamProxy.getGbId() > 0 && "ON".equalsIgnoreCase(streamProxy.getGbStatus())) {
channelListForOffline.add(streamProxy.getCommonGBChannel());
channelListForOffline.add(streamProxy.buildCommonGBChannel());
}
if (streamProxy.getGbId() == 0 && streamProxy.isEnableRemoveNoneReader()) {
streamProxiesForRemove.add(streamProxy);
@@ -400,9 +400,9 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
streamProxy.setGbStatus(status?"ON":"OFF");
if (streamProxy.getGbId() > 0) {
if (status) {
gbChannelService.online(streamProxy.getCommonGBChannel());
gbChannelService.online(streamProxy.buildCommonGBChannel());
}else {
gbChannelService.offline(streamProxy.getCommonGBChannel());
gbChannelService.offline(streamProxy.buildCommonGBChannel());
}
}