From fa346513db53567f6fb610b18889afc2ebbb1670 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 一月 2022 16:46:28 +0800
Subject: [PATCH] 优化级联选择通道页面添加方式
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 4 +
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java | 2
web_src/src/components/dialog/chooseChannel.vue | 6 -
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 2
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java | 5 +
web_src/src/components/dialog/chooseChannelForCatalog.vue | 28 ++++-----
src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java | 4
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 11 +++
web_src/src/components/dialog/chooseChannelForGb.vue | 55 ++++++++++++++++-
web_src/src/components/dialog/chooseChannelForStream.vue | 52 +++++++++++++++-
10 files changed, 137 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
index ad1fa51..e6dc517 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
@@ -92,7 +92,7 @@
if (event.getDeviceChannels() != null) {
deviceChannelList.addAll(event.getDeviceChannels());
}
- if (event.getGbStreams().size() > 0){
+ if (event.getGbStreams() != null && event.getGbStreams().size() > 0){
for (GbStream gbStream : event.getGbStreams()) {
DeviceChannel deviceChannelByStream = gbStreamService.getDeviceChannelListByStream(gbStream, gbStream.getCatalogId(), parentPlatform.getDeviceGBId());
deviceChannelList.add(deviceChannelByStream);
@@ -131,7 +131,7 @@
if (event.getDeviceChannels() != null) {
deviceChannelList.addAll(event.getDeviceChannels());
}
- if (event.getGbStreams().size() > 0){
+ if (event.getGbStreams() != null && event.getGbStreams().size() > 0){
for (GbStream gbStream : event.getGbStreams()) {
DeviceChannel deviceChannelByStream = gbStreamService.getDeviceChannelListByStream(gbStream, gbStream.getCatalogId(), parentPlatform.getDeviceGBId());
deviceChannelList.add(deviceChannelByStream);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
index a89fc56..e4bda3f 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -466,4 +466,8 @@
List<ParentPlatform> queryPlatFormListForStreamWithGBId(String app, String stream, List<String> platforms);
GbStream getGbStream(String app, String streamId);
+
+ void delCatalogByPlatformId(String serverGBId);
+
+ void delRelationByPlatformId(String serverGBId);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
index 81f869c..0991c84 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
@@ -88,4 +88,9 @@
"<foreach collection='platforms' item='item' open='(' separator=',' close=')' > #{item}</foreach>" +
"</script> ")
List<ParentPlatform> queryPlatFormListForGBWithGBId(String channelId, List<String> platforms);
+
+ @Delete("<script> " +
+ "DELETE FROM platform_gb_channel WHERE platformId=#{serverGBId}" +
+ "</script>")
+ void delByPlatformId(String serverGBId);
}
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 d9eafa0..a07e68e 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
@@ -52,7 +52,7 @@
"from gb_stream gs\n" +
" left join platform_gb_stream pgs\n" +
" on gs.app = pgs.app and gs.stream = pgs.stream\n" +
- "where and pgs.platformId=#{platformId} and pgs.catalogId=#{catalogId}")
+ "where pgs.platformId=#{platformId} and pgs.catalogId=#{catalogId}")
List<PlatformCatalog> queryChannelInParentPlatformAndCatalogForCatalog(String platformId, String catalogId);
@Delete("DELETE FROM platform_gb_stream WHERE catalogId=#{id}")
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index 369b659..ac278a7 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -1044,4 +1044,15 @@
public GbStream getGbStream(String app, String streamId) {
return gbStreamMapper.selectOne(app, streamId);
}
+
+ @Override
+ public void delCatalogByPlatformId(String serverGBId) {
+ catalogMapper.delByPlatformId(serverGBId);
+ }
+
+ @Override
+ public void delRelationByPlatformId(String serverGBId) {
+ platformGbStreamMapper.delByPlatformId(serverGBId);
+ platformChannelMapper.delByPlatformId(serverGBId);
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index 69ea973..4929dad 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -172,6 +172,8 @@
}));
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
+ storager.delCatalogByPlatformId(parentPlatform.getServerGBId());
+ storager.delRelationByPlatformId(parentPlatform.getServerGBId());
if (deleteResult) {
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index 5544b38..ebca9dd 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -131,11 +131,9 @@
this.$refs.chooseChannelFoStream.catalogIdChange(id);
}
},
- updateChooseChannelCallback (id, nodeIds){
+ updateChooseChannelCallback (id){
console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + id)
- console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + nodeIds)
- console.log("涓棿妯″潡鏀跺埌閫夋嫨閫氶亾鍙樺寲锛� " + typeof (nodeIds))
- this.$refs.chooseChannelForCatalog.refreshCatalogById(id, nodeIds)
+ this.$refs.chooseChannelForCatalog.refreshCatalogById(id)
}
}
};
diff --git a/web_src/src/components/dialog/chooseChannelForCatalog.vue b/web_src/src/components/dialog/chooseChannelForCatalog.vue
index 89fa32b..8446c2a 100644
--- a/web_src/src/components/dialog/chooseChannelForCatalog.vue
+++ b/web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -121,25 +121,23 @@
node.loaded = false
node.expand();
},
- refreshCatalogById: function (id, nodeIds) {
+ refreshCatalogById: function (id) {
if (id) {
- console.log("refreshCatalogById: " + id)
let node = this.$refs.tree.getNode(id);
- console.log(node)
this.refreshCatalog(node);
}
- if (nodeIds !== null) {
- let refreshNode = {}
- for (let i = 0; i < nodeIds.length; i++) {
- let node = this.$refs.tree.getNode(nodeIds[i]);
- refreshNode[node.parent.data.id] = node.parent
- }
- if (Object.values(refreshNode).length > 0) {
- for (let j = 0; j < Object.values(refreshNode).length; j++) {
- this.refreshCatalog(Object.values(refreshNode)[j]);
- }
- }
- }
+ // if (nodeIds !== null) {
+ // let refreshNode = {}
+ // for (let i = 0; i < nodeIds.length; i++) {
+ // let node = this.$refs.tree.getNode(nodeIds[i]);
+ // refreshNode[node.parent.data.id] = node.parent
+ // }
+ // if (Object.values(refreshNode).length > 0) {
+ // for (let j = 0; j < Object.values(refreshNode).length; j++) {
+ // this.refreshCatalog(Object.values(refreshNode)[j]);
+ // }
+ // }
+ // }
},
editCatalog: function (data, node){
let that = this;
diff --git a/web_src/src/components/dialog/chooseChannelForGb.vue b/web_src/src/components/dialog/chooseChannelForGb.vue
index 742b3de..6c22a87 100644
--- a/web_src/src/components/dialog/chooseChannelForGb.vue
+++ b/web_src/src/components/dialog/chooseChannelForGb.vue
@@ -21,10 +21,9 @@
<el-option label="绂荤嚎" value="false"></el-option>
</el-select>
- <el-checkbox @change="shareAllCheckedChange">鍏ㄩ儴鍏变韩</el-checkbox>
+<!-- <el-checkbox @change="shareAllCheckedChange">鍏ㄩ儴鍏变韩</el-checkbox>-->
</div>
- <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" @selection-change="checkedChange" :height="winHeight">
- <el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
+ <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" :height="winHeight">
<el-table-column prop="channelId" label="閫氶亾缂栧彿" width="210">
</el-table-column>
<el-table-column prop="name" label="閫氶亾鍚嶇О" show-overflow-tooltip>
@@ -39,6 +38,14 @@
</template>
</el-table-column>
<el-table-column prop="manufacturer" label="鍘傚" align="center">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="100" align="center" fixed="right">
+ <template slot-scope="scope">
+ <el-button-group>
+ <el-button size="mini" icon="el-icon-plus" v-if="!scope.row.platformId" @click="add(scope.row)">娣诲姞</el-button>
+ <el-button size="mini" icon="el-icon-delete" v-if="scope.row.platformId" type="danger" @click="remove(scope.row)">绉婚櫎</el-button>
+ </el-button-group>
+ </template>
</el-table-column>
</el-table>
<el-pagination style="float: right;margin-top: 1rem;" @size-change="handleSizeChange" @current-change="currentChange" :current-page="currentPage" :page-size="count" :page-sizes="[10, 20, 30, 50]" layout="total, sizes, prev, pager, next" :total="total">
@@ -108,6 +115,45 @@
// return false;
// }
// },
+ add: function (row) {
+ console.log(row)
+ row.catalogId = this.catalogId
+ row.platformId = this.platformId
+ this.$axios({
+ method:"post",
+ url:"/api/platform/update_channel_for_gb",
+ data:{
+ platformId: this.platformId,
+ channelReduces: [row],
+ catalogId: this.catalogId
+ }
+ }).then((res)=>{
+ console.log("淇濆瓨鎴愬姛")
+ if(this.updateChoosedCallback)this.updateChoosedCallback(this.catalogId)
+ }).catch(function (error) {
+ console.log(error);
+ });
+ },
+ remove: function (row) {
+ console.log(row)
+
+ this.$axios({
+ method:"delete",
+ url:"/api/platform/del_channel_for_gb",
+ data:{
+ platformId: this.platformId,
+ channelReduces: [row]
+ }
+ }).then((res)=>{
+ console.log("绉婚櫎鎴愬姛")
+ let nodeIds = new Array();
+ if(this.updateChoosedCallback)this.updateChoosedCallback(row.catalogId)
+ row.platformId = null;
+ row.catalogId = null
+ }).catch(function (error) {
+ console.log(error);
+ });
+ },
checkedChange: function (val) {
let that = this;
if (!that.eventEnanle) {
@@ -182,10 +228,9 @@
console.log(error);
});
}
-
},
shareAllCheckedChange: function (val) {
- this.chooseChanage(null, val)
+
},
getChannelList: function () {
let that = this;
diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 3cc5f3c..931083a 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -1,7 +1,6 @@
<template>
<div id="chooseChannelFoStream" >
- <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" @selection-change="checkedChanage" :height="winHeight">
- <el-table-column type="selection" width="55" align="center" fixed > </el-table-column>
+ <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" :height="winHeight">
<el-table-column prop="name" label="鍚嶇О" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="app" label="搴旂敤鍚�" show-overflow-tooltip>
@@ -18,6 +17,14 @@
</div>
</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔" width="100" align="center" fixed="right">
+ <template slot-scope="scope">
+ <el-button-group>
+ <el-button size="mini" icon="el-icon-plus" v-if="!scope.row.platformId" @click="add(scope.row)">娣诲姞</el-button>
+ <el-button size="mini" icon="el-icon-delete" v-if="scope.row.platformId" type="danger" @click="remove(scope.row)">绉婚櫎</el-button>
+ </el-button-group>
+ </template>
+ </el-table-column>
</el-table>
<el-pagination style="float: right;margin-top: 1rem;" @size-change="handleSizeChange" @current-change="currentChange" :current-page="currentPage" :page-size="count" :page-sizes="[10, 20, 30, 50]" layout="total, sizes, prev, pager, next" :total="total">
</el-pagination>
@@ -82,14 +89,49 @@
console.log(val)
console.log(row)
},
+ add: function (row) {
+ console.log(row)
+ row.catalogId = this.catalogId
+ row.platformId = this.platformId
+ this.$axios({
+ method:"post",
+ url:"/api/gbStream/add",
+ data:{
+ platformId: this.platformId,
+ catalogId: this.catalogId,
+ gbStreams: [row],
+ }
+ }).then((res)=>{
+ console.log("淇濆瓨鎴愬姛")
+ if(this.updateChoosedCallback)this.updateChoosedCallback(this.catalogId)
+ }).catch(function (error) {
+ console.log(error);
+ });
+ },
+ remove: function (row) {
+ console.log(row)
+
+ this.$axios({
+ method:"delete",
+ url:"/api/gbStream/del",
+ data:{
+ platformId: this.platformId,
+ gbStreams: [row],
+ }
+ }).then((res)=>{
+ console.log("绉婚櫎鎴愬姛")
+ if(this.updateChoosedCallback)this.updateChoosedCallback(row.catalogId)
+ row.platformId = null;
+ row.catalogId = null
+ }).catch(function (error) {
+ console.log(error);
+ });
+ },
checkedChanage: function (val) {
var that = this;
if (!that.eventEnanle) {
return;
}
- var tabelData = JSON.parse(JSON.stringify(this.$refs.gbStreamsTable.data));
- console.log("checkedChanage")
- console.log(val)
var newData = {};
var addData = [];
--
Gitblit v1.8.0