1.根据redis消息更新推流列表时同时更新在线状态
2.推流列表的模板增加在线状态
5个文件已修改
22 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_src/static/file/推流通道导入.zip 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java
@@ -53,7 +53,6 @@
            boolean contains = allAppAndStream.contains(app + stream);
            //不存在就添加
            if (!contains) {
                streamPushItem.setStatus(false);
                streamPushItem.setStreamType("push");
                streamPushItem.setCreateTime(DateUtil.getNow());
                streamPushItem.setMediaServerId(mediaServerService.getDefaultMediaServer().getId());
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
@@ -116,7 +116,7 @@
        streamPushItem.setApp(streamPushExcelDto.getApp());
        streamPushItem.setStream(streamPushExcelDto.getStream());
        streamPushItem.setGbId(streamPushExcelDto.getGbId());
        streamPushItem.setStatus(false);
        streamPushItem.setStatus(streamPushExcelDto.getStatus());
        streamPushItem.setStreamType("push");
        streamPushItem.setCreateTime(DateUtil.getNow());
        streamPushItem.setMediaServerId(defaultMediaServerId);
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
@@ -23,10 +23,10 @@
    @Insert("<script> " +
            "INSERT into platform_gb_stream " +
            "(gbStreamId, platformId, catalogId) " +
            "(gbStreamId, platformId, catalogId,status) " +
            "values " +
            "<foreach collection='streamPushItems' index='index' item='item' separator=','> " +
            "(${item.gbStreamId}, '${item.platformId}', '${item.catalogId}')" +
            "(${item.gbStreamId}, '${item.platformId}', '${item.catalogId}'), '${item.status}')" +
            "</foreach> " +
            "</script>")
    int batchAdd(List<StreamPushItem> streamPushItems);
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java
@@ -22,6 +22,9 @@
    @ExcelProperty("目录ID")
    private String catalogId;
    @ExcelProperty("在线状态")
    private boolean status;
    public String getName() {
        return name;
    }
@@ -70,4 +73,16 @@
    public void setCatalogId(String catalogId) {
        this.catalogId = catalogId;
    }
    public boolean isStatus() {
        return status;
    }
    public boolean getStatus() {
        return status;
    }
    public void setStatus(boolean status) {
        this.status = status;
    }
}
web_src/static/file/ÍÆÁ÷ͨµÀµ¼Èë.zip
Binary files differ