From ce6fd59db6eb2df67ddf36f6feb134ddcb5825b0 Mon Sep 17 00:00:00 2001 From: fengcheng <2929004360@qq.com> Date: Sat, 12 Apr 2025 16:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=94=BF=E5=88=86?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 4 +- ruoyi-ui-vue3/src/api/wvp/group.js | 26 + ruoyi-ui-vue3/src/api/wvp/region.js | 26 + .../views/components/common/channelCode.vue | 120 ++-- .../wvp/administrativeGrouping/index.vue | 580 ++++++++++++++++++ ruoyi-ui-vue3/src/views/wvp/channel/index.vue | 12 +- .../src/views/wvp/cloudRecord/index.vue | 4 +- ruoyi-ui-vue3/src/views/wvp/device/index.vue | 12 +- .../gb28181/controller/GroupController.java | 32 +- .../gb28181/controller/RegionController.java | 32 +- .../wvp/mapper/CommonGBChannelMapper.java | 2 +- .../com/ruoyi/wvp/mapper/GroupMapper.java | 4 +- .../com/ruoyi/wvp/mapper/RegionMapper.java | 2 +- ...20000001320000001_34020000001310000001.jpg | Bin 0 -> 61756 bytes ...20000001350000001_34020000001310000001.jpg | Bin 47205 -> 47744 bytes ...20000001390000001_34020000001320000001.jpg | Bin 0 -> 28873 bytes 16 files changed, 754 insertions(+), 102 deletions(-) create mode 100644 ruoyi-ui-vue3/src/views/wvp/administrativeGrouping/index.vue create mode 100644 snap/34020000001320000001_34020000001310000001.jpg create mode 100644 snap/34020000001390000001_34020000001320000001.jpg diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index da04c74..ecb2d11 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -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 # 从库数据源 diff --git a/ruoyi-ui-vue3/src/api/wvp/group.js b/ruoyi-ui-vue3/src/api/wvp/group.js index ed6f5a5..25b6398 100644 --- a/ruoyi-ui-vue3/src/api/wvp/group.js +++ b/ruoyi-ui-vue3/src/api/wvp/group.js @@ -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', + }) +} diff --git a/ruoyi-ui-vue3/src/api/wvp/region.js b/ruoyi-ui-vue3/src/api/wvp/region.js index bb6066e..59028d6 100644 --- a/ruoyi-ui-vue3/src/api/wvp/region.js +++ b/ruoyi-ui-vue3/src/api/wvp/region.js @@ -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', + }) +} diff --git a/ruoyi-ui-vue3/src/views/components/common/channelCode.vue b/ruoyi-ui-vue3/src/views/components/common/channelCode.vue index 195f790..93bf834 100644 --- a/ruoyi-ui-vue3/src/views/components/common/channelCode.vue +++ b/ruoyi-ui-vue3/src/views/components/common/channelCode.vue @@ -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; } diff --git a/ruoyi-ui-vue3/src/views/wvp/administrativeGrouping/index.vue b/ruoyi-ui-vue3/src/views/wvp/administrativeGrouping/index.vue new file mode 100644 index 0000000..54048f7 --- /dev/null +++ b/ruoyi-ui-vue3/src/views/wvp/administrativeGrouping/index.vue @@ -0,0 +1,580 @@ + + + + + + diff --git a/ruoyi-ui-vue3/src/views/wvp/channel/index.vue b/ruoyi-ui-vue3/src/views/wvp/channel/index.vue index 8fe9421..a7ef598 100644 --- a/ruoyi-ui-vue3/src/views/wvp/channel/index.vue +++ b/ruoyi-ui-vue3/src/views/wvp/channel/index.vue @@ -88,17 +88,15 @@