Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改totalReaderCount类型

pull/1414/head
648540858 2024-04-12 10:36:18 +08:00
parent da54cdf3b8
commit f34143df6d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
View File

@ -35,7 +35,7 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
* 观看总人数，包括hls/rtsp/rtmp/http-flv/ws-flv * 观看总人数，包括hls/rtsp/rtmp/http-flv/ws-flv
*/ */
@Schema(description = "观看总人数") @Schema(description = "观看总人数")
private String totalReaderCount; private Integer totalReaderCount;
/** /**
* 协议 包括hls/rtsp/rtmp/http-flv/ws-flv * 协议 包括hls/rtsp/rtmp/http-flv/ws-flv
@ -159,7 +159,7 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
streamPushItem.setStream(streamInfo.getStream()); streamPushItem.setStream(streamInfo.getStream());
streamPushItem.setAliveSecond(streamInfo.getMediaInfo().getAliveSecond()); streamPushItem.setAliveSecond(streamInfo.getMediaInfo().getAliveSecond());
// streamPushItem.setOriginSock(streamInfo.getMediaInfo().getOriginSock()); // streamPushItem.setOriginSock(streamInfo.getMediaInfo().getOriginSock());
streamPushItem.setTotalReaderCount(streamInfo.getMediaInfo().getReaderCount() + ""); streamPushItem.setTotalReaderCount(streamInfo.getMediaInfo().getReaderCount());
streamPushItem.setOriginType(streamInfo.getOriginType()); streamPushItem.setOriginType(streamInfo.getOriginType());
// streamPushItem.setOriginTypeStr(streamInfo.getMediaInfo().getOriginTypeStr()); // streamPushItem.setOriginTypeStr(streamInfo.getMediaInfo().getOriginTypeStr());
// streamPushItem.setOriginUrl(streamInfo.getMediaInfo().getOriginUrl()); // streamPushItem.setOriginUrl(streamInfo.getMediaInfo().getOriginUrl());
@ -180,7 +180,7 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
streamPushItem.setStream(event.getStream()); streamPushItem.setStream(event.getStream());
streamPushItem.setAliveSecond(event.getMediaInfo().getAliveSecond()); streamPushItem.setAliveSecond(event.getMediaInfo().getAliveSecond());
// streamPushItem.setOriginSock(streamInfo.getMediaInfo().getOriginSock()); // streamPushItem.setOriginSock(streamInfo.getMediaInfo().getOriginSock());
streamPushItem.setTotalReaderCount(event.getMediaInfo().getReaderCount() + ""); streamPushItem.setTotalReaderCount(event.getMediaInfo().getReaderCount());
streamPushItem.setOriginType(event.getMediaInfo().getOriginType()); streamPushItem.setOriginType(event.getMediaInfo().getOriginType());
// streamPushItem.setOriginTypeStr(streamInfo.getMediaInfo().getOriginTypeStr()); // streamPushItem.setOriginTypeStr(streamInfo.getMediaInfo().getOriginTypeStr());
// streamPushItem.setOriginUrl(streamInfo.getMediaInfo().getOriginUrl()); // streamPushItem.setOriginUrl(streamInfo.getMediaInfo().getOriginUrl());
@ -242,11 +242,11 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
this.stream = stream; this.stream = stream;
} }
public String getTotalReaderCount() { public Integer getTotalReaderCount() {
return totalReaderCount; return totalReaderCount;
} }
public void setTotalReaderCount(String totalReaderCount) { public void setTotalReaderCount(Integer totalReaderCount) {
this.totalReaderCount = totalReaderCount; this.totalReaderCount = totalReaderCount;
} }

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

@ -217,7 +217,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
streamPushItem.setStream(item.getStream()); streamPushItem.setStream(item.getStream());
streamPushItem.setAliveSecond(item.getAliveSecond()); streamPushItem.setAliveSecond(item.getAliveSecond());
streamPushItem.setOriginSock(item.getOriginSock()); streamPushItem.setOriginSock(item.getOriginSock());
streamPushItem.setTotalReaderCount(item.getTotalReaderCount() + ""); streamPushItem.setTotalReaderCount(item.getTotalReaderCount());
streamPushItem.setOriginType(item.getOriginType()); streamPushItem.setOriginType(item.getOriginType());
streamPushItem.setOriginTypeStr(item.getOriginTypeStr()); streamPushItem.setOriginTypeStr(item.getOriginTypeStr());
streamPushItem.setOriginUrl(item.getOriginUrl()); streamPushItem.setOriginUrl(item.getOriginUrl());

2
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
View File

@ -137,7 +137,7 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
streamPushItem.setName(streamPushExcelDto.getName()); streamPushItem.setName(streamPushExcelDto.getName());
streamPushItem.setOriginType(2); streamPushItem.setOriginType(2);
streamPushItem.setOriginTypeStr("rtsp_push"); streamPushItem.setOriginTypeStr("rtsp_push");
streamPushItem.setTotalReaderCount("0"); streamPushItem.setTotalReaderCount(0);
streamPushItem.setPlatformId(streamPushExcelDto.getPlatformId()); streamPushItem.setPlatformId(streamPushExcelDto.getPlatformId());
streamPushItem.setCatalogId(streamPushExcelDto.getCatalogId()); streamPushItem.setCatalogId(streamPushExcelDto.getCatalogId());

2
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java
View File

@ -84,7 +84,7 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener {
streamPushItem.setMediaServerId(mediaServerService.getDefaultMediaServer().getId()); streamPushItem.setMediaServerId(mediaServerService.getDefaultMediaServer().getId());
streamPushItem.setOriginType(2); streamPushItem.setOriginType(2);
streamPushItem.setOriginTypeStr("rtsp_push"); streamPushItem.setOriginTypeStr("rtsp_push");
streamPushItem.setTotalReaderCount("0"); streamPushItem.setTotalReaderCount(0);
streamPushItemForSave.add(streamPushItem); streamPushItemForSave.add(streamPushItem);
allGBId.put(streamPushItem.getGbId(), streamPushItem); allGBId.put(streamPushItem.getGbId(), streamPushItem);
} else { } else {

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

@ -274,7 +274,7 @@ public class StreamPushController {
stream.setStatus(false); stream.setStatus(false);
stream.setPushIng(false); stream.setPushIng(false);
stream.setAliveSecond(0L); stream.setAliveSecond(0L);
stream.setTotalReaderCount("0"); stream.setTotalReaderCount(0);
if (!streamPushService.add(stream)) { if (!streamPushService.add(stream)) {
throw new ControllerException(ErrorCode.ERROR100); throw new ControllerException(ErrorCode.ERROR100);
} }