Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

国标通道编辑支持选择现有的行政区划和虚拟组织

pull/1684/head
648540858 2024-11-07 16:27:39 +08:00
parent 89d5d0c023
commit 1e8e3d729f
8 changed files with 283 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
View File

@ -156,7 +156,7 @@ public class GbChannelServiceImpl implements IGbChannelService {
} }
List<CommonGBChannel> onlineChannelList = commonGBChannelMapper.queryInListByStatus(commonGBChannelList, "ON"); List<CommonGBChannel> onlineChannelList = commonGBChannelMapper.queryInListByStatus(commonGBChannelList, "ON");
if (onlineChannelList.isEmpty()) { if (onlineChannelList.isEmpty()) {
log.warn("[多个通道离线] 更新失败, 参数内通道已经离线, 无需更新"); log.info("[多个通道离线] 更新失败, 参数内通道已经离线, 无需更新");
return 0; return 0;
} }
int limitCount = 1000; int limitCount = 1000;

33
web_src/src/components/common/CommonChannelEdit.vue
View File

@ -7,7 +7,9 @@
</el-form-item> </el-form-item>
<el-form-item label="编码" > <el-form-item label="编码" >
<el-input v-model="form.gbDeviceId" placeholder="请输入通道编码"> <el-input v-model="form.gbDeviceId" placeholder="请输入通道编码">
<el-button slot="append" @click="buildDeviceIdCode(form.gbDeviceId)">生成</el-button> <template v-slot:append>
<el-button @click="buildDeviceIdCode(form.gbDeviceId)">生成</el-button>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="设备厂商" > <el-form-item label="设备厂商" >
@ -18,7 +20,11 @@
</el-form-item> </el-form-item>
<el-form-item label="行政区域" > <el-form-item label="行政区域" >
<el-input v-model="form.gbCivilCode" placeholder="请输入行政区域"></el-input> <el-input v-model="form.gbCivilCode" placeholder="请输入行政区域">
<template v-slot:append>
<el-button @click="chooseCivilCode()">选择</el-button>
</template>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="安装地址" > <el-form-item label="安装地址" >
@ -31,7 +37,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="父节点编码" > <el-form-item label="父节点编码" >
<el-input v-model="form.gbParentId" placeholder="请输入父节点编码"></el-input> <el-input v-model="form.gbParentId" placeholder="请输入父节点编码">
<template v-slot:append>
<el-button @click="chooseGroup()">选择</el-button>
</template>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="设备状态" > <el-form-item label="设备状态" >
<el-select v-model="form.gbStatus" style="width: 100%" placeholder="请选择设备状态"> <el-select v-model="form.gbStatus" style="width: 100%" placeholder="请选择设备状态">
@ -202,16 +212,22 @@
</el-form> </el-form>
<channelCode ref="channelCode"></channelCode> <channelCode ref="channelCode"></channelCode>
<chooseCivilCode ref="chooseCivilCode"></chooseCivilCode>
<chooseGroup ref="chooseGroup"></chooseGroup>
</div> </div>
</template> </template>
<script> <script>
import channelCode from './../dialog/channelCode' import channelCode from './../dialog/channelCode'
import ChooseCivilCode from "../dialog/chooseCivilCode.vue";
import ChooseGroup from "../dialog/chooseGroup.vue";
export default { export default {
name: "CommonChannelEdit", name: "CommonChannelEdit",
props: [ 'id', 'dataForm', 'saveSuccess', 'cancel'], props: [ 'id', 'dataForm', 'saveSuccess', 'cancel'],
components: { components: {
ChooseCivilCode,
ChooseGroup,
channelCode, channelCode,
}, },
created() { created() {
@ -360,6 +376,17 @@ export default {
console.log("code22===> " + code) console.log("code22===> " + code)
}, deviceId); }, deviceId);
}, },
chooseCivilCode: function (){
this.$refs.chooseCivilCode.openDialog(code=>{
this.form.gbCivilCode = code;
});
},
chooseGroup: function (){
this.$refs.chooseGroup.openDialog((deviceId, businessGroupId)=>{
this.form.gbBusinessGroupId = businessGroupId;
this.form.gbParentId = deviceId;
});
},
cancelSubmit: function (){ cancelSubmit: function (){
if(this.cancel) { if(this.cancel) {
this.cancel() this.cancel()

119
web_src/src/components/common/GroupTree.vue
View File

@ -18,7 +18,7 @@
class="flow-tree" class="flow-tree"
ref="veTree" ref="veTree"
node-key="treeId" node-key="treeId"
height="78vh" :height="treeHeight?treeHeight:'78vh'"
lazy lazy
style="padding: 0 0 2rem 0.5rem" style="padding: 0 0 2rem 0.5rem"
:load="loadNode" :load="loadNode"
@ -70,7 +70,7 @@ export default {
treeData: [], treeData: [],
} }
}, },
props: ['edit', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToGroup'], props: ['edit','enableAddChannel', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'],
created() { created() {
}, },
methods: { methods: {
@ -117,49 +117,52 @@ export default {
return; return;
} }
if (node.data.type === 0) { if (node.data.type === 0) {
this.$contextmenu({ let menuItem = [
items: [ {
{ label: "刷新节点",
label: "刷新节点", icon: "el-icon-refresh",
icon: "el-icon-refresh", disabled: false,
disabled: false, onClick: () => {
onClick: () => { this.refreshNode(node);
this.refreshNode(node); }
} },
}, {
{ label: "新建节点",
label: "新建节点", icon: "el-icon-plus",
icon: "el-icon-plus", disabled: false,
disabled: false, onClick: () => {
onClick: () => { this.addGroup(data.id, node);
this.addGroup(data.id, node); }
} },
}, {
{ label: "编辑节点",
label: "编辑节点", icon: "el-icon-edit",
icon: "el-icon-edit", disabled: node.level === 1,
disabled: node.level === 1, onClick: () => {
onClick: () => { this.editGroup(data, node);
this.editGroup(data, node); }
} },
}, {
{ label: "删除节点",
label: "删除节点", icon: "el-icon-delete",
icon: "el-icon-delete", disabled: node.level === 1,
disabled: node.level === 1, divided: true,
divided: true, onClick: () => {
onClick: () => { this.$confirm('确定删除?', '提示', {
this.$confirm('确定删除?', '提示', { confirmButtonText: '确定',
confirmButtonText: '确定', cancelButtonText: '取消',
cancelButtonText: '取消', type: 'warning'
type: 'warning' }).then(() => {
}).then(() => { this.removeGroup(data.id, node)
this.removeGroup(data.id, node) }).catch(() => {
}).catch(() => {
}); });
} }
}, },
]
if (this.enableAddChannel) {
menuItem.push(
{ {
label: "添加设备", label: "添加设备",
icon: "el-icon-plus", icon: "el-icon-plus",
@ -168,6 +171,8 @@ export default {
this.addChannelFormDevice(data.id, node) this.addChannelFormDevice(data.id, node)
} }
}, },
)
menuItem.push(
{ {
label: "移除设备", label: "移除设备",
icon: "el-icon-delete", icon: "el-icon-delete",
@ -177,6 +182,8 @@ export default {
this.removeChannelFormDevice(data.id, node) this.removeChannelFormDevice(data.id, node)
} }
}, },
)
menuItem.push(
{ {
label: "添加通道", label: "添加通道",
icon: "el-icon-plus", icon: "el-icon-plus",
@ -185,27 +192,11 @@ export default {
this.addChannel(data.id, node) this.addChannel(data.id, node)
} }
}, },
// { )
// label: "导出", }
// icon: "el-icon-download",
// disabled: false,
// children: [
// {
// label: "导出到文件",
// onClick: () => {
//
// },
// },
// {
// label: "导出到其他平台",
// onClick: () => {
//
// },
// }
// ]
// },
], this.$contextmenu({
items: menuItem,
event, // 鼠标事件信息 event, // 鼠标事件信息
customClass: "custom-class", // 自定义菜单 class customClass: "custom-class", // 自定义菜单 class
zIndex: 3000, // 菜单样式 z-index zIndex: 3000, // 菜单样式 z-index

125
web_src/src/components/common/RegionTree.vue
View File

@ -17,7 +17,7 @@
class="flow-tree" class="flow-tree"
ref="veTree" ref="veTree"
node-key="treeId" node-key="treeId"
height="78vh" :height="treeHeight?treeHeight:'78vh'"
lazy lazy
style="padding: 0 0 2rem 0.5rem" style="padding: 0 0 2rem 0.5rem"
:load="loadNode" :load="loadNode"
@ -68,7 +68,7 @@ export default {
treeData: [], treeData: [],
} }
}, },
props: ['edit', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToCivilCode'], props: ['edit', 'enableAddChannel', 'clickEvent', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'],
created() { created() {
}, },
methods: { methods: {
@ -118,49 +118,51 @@ export default {
} }
console.log(node.level) console.log(node.level)
if (node.data.type === 0) { if (node.data.type === 0) {
this.$contextmenu({ let menuItem = [
items: [ {
{ label: "刷新节点",
label: "刷新节点", icon: "el-icon-refresh",
icon: "el-icon-refresh", disabled: false,
disabled: false, onClick: () => {
onClick: () => { this.refreshNode(node);
this.refreshNode(node); }
} },
}, {
{ label: "新建节点",
label: "新建节点", icon: "el-icon-plus",
icon: "el-icon-plus", disabled: false,
disabled: false, onClick: () => {
onClick: () => { this.addRegion(data.id, node);
this.addRegion(data.id, node); }
} },
}, {
{ label: "编辑节点",
label: "编辑节点", icon: "el-icon-edit",
icon: "el-icon-edit", disabled: node.level === 1,
disabled: node.level === 1, onClick: () => {
onClick: () => { this.editCatalog(data, node);
this.editCatalog(data, node); }
} },
}, {
{ label: "删除节点",
label: "删除节点", icon: "el-icon-delete",
icon: "el-icon-delete", disabled: node.level === 1,
disabled: node.level === 1, divided: true,
divided: true, onClick: () => {
onClick: () => { this.$confirm('确定删除?', '提示', {
this.$confirm('确定删除?', '提示', { confirmButtonText: '确定',
confirmButtonText: '确定', cancelButtonText: '取消',
cancelButtonText: '取消', type: 'warning'
type: 'warning' }).then(() => {
}).then(() => { this.removeRegion(data.id, node)
this.removeRegion(data.id, node) }).catch(() => {
}).catch(() => {
}); });
} }
}, },
]
if (this.enableAddChannel) {
menuItem.push(
{ {
label: "添加设备", label: "添加设备",
icon: "el-icon-plus", icon: "el-icon-plus",
@ -168,7 +170,9 @@ export default {
onClick: () => { onClick: () => {
this.addChannelFormDevice(data.id, node) this.addChannelFormDevice(data.id, node)
} }
}, }
)
menuItem.push(
{ {
label: "移除设备", label: "移除设备",
icon: "el-icon-delete", icon: "el-icon-delete",
@ -177,7 +181,9 @@ export default {
onClick: () => { onClick: () => {
this.removeChannelFormDevice(data.id, node) this.removeChannelFormDevice(data.id, node)
} }
}, }
)
menuItem.push(
{ {
label: "添加通道", label: "添加通道",
icon: "el-icon-plus", icon: "el-icon-plus",
@ -185,28 +191,13 @@ export default {
onClick: () => { onClick: () => {
this.addChannel(data.id, node) this.addChannel(data.id, node)
} }
}, }
// { )
// label: "导出", }
// icon: "el-icon-download",
// disabled: false,
// children: [
// {
// label: "导出到文件",
// onClick: () => {
//
// },
// },
// {
// label: "导出到其他平台",
// onClick: () => {
//
// },
// }
// ]
// },
],
this.$contextmenu({
items: menuItem,
event, // 鼠标事件信息 event, // 鼠标事件信息
customClass: "custom-class", // 自定义菜单 class customClass: "custom-class", // 自定义菜单 class
zIndex: 3000, // 菜单样式 z-index zIndex: 3000, // 菜单样式 z-index

65
web_src/src/components/dialog/chooseCivilCode.vue Normal file
View File

@ -0,0 +1,65 @@
<template>
<div id="chooseCivilCode" >
<el-dialog
title="选择行政区划"
width="30%"
top="5rem"
:close-on-click-modal="false"
:visible.sync="showDialog"
:destroy-on-close="true"
@close="close()"
>
<RegionTree ref="regionTree" :showHeader=true :edit="true" :enableAddChannel="false" :clickEvent="treeNodeClickEvent"
:onChannelChange="onChannelChange" :treeHeight="'45vh'"></RegionTree>
<el-form>
<el-form-item>
<div style="text-align: right">
<el-button type="primary" @click="onSubmit">保存</el-button>
<el-button @click="close">取消</el-button>
</div>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script>
import RegionTree from "../common/RegionTree.vue";
export default {
name: "chooseCivilCode",
components: {RegionTree},
props: {},
computed: {},
created() {},
data() {
return {
showDialog: false,
endCallback: false,
regionDeviceId: "",
};
},
methods: {
openDialog: function (callback) {
this.showDialog = true;
this.endCallback = callback;
},
onSubmit: function () {
if (this.endCallback) {
this.endCallback(this.regionDeviceId)
}
this.close();
},
close: function () {
this.showDialog = false;
},
treeNodeClickEvent: function (region) {
this.regionDeviceId = region.deviceId;
},
onChannelChange: function (deviceId) {
//
},
},
};
</script>

70
web_src/src/components/dialog/chooseGroup.vue Normal file
View File

@ -0,0 +1,70 @@
<template>
<div id="chooseGroup" >
<el-dialog
title="选择虚拟组织"
width="30%"
top="5rem"
:close-on-click-modal="false"
:visible.sync="showDialog"
:destroy-on-close="true"
@close="close()"
>
<GroupTree ref="regionTree" :showHeader=true :edit="true" :enableAddChannel="false" :clickEvent="treeNodeClickEvent"
:onChannelChange="onChannelChange" :treeHeight="'45vh'"></GroupTree>
<el-form>
<el-form-item>
<div style="text-align: right">
<el-button type="primary" @click="onSubmit">保存</el-button>
<el-button @click="close">取消</el-button>
</div>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script>
import GroupTree from "../common/GroupTree.vue";
export default {
name: "chooseCivilCode",
components: {GroupTree},
props: {},
computed: {},
created() {},
data() {
return {
showDialog: false,
endCallback: false,
groupDeviceId: "",
businessGroup: "",
};
},
methods: {
openDialog: function (callback) {
this.showDialog = true;
this.endCallback = callback;
},
onSubmit: function () {
if (this.endCallback) {
this.endCallback(this.groupDeviceId, this.businessGroup)
}
this.close();
},
close: function () {
this.showDialog = false;
},
treeNodeClickEvent: function (group) {
if (group.deviceId === "" || group.deviceId === group.businessGroup) {
return
}
this.groupDeviceId = group.deviceId;
this.businessGroup = group.businessGroup;
},
onChannelChange: function (deviceId) {
//
},
},
};
</script>

4
web_src/src/components/group.vue
View File

@ -3,7 +3,7 @@
<el-container v-loading="loading"> <el-container v-loading="loading">
<el-aside width="400px"> <el-aside width="400px">
<GroupTree ref="groupTree" :show-header="true" :edit="true" :clickEvent="treeNodeClickEvent" <GroupTree ref="groupTree" :show-header="true" :edit="true" :clickEvent="treeNodeClickEvent"
:onChannelChange="onChannelChange" :addChannelToGroup="addChannelToGroup"></GroupTree> :onChannelChange="onChannelChange" :enableAddChannel="true" :addChannelToGroup="addChannelToGroup"></GroupTree>
</el-aside> </el-aside>
<el-main style="padding: 5px;"> <el-main style="padding: 5px;">
<div class="page-header"> <div class="page-header">
@ -95,10 +95,12 @@ import uiHeader from '../layout/UiHeader.vue'
import DeviceService from "./service/DeviceService"; import DeviceService from "./service/DeviceService";
import GroupTree from "./common/GroupTree.vue"; import GroupTree from "./common/GroupTree.vue";
import GbChannelSelect from "./dialog/GbChannelSelect.vue"; import GbChannelSelect from "./dialog/GbChannelSelect.vue";
import RegionTree from "./common/RegionTree.vue";
export default { export default {
name: 'channelList', name: 'channelList',
components: { components: {
RegionTree,
GbChannelSelect, GbChannelSelect,
uiHeader, uiHeader,
GroupTree, GroupTree,

2
web_src/src/components/region.vue
View File

@ -3,7 +3,7 @@
<el-container v-loading="loading"> <el-container v-loading="loading">
<el-aside width="400px"> <el-aside width="400px">
<RegionTree ref="regionTree" :showHeader=true :edit="true" :clickEvent="treeNodeClickEvent" <RegionTree ref="regionTree" :showHeader=true :edit="true" :clickEvent="treeNodeClickEvent"
:onChannelChange="onChannelChange" :addChannelToCivilCode="addChannelToCivilCode"></RegionTree> :onChannelChange="onChannelChange" :enableAddChannel="true" :addChannelToCivilCode="addChannelToCivilCode"></RegionTree>
</el-aside> </el-aside>
<el-main style="padding: 5px;"> <el-main style="padding: 5px;">
<div class="page-header"> <div class="page-header">