diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java index d70ddf13..23745eb8 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java @@ -53,7 +53,6 @@ public class RedisPushStreamListMsgListener implements MessageListener { boolean contains = allAppAndStream.contains(app + stream); //不存在就添加 if (!contains) { - streamPushItem.setStatus(false); streamPushItem.setStreamType("push"); streamPushItem.setCreateTime(DateUtil.getNow()); streamPushItem.setMediaServerId(mediaServerService.getDefaultMediaServer().getId()); diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java index c9b9579e..3e13f48e 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java @@ -116,7 +116,7 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener " + "INSERT into platform_gb_stream " + - "(gbStreamId, platformId, catalogId) " + + "(gbStreamId, platformId, catalogId,status) " + "values " + " " + - "(${item.gbStreamId}, '${item.platformId}', '${item.catalogId}')" + + "(${item.gbStreamId}, '${item.platformId}', '${item.catalogId}'), '${item.status}')" + " " + "") int batchAdd(List streamPushItems); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java index 956f6479..dcec6076 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java @@ -22,6 +22,9 @@ public class StreamPushExcelDto { @ExcelProperty("目录ID") private String catalogId; + @ExcelProperty("在线状态") + private boolean status; + public String getName() { return name; } @@ -70,4 +73,16 @@ public class StreamPushExcelDto { 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; + } } diff --git a/web_src/static/file/推流通道导入.zip b/web_src/static/file/推流通道导入.zip index fb95c613..495702f4 100644 Binary files a/web_src/static/file/推流通道导入.zip and b/web_src/static/file/推流通道导入.zip differ