From 60c4f767f094d15711aa48b19b4e05e65999625a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 九月 2022 16:18:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java | 4 ++--
web_src/static/file/推流通道导入.zip | 0
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java | 2 +-
src/main/java/com/genersoft/iot/vmp/service/impl/RedisPushStreamListMsgListener.java | 1 -
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamPushExcelDto.java | 15 +++++++++++++++
5 files changed, 18 insertions(+), 4 deletions(-)
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 d70ddf1..23745eb 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 @@
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 c9b9579..3e13f48 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 @@
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);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
index 98afd6b..7e9c812 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
+++ b/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);
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 956f647..dcec607 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 @@
@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;
+ }
}
diff --git "a/web_src/static/file/\346\216\250\346\265\201\351\200\232\351\201\223\345\257\274\345\205\245.zip" "b/web_src/static/file/\346\216\250\346\265\201\351\200\232\351\201\223\345\257\274\345\205\245.zip"
index fb95c61..495702f 100644
--- "a/web_src/static/file/\346\216\250\346\265\201\351\200\232\351\201\223\345\257\274\345\205\245.zip"
+++ "b/web_src/static/file/\346\216\250\346\265\201\351\200\232\351\201\223\345\257\274\345\205\245.zip"
Binary files differ
--
Gitblit v1.8.0