Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858
2 parents ec0ec5eb 3884e9a5
Showing 5 changed files with 18 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java
web_src/static/file/推流通道导入.zip
@@ -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());
@@ -116,7 +116,7 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener&lt;StreamPus
         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);
@@ -23,10 +23,10 @@ public interface PlatformGbStreamMapper {
     @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);
@@ -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;
+    }
 }