648540858
2024-04-12 f34143df6d376c3444f8f2f01d991db995c25438
修改totalReaderCount类型
5个文件已修改
18 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
@@ -35,7 +35,7 @@
     * 观看总人数,包括hls/rtsp/rtmp/http-flv/ws-flv
     */
    @Schema(description = "观看总人数")
    private String totalReaderCount;
    private Integer totalReaderCount;
    /**
     * 协议 包括hls/rtsp/rtmp/http-flv/ws-flv
@@ -159,7 +159,7 @@
        streamPushItem.setStream(streamInfo.getStream());
        streamPushItem.setAliveSecond(streamInfo.getMediaInfo().getAliveSecond());
//        streamPushItem.setOriginSock(streamInfo.getMediaInfo().getOriginSock());
        streamPushItem.setTotalReaderCount(streamInfo.getMediaInfo().getReaderCount() + "");
        streamPushItem.setTotalReaderCount(streamInfo.getMediaInfo().getReaderCount());
        streamPushItem.setOriginType(streamInfo.getOriginType());
//        streamPushItem.setOriginTypeStr(streamInfo.getMediaInfo().getOriginTypeStr());
//        streamPushItem.setOriginUrl(streamInfo.getMediaInfo().getOriginUrl());
@@ -180,7 +180,7 @@
        streamPushItem.setStream(event.getStream());
        streamPushItem.setAliveSecond(event.getMediaInfo().getAliveSecond());
//        streamPushItem.setOriginSock(streamInfo.getMediaInfo().getOriginSock());
        streamPushItem.setTotalReaderCount(event.getMediaInfo().getReaderCount() + "");
        streamPushItem.setTotalReaderCount(event.getMediaInfo().getReaderCount());
        streamPushItem.setOriginType(event.getMediaInfo().getOriginType());
//        streamPushItem.setOriginTypeStr(streamInfo.getMediaInfo().getOriginTypeStr());
//        streamPushItem.setOriginUrl(streamInfo.getMediaInfo().getOriginUrl());
@@ -242,11 +242,11 @@
        this.stream = stream;
    }
    public String getTotalReaderCount() {
    public Integer getTotalReaderCount() {
        return totalReaderCount;
    }
    public void setTotalReaderCount(String totalReaderCount) {
    public void setTotalReaderCount(Integer totalReaderCount) {
        this.totalReaderCount = totalReaderCount;
    }
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
@@ -217,7 +217,7 @@
        streamPushItem.setStream(item.getStream());
        streamPushItem.setAliveSecond(item.getAliveSecond());
        streamPushItem.setOriginSock(item.getOriginSock());
        streamPushItem.setTotalReaderCount(item.getTotalReaderCount() + "");
        streamPushItem.setTotalReaderCount(item.getTotalReaderCount());
        streamPushItem.setOriginType(item.getOriginType());
        streamPushItem.setOriginTypeStr(item.getOriginTypeStr());
        streamPushItem.setOriginUrl(item.getOriginUrl());
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
@@ -137,7 +137,7 @@
        streamPushItem.setName(streamPushExcelDto.getName());
        streamPushItem.setOriginType(2);
        streamPushItem.setOriginTypeStr("rtsp_push");
        streamPushItem.setTotalReaderCount("0");
        streamPushItem.setTotalReaderCount(0);
        streamPushItem.setPlatformId(streamPushExcelDto.getPlatformId());
        streamPushItem.setCatalogId(streamPushExcelDto.getCatalogId());
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java
@@ -84,7 +84,7 @@
                                streamPushItem.setMediaServerId(mediaServerService.getDefaultMediaServer().getId());
                                streamPushItem.setOriginType(2);
                                streamPushItem.setOriginTypeStr("rtsp_push");
                                streamPushItem.setTotalReaderCount("0");
                                streamPushItem.setTotalReaderCount(0);
                                streamPushItemForSave.add(streamPushItem);
                                allGBId.put(streamPushItem.getGbId(), streamPushItem);
                            } else {
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -274,7 +274,7 @@
        stream.setStatus(false);
        stream.setPushIng(false);
        stream.setAliveSecond(0L);
        stream.setTotalReaderCount("0");
        stream.setTotalReaderCount(0);
        if (!streamPushService.add(stream)) {
            throw new ControllerException(ErrorCode.ERROR100);
        }