ZF/RuoYi-Wvp
1
0
Fork 0
mirror of https://gitee.com/xiaochemgzi/RuoYi-Wvp.git synced 2025-12-30 04:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

添加行政分组

Browse Source
This commit is contained in:
fengcheng
2025-04-12 16:58:35 +08:00
parent 019429b01c
commit ce6fd59db6
16 changed files with 754 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@@ -6,8 +6,8 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.158.39:3306/ry-wvp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://127.0.0.1:3306/ry-wvp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.158.39:3306/ry-wvp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
# url: jdbc:mysql://127.0.0.1:3306/ry-wvp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true
username: root
password: haoxin
# 从库数据源

26
ruoyi-ui-vue3/src/api/wvp/group.js
View File

@@ -8,3 +8,29 @@ export function queryForTree(query) {
params: query
})
}
// 更新分组
export function updateGroup(data) {
return request({
url: `/api/group/update`,
method: 'post',
data: data
})
}
// 添加分组
export function addGroup(data) {
return request({
url: `/api/group/add`,
method: 'post',
data: data
})
}
// 删除分组
export function deleteGroup(id) {
return request({
url: `/api/group/delete/${id}`,
method: 'delete',
})
}

26
ruoyi-ui-vue3/src/api/wvp/region.js
View File

@@ -17,3 +17,29 @@ export function queryForTree(query) {
params: query
})
}
// 更新区域
export function updateRegion(data) {
return request({
url: `/api/region/update`,
method: 'post',
data: data
})
}
// 添加区域
export function addRegion(data) {
return request({
url: `/api/region/add`,
method: 'post',
data: data
})
}
// 删除区域
export function deleteRegion(id) {
return request({
url: `/api/region/delete/${id}`,
method: 'delete',
})
}

120
ruoyi-ui-vue3/src/views/components/common/channelCode.vue
View File

@@ -136,64 +136,7 @@ const emit = defineEmits(['handleOk']);
const showVideoDialog = ref(false);
const activeKey = ref('0');
const allVal = ref([
{
id: [1, 2],
meaning: '省级编码',
val: '11',
type: '中心编码',
lock: false,
},
{
id: [3, 4],
meaning: '市级编码',
val: '01',
type: '中心编码',
lock: false,
},
{
id: [5, 6],
meaning: '区级编码',
val: '01',
type: '中心编码',
lock: false,
},
{
id: [7, 8],
meaning: '基层接入单位编码',
val: '01',
type: '中心编码',
lock: false,
},
{
id: [9, 10],
meaning: '行业编码',
val: '00',
type: '行业编码',
lock: false,
},
{
id: [11, 13],
meaning: '类型编码',
val: '132',
type: '类型编码',
lock: false,
},
{
id: [14],
meaning: '网络标识编码',
val: '7',
type: '网络标识',
lock: false,
},
{
id: [15, 20],
meaning: '设备/用户序号',
val: '000001',
type: '序号',
lock: false,
}
]);
const allVal = ref([]);
const regionList = ref([]);
const deviceTypeList = ref([]);
const industryCodeTypeList = ref([]);
@@ -204,7 +147,62 @@ const endCallBck = ref(null);
defineExpose({openDialog})
function openDialog(callBck, code, lockIndex, lockContent) {
console.log(code)
allVal.value = [{
id: [1, 2],
meaning: '省级编码',
val: '11',
type: '中心编码',
lock: false,
},
{
id: [3, 4],
meaning: '市级编码',
val: '01',
type: '中心编码',
lock: false,
},
{
id: [5, 6],
meaning: '区级编码',
val: '01',
type: '中心编码',
lock: false,
},
{
id: [7, 8],
meaning: '基层接入单位编码',
val: '01',
type: '中心编码',
lock: false,
},
{
id: [9, 10],
meaning: '行业编码',
val: '00',
type: '行业编码',
lock: false,
},
{
id: [11, 13],
meaning: '类型编码',
val: '132',
type: '类型编码',
lock: false,
},
{
id: [14],
meaning: '网络标识编码',
val: '7',
type: '网络标识',
lock: false,
},
{
id: [15, 20],
meaning: '设备/用户序号',
val: '000001',
type: '序号',
lock: false,
}]
showVideoDialog.value = true
activeKey.value = '0';
regionList.value = []
@@ -221,8 +219,8 @@ function openDialog(callBck, code, lockIndex, lockContent) {
allVal.value[7].val = code.substring(14)
}
if (typeof lockIndex != 'undefined') {
allVal.value[0][lockIndex].lock = true
allVal.value[0][lockIndex].val = lockContent
allVal.value[lockIndex].lock = true
allVal.value[lockIndex].val = lockContent
}
endCallBck.value = callBck;
}

580
ruoyi-ui-vue3/src/views/wvp/administrativeGrouping/index.vue Normal file
View File

@@ -0,0 +1,580 @@
<template>
<div class="app-container">
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="行政区划" name="region">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="info"
plain
icon="Sort"
@click="toggleExpandAll"
>展开/折叠
</el-button>
</el-col>
<right-toolbar :search="false" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="treeRegionData"
row-key="id"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column prop="name" label="名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="deviceId" label="设备编号" :show-overflow-tooltip="true"
></el-table-column>
<el-table-column prop="status" label="设备编号" :show-overflow-tooltip="true"
></el-table-column>
<el-table-column prop="createTime" label="创建时间" :show-overflow-tooltip="true"
></el-table-column>
<el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" @click="handleRegionUpdate(scope.row)" v-if="scope.row.id">修改</el-button>
<el-button link type="primary" @click="handleRegionAdd(scope.row)">新增</el-button>
<el-button link type="primary" @click="handleRegionDelete(scope.row)" v-if="scope.row.id">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog :title="title" v-model="openRegion" width="1000px" append-to-body>
<el-tabs v-model="activeKeyRegion" style="padding: 0 1rem; margin: auto 0" @tab-click="getRegionList">
<el-tab-pane name="0">
<template #label>
<div class="show-code-item">{{ allValRegion[0].val }}</div>
<div style="text-align: center">{{ allValRegion[0].meaning }}</div>
</template>
<el-radio v-for="item in regionList" v-model="allValRegion[0].val" :key="item.deviceId" :name="item.name"
:label="item.deviceId" @change="deviceChange(item)" style="line-height: 2rem">
{{ item.name }} - {{ item.deviceId }}
</el-radio>
</el-tab-pane>
<el-tab-pane name="1">
<template #label>
<div class="show-code-item">{{ allValRegion[1].val ? allValRegion[1].val : "--" }}</div>
<div style="text-align: center">{{ allValRegion[1].meaning }}</div>
</template>
<el-radio :key="-1" v-model="allValRegion[1].val" @change="deviceChange" label=""
style="line-height: 2rem">
不添加
</el-radio>
<el-radio v-for="item in regionList" v-model="allValRegion[1].val" @change="deviceChange(item)"
:key="item.deviceId" :label="item.deviceId.substring(2)" style="line-height: 2rem">
{{ item.name }} - {{ item.deviceId.substring(2) }}
</el-radio>
</el-tab-pane>
<el-tab-pane name="2">
<template #label>
<div class="show-code-item">{{ allValRegion[2].val ? allValRegion[2].val : "--" }}</div>
<div style="text-align: center">{{ allValRegion[2].meaning }}</div>
</template>
<el-radio :key="-1" label="" v-model="allValRegion[2].val" style="line-height: 2rem"
@change="deviceChange">
不添加
</el-radio>
<el-radio v-for="item in regionList" v-model="allValRegion[2].val" @change="deviceChange(item)"
:key="item.deviceId" :label="item.deviceId.substring(4)" style="line-height: 2rem">
{{ item.name }} - {{ item.deviceId.substring(4) }}
</el-radio>
</el-tab-pane>
<el-tab-pane name="3">
<template #label>
<div class="show-code-item">{{ allValRegion[3].val ? allValRegion[3].val : "--" }}</div>
<div style="text-align: center">{{ allValRegion[3].meaning }}</div>
</template>
<el-input
style="width: 400px"
type="text"
placeholder="请手动输入基层接入单位编码,两位数字"
v-model="allValRegion[3].val"
maxlength="2"
:disabled="allValRegion[3].lock"
show-word-limit
@input="deviceChange"
>
</el-input>
</el-tab-pane>
</el-tabs>
<el-divider/>
<el-form ref="formRegionRef" :model="formRegion" :rules="rulesRegion" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="名称" prop="name">
<el-input v-model="formRegion.name" autocomplete="off" placeholder="请输入名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="编号" prop="deviceId">
<el-input v-model="formRegion.deviceId" disabled autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFormRegion">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
</el-tab-pane>
<el-tab-pane label="业务分组" name="group">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="info"
plain
icon="Sort"
@click="toggleExpandAll"
>展开/折叠
</el-button>
</el-col>
<right-toolbar :search="false" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="treeGroupData"
row-key="id"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column prop="name" label="名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="deviceId" label="设备编号" :show-overflow-tooltip="true"
></el-table-column>
<el-table-column prop="status" label="设备编号" :show-overflow-tooltip="true"
></el-table-column>
<el-table-column prop="createTime" label="创建时间" :show-overflow-tooltip="true"
></el-table-column>
<el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" @click="handleGroupUpdate(scope.row)" v-if="scope.row.id">修改</el-button>
<el-button link type="primary" @click="handleGroupAdd(scope.row)">新增</el-button>
<el-button link type="primary" @click="handleGroupDelete(scope.row)" v-if="scope.row.id">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-dialog :title="title" v-model="openGroup" width="1000px" append-to-body>
<el-form ref="formGroupRef" :model="formGroup" :rules="rulesGroup" label-width="80px">
<el-form-item label="节点编号" prop="deviceId">
<el-input v-model="formGroup.deviceId" placeholder="请输入编码">
<template #append>
<el-button @click="buildDeviceIdCode(formGroup.deviceId)">生成</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="节点名称" prop="name">
<el-input v-model="formGroup.name" clearable></el-input>
</el-form-item>
<el-form-item label="行政区划" prop="civilCode">
<el-input v-model="formGroup.civilCode">
<template #append>
<el-button @click="chooseCivilCodeFun(formGroup.civilCode)">选择</el-button>
</template>
</el-input>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFormGroup">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
<ChannelCode ref="channelCodeRef" @handleOk="handleOk"></ChannelCode>
<ChooseCivilCode ref="chooseCivilCodeRef" @onSubmit="gbCivilCodeOnSubmit"></ChooseCivilCode>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script setup name="AdministrativeGrouping">
import ChannelCode from "../../components/common/channelCode.vue"
import ChooseCivilCode from "../../components/common/chooseCivilCode.vue"
import {addRegion, deleteRegion, getAllChild, queryForTree, updateRegion} from "../../../api/wvp/region.js";
import {addGroup, deleteGroup, queryForTree as queryGroupForTree, updateGroup} from "../../../api/wvp/group.js";
const {proxy} = getCurrentInstance();
const treeRegionData = ref([])
const isExpandAll = ref(false);
const refreshTable = ref(true);
const loading = ref(true);
const activeName = ref('region')
const title = ref("");
const openRegion = ref(false);
const activeKeyRegion = ref('0');
const regionList = ref([]);
const allValRegion = ref([]);
const data = reactive({
formRegion: {},
rulesRegion: {
name: [{required: true, message: "请输入名称", trigger: "blur"}],
},
formGroup: {},
rulesGroup: {
name: [{required: true, message: "请输入节点名称", trigger: "blur"}],
deviceId: [{required: true, message: "请选择节点编号", trigger: "change"}],
civilCode: [{required: true, message: "请选择行政区划", trigger: "change"}],
}
});
const treeGroupData = ref([])
const openGroup = ref(false);
const channelCodeRef = ref(null);
const chooseCivilCodeRef = ref(null);
const {formRegion, rulesRegion, formGroup, rulesGroup} = toRefs(data);
function getList() {
loading.value = true
if (activeName.value === 'region') {
queryForTree().then(res => {
let data = [
{
name: "根资源组",
children: []
}
]
data[0].children = proxy.handleTree(res.data, "id")
treeRegionData.value = data
loading.value = false
})
} else if (activeName.value === 'group') {
queryGroupForTree().then(res => {
let data = [
{
name: "根资源组",
children: []
}
]
data[0].children = proxy.handleTree(res.data, "id")
treeGroupData.value = data
loading.value = false
})
}
}
function handleRegionAdd(row) {
resetRegion()
formRegion.value.parentId = row.id
openRegion.value = true
title.value = "新增行政区划"
getRegionList()
allValRegion.value = [
{
id: [1, 2],
meaning: '省级编码',
val: '11',
type: '中心编码',
lock: false,
},
{
id: [3, 4],
meaning: '市级编码',
val: '',
type: '中心编码',
lock: false,
},
{
id: [5, 6],
meaning: '区级编码',
val: '',
type: '中心编码',
lock: false,
},
{
id: [7, 8],
meaning: '基层接入单位编码',
val: '',
type: '中心编码',
lock: false,
}
]
}
function handleRegionUpdate(row) {
resetRegion()
openRegion.value = true
title.value = "修改行政区划"
getRegionList()
formRegion.value = JSON.parse(JSON.stringify(row))
allValRegion.value = [
{
id: [1, 2],
meaning: '省级编码',
val: '11',
type: '中心编码',
lock: false,
},
{
id: [3, 4],
meaning: '市级编码',
val: '',
type: '中心编码',
lock: false,
},
{
id: [5, 6],
meaning: '区级编码',
val: '',
type: '中心编码',
lock: false,
},
{
id: [7, 8],
meaning: '基层接入单位编码',
val: '',
type: '中心编码',
lock: false,
}
]
activeKeyRegion.value = '0'
if (formRegion.value.deviceId) {
if (formRegion.value.deviceId.length >= 2 && allValRegion.value[0]) {
allValRegion.value[0].val = formRegion.value.deviceId.substring(0, 2)
}
if (formRegion.value.deviceId.length >= 4 && allValRegion.value[1]) {
allValRegion.value[1].val = formRegion.value.deviceId.substring(2, 4)
}
if (formRegion.value.deviceId.length >= 6 && allValRegion.value[2]) {
allValRegion.value[2].val = formRegion.value.deviceId.substring(4, 6)
}
if (formRegion.value.deviceId.length === 8 && allValRegion.value[3]) {
allValRegion.value[3].val = formRegion.value.deviceId.substring(6, 8)
}
} else {
if (formRegion.value.parentDeviceId) {
if (formRegion.value.parentDeviceId.length >= 2) {
allValRegion.value[0].val = formRegion.value.parentDeviceId.substring(0, 2)
activeKeyRegion.value = "1"
}
if (formRegion.value.parentDeviceId.length >= 4) {
allValRegion.value[1].val = formRegion.value.parentDeviceId.substring(2, 4)
activeKeyRegion.value = "2"
}
if (formRegion.value.parentDeviceId.length >= 6) {
allValRegion.value[2].val = formRegion.value.parentDeviceId.substring(4, 6)
activeKeyRegion.value = "3"
}
}
}
}
function queryChildList(parent) {
getAllChild({parent: parent,}).then((res) => {
regionList.value = res.data
})
}
function resetRegion() {
formRegion.value = {
deviceId: undefined,
name: undefined,
};
proxy.resetForm("formRegionRef");
}
/** 取消按钮 */
function cancel() {
openRegion.value = false;
openGroup.value = false;
resetRegion();
resetGroup()
}
function handleRegionDelete(row) {
proxy.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function () {
deleteRegion(row.id).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
})
}
function submitFormRegion() {
proxy.$refs["formRegionRef"].validate(valid => {
if (valid) {
if (formRegion.value.id) {
updateRegion(formRegion.value).then(() => {
proxy.$modal.msgSuccess("修改成功");
openRegion.value = false;
getList();
})
} else {
addRegion(formRegion.value).then(() => {
proxy.$modal.msgSuccess("新增成功");
openRegion.value = false;
getList();
})
}
}
})
}
function getRegionList() {
nextTick(() => {
if (activeKeyRegion.value === '0') {
queryChildList();
} else if (activeKeyRegion.value === '1' || activeKeyRegion.value === '2') {
let parent = ''
if (activeKeyRegion.value === '1') {
parent = allValRegion.value[0].val
}
if (activeKeyRegion.value === '2') {
if (allValRegion.value[1].val === "") {
parent = ""
} else {
parent = allValRegion.value[0].val + allValRegion.value[1].val
}
}
if (activeKeyRegion.value !== '0' && parent === '') {
proxy.$modal.msgError("请先选择上级行政区划");
}
if (parent !== "") {
queryChildList(parent);
} else {
regionList.value = []
}
}
})
}
function deviceChange(item) {
nextTick(() => {
let code = allValRegion.value[0].val
if (allValRegion.value[1].val) {
code += allValRegion.value[1].val
if (allValRegion.value[2].val) {
code += allValRegion.value[2].val
if (allValRegion.value[3].val) {
code += allValRegion.value[3].val
}
} else {
allValRegion.value[3].val = ""
}
} else {
allValRegion.value[2].val = ""
allValRegion.value[3].val = ""
}
formRegion.value.deviceId = code
})
}
/** 展开/折叠操作 */
function toggleExpandAll() {
refreshTable.value = false;
isExpandAll.value = !isExpandAll.value;
nextTick(() => {
refreshTable.value = true;
});
}
const handleClick = () => {
nextTick(() => {
getList()
})
}
function resetGroup() {
formGroup.value = {
deviceId: undefined,
name: undefined,
civilCode: undefined,
businessGroup: "",
};
proxy.resetForm("formGroupRef");
}
function handleGroupAdd(row) {
resetGroup()
formGroup.value.parentId = row.id
formGroup.value.businessGroup = row.deviceId
openGroup.value = true;
title.value = "新增分组";
}
function handleGroupUpdate(row) {
resetGroup()
openGroup.value = true
title.value = "修改分组"
formGroup.value = JSON.parse(JSON.stringify(row))
}
function buildDeviceIdCode(deviceId) {
let lockContent = formGroup.value.businessGroup ? "216":"215"
channelCodeRef.value.openDialog(code => {
}, deviceId, 5 , lockContent);
}
function handleOk(code) {
formGroup.value.deviceId = code
}
function chooseCivilCodeFun() {
chooseCivilCodeRef.value.openDialog(code => {
});
}
function gbCivilCodeOnSubmit(data) {
formGroup.value.civilCode = data;
}
function submitFormGroup() {
proxy.$refs["formGroupRef"].validate(valid => {
if (valid) {
if (formGroup.value.id) {
updateGroup(formGroup.value).then(() => {
proxy.$modal.msgSuccess("修改成功");
openGroup.value = false;
getList();
})
} else {
addGroup(formGroup.value).then(() => {
proxy.$modal.msgSuccess("新增成功");
openGroup.value = false;
getList();
})
}
}
})
}
function handleGroupDelete(row) {
proxy.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function () {
deleteGroup(row.id).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
})
}
onMounted(() => {
getList()
})
</script>
<style>
.show-code-item {
text-align: center;
font-size: 3rem;
}
</style>

12
ruoyi-ui-vue3/src/views/wvp/channel/index.vue
View File

@@ -88,17 +88,15 @@
</el-table-column>
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
<template #default="scope">
<el-button v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play"
<el-button v-bind:disabled="device == null || device.online === 0"
type="text" @click="start(scope.row)">播放
</el-button>
<el-button v-bind:disabled="device == null || device.online === 0"
icon="el-icon-switch-button"
type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
@click="stopDevicePush(scope.row)">停止
</el-button>
<el-button
type="text"
icon="el-icon-edit"
@click="handleEdit(scope.row)"
>
编辑
@@ -108,9 +106,9 @@
<span class="el-dropdown-link">
<el-button size="medium" type="text">
更多
<el-icon class="el-icon--right">
<arrow-down/>
</el-icon>
<el-icon>
<arrow-down/>
</el-icon>
</el-button>
</span>
<template #dropdown>
@@ -503,7 +501,7 @@ import {
subChannels,
updateChannelStreamIdentification
} from "../../../api/wvp/device.js";
import {getCommonChannel, resetChannel, updateChannelData, sendDevicePush} from "../../../api/wvp/channel.js";
import {getCommonChannel, resetChannel, sendDevicePush, updateChannelData} from "../../../api/wvp/channel.js";
import {recordApi} from "../../../api/wvp/control.js";
import router from "@/router";

4
ruoyi-ui-vue3/src/views/wvp/cloudRecord/index.vue
View File

@@ -62,9 +62,9 @@
<el-table-column prop="mediaServerId" label="流媒体" align="center"/>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
<template #default="scope">
<el-button icon="el-icon-video-play" type="text" @click="play(scope.row)">播放
<el-button type="text" @click="play(scope.row)">播放
</el-button>
<el-button icon="el-icon-download" type="text" @click="downloadFile(scope.row)">下载
<el-button type="text" @click="downloadFile(scope.row)">下载
</el-button>
</template>
</el-table-column>

12
ruoyi-ui-vue3/src/views/wvp/device/index.vue
View File

@@ -110,23 +110,23 @@
</el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
<template #default="scope">
<el-button link type="primary" :disabled="scope.row.online===0" icon="Refresh"
<el-button link type="primary" :disabled="scope.row.online===0"
@click="refDevice(scope.row)">刷新
</el-button>
<el-button type="text" icon="Edit"
<el-button type="text"
@click="showChannelList(scope.row)">通道
</el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改
<el-button link type="primary" @click="handleUpdate(scope.row)">修改
</el-button>
<el-dropdown @command="(command)=>{moreClick(command, scope.row)}">
<span class="el-dropdown-link">
<el-button size="medium" type="text">
更多
<el-icon class="el-icon--right">
<arrow-down/>
</el-icon>
<el-icon>
<arrow-down/>
</el-icon>
</el-button>
</span>
<template #dropdown>

32
ruoyi-wvp/src/main/java/com/ruoyi/wvp/gb28181/controller/GroupController.java
View File

@@ -26,12 +26,16 @@ public class GroupController extends BaseController {
@Autowired
private IGroupService groupService;
@Operation(summary = "添加分组")
@Parameter(name = "group", description = "group", required = true)
/**
* 添加分组
*
* @param group
*/
@ResponseBody
@PostMapping("/add")
public void add(@RequestBody Group group) {
public AjaxResult add(@RequestBody Group group) {
groupService.add(group);
return success();
}
/**
@@ -55,24 +59,32 @@ public class GroupController extends BaseController {
return success(groupService.queryForTree(query, parent, hasChannel));
}
@Operation(summary = "更新分组")
@Parameter(name = "group", description = "Group", required = true)
/**
* 更新分组
*
* @param group
*/
@ResponseBody
@PostMapping("/update")
public void update(@RequestBody Group group) {
public AjaxResult update(@RequestBody Group group) {
groupService.update(group);
return success();
}
@Operation(summary = "删除分组")
@Parameter(name = "id", description = "分组id", required = true)
/**
* 删除分组
*
* @param id 分组id
*/
@ResponseBody
@DeleteMapping("/delete")
public void delete(Integer id) {
@DeleteMapping("/delete/{id}")
public AjaxResult delete(@PathVariable Integer id) {
Assert.notNull(id, "分组id（deviceId）不需要存在");
boolean result = groupService.delete(id);
if (!result) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "移除失败");
}
return success();
}
@Operation(summary = "获取所属的行政区划下的行政区划")

32
ruoyi-wvp/src/main/java/com/ruoyi/wvp/gb28181/controller/RegionController.java
View File

@@ -30,12 +30,16 @@ public class RegionController extends BaseController {
@Autowired
private IRegionService regionService;
@Operation(summary = "添加区域")
@Parameter(name = "region", description = "Region", required = true)
/**
* 添加区域
*
* @param region
*/
@ResponseBody
@PostMapping("/add")
public void add(@RequestBody Region region) {
public AjaxResult add(@RequestBody Region region) {
regionService.add(region);
return success();
}
@Operation(summary = "查询区域")
@@ -73,24 +77,32 @@ public class RegionController extends BaseController {
return success(regionService.queryForTree(query, parent, hasChannel));
}
@Operation(summary = "更新区域")
@Parameter(name = "region", description = "Region", required = true)
/**
* 更新区域
*
* @param region
*/
@ResponseBody
@PostMapping("/update")
public void update(@RequestBody Region region) {
public AjaxResult update(@RequestBody Region region) {
regionService.update(region);
return success();
}
@Operation(summary = "删除区域")
@Parameter(name = "id", description = "区域ID", required = true)
/**
* 删除区域
*
* @param id 区域ID
*/
@ResponseBody
@DeleteMapping("/delete")
public void delete(Integer id) {
@DeleteMapping("/delete/{id}")
public AjaxResult delete(@PathVariable Integer id) {
Assert.notNull(id, "区域ID需要存在");
boolean result = regionService.deleteByDeviceId(id);
if (!result) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "移除失败");
}
return success();
}
@Operation(summary = "根据区域Id查询区域")

2
ruoyi-wvp/src/main/java/com/ruoyi/wvp/mapper/CommonGBChannelMapper.java
View File

@@ -285,7 +285,7 @@ public interface CommonGBChannelMapper {
" WHERE gb_civil_code in "+
" <foreach collection='allChildren' item='item' open='(' separator=',' close=')' > #{item.deviceId}</foreach>" +
" </script>"})
int removeCivilCode(List<Region> allChildren);
int removeCivilCode(@Param("allChildren") List<Region> allChildren);
@Update(value = {" <script>" +

4
ruoyi-wvp/src/main/java/com/ruoyi/wvp/mapper/GroupMapper.java
View File

@@ -96,7 +96,7 @@ public interface GroupMapper {
" DELETE FROM wvp_common_group WHERE id in " +
" <foreach collection='allChildren' item='item' open='(' separator=',' close=')' > #{item.id}</foreach>" +
" </script>")
int batchDelete(List<Group> allChildren);
int batchDelete(@Param("allChildren") List<Group> allChildren);
@Select("SELECT * from wvp_common_group WHERE device_id = #{businessGroup} and business_group = #{businessGroup} ")
Group queryBusinessGroup(@Param("businessGroup") String businessGroup);
@@ -117,7 +117,7 @@ public interface GroupMapper {
" where device_id in " +
" <foreach collection='groupList' item='item' open='(' separator=',' close=')' > #{item.deviceId}</foreach>" +
" </script>")
List<Group> queryInGroupListByDeviceId(List<Group> groupList);
List<Group> queryInGroupListByDeviceId(@Param("groupList") List<Group> groupList);
@Select(" <script>" +
" SELECT " +

2
ruoyi-wvp/src/main/java/com/ruoyi/wvp/mapper/RegionMapper.java
View File

@@ -74,7 +74,7 @@ public interface RegionMapper {
" DELETE FROM wvp_common_region WHERE id in " +
" <foreach collection='allChildren' item='item' open='(' separator=',' close=')' > #{item.id}</foreach>" +
" </script>")
void batchDelete(List<Region> allChildren);
void batchDelete(@Param("allChildren") List<Region> allChildren);
@Select(" <script>" +
" SELECT * from wvp_common_region " +

BIN
snap/34020000001320000001_34020000001310000001.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

BIN
snap/34020000001350000001_34020000001310000001.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 47 KiB

BIN
snap/34020000001390000001_34020000001320000001.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB