From 9bcaf996bb2c25f5e6dfab0fc403010db556651c Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 28 Jun 2024 10:34:02 +0800 Subject: [PATCH] merge: main to multi-tenancy --- database/install/sys_dict_data0.sql | 10 ++-- database/install/sys_dict_data1_i18n_zh.sql | 50 +++++++++--------- database/install/sys_dict_data2_i18n_en.sql | 50 +++++++++--------- database/install/sys_dict_type.sql | 2 +- database/install/sys_menu.sql | 36 ++++++------- database/upgrade/upg_sys_dict_data0.sql | 11 ++-- .../upgrade/upg_sys_dict_data1_i18n_zh.sql | 50 +++++++++--------- .../upgrade/upg_sys_dict_data2_i18n_en.sql | 52 +++++++++---------- database/upgrade/upg_sys_dict_type.sql | 2 +- database/upgrade/upg_sys_menu.sql | 36 ++++++------- src/modules/system/controller/sys_tenant.go | 12 +++-- 11 files changed, 156 insertions(+), 155 deletions(-) diff --git a/database/install/sys_dict_data0.sql b/database/install/sys_dict_data0.sql index ecc2109e..f31a569f 100644 --- a/database/install/sys_dict_data0.sql +++ b/database/install/sys_dict_data0.sql @@ -159,10 +159,10 @@ INSERT INTO `sys_dict_data` VALUES (131, 2, 'dictData.udm_sub_cn_type.2', '2', ' INSERT INTO `sys_dict_data` VALUES (132, 3, 'dictData.udm_sub_cn_type.3', '3', 'udm_sub_cn_type', '', '', '1', 'supervisor', 1712720201349, '', 0, ''); -- 多租户 -INSERT INTO `sys_dict_data` VALUES (200, 1, 'dictData.tenancy.imsi', 'IMSI', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (201, 2, 'dictData.tenancy.apn', 'APN', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (202, 3, 'dictData.tenancy.slice', 'SLICE', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (203, 1, 'dictData.tenancy.ne', 'UPF', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (204, 2, 'dictData.tenancy.radio', 'RADIO', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10000, 1, 'dictData.tenancy.imsi', 'IMSI', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10001, 2, 'dictData.tenancy.apn', 'APN', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10002, 3, 'dictData.tenancy.slice', 'SLICE', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10003, 1, 'dictData.tenancy.ne', 'UPF', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10004, 2, 'dictData.tenancy.radio', 'RADIO', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/install/sys_dict_data1_i18n_zh.sql b/database/install/sys_dict_data1_i18n_zh.sql index 65d401cc..58dd2fac 100644 --- a/database/install/sys_dict_data1_i18n_zh.sql +++ b/database/install/sys_dict_data1_i18n_zh.sql @@ -660,31 +660,31 @@ INSERT INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.udm_sub_cn_type.2', 'E INSERT INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5GC和EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -- 多租户 -INSERT INTO `sys_dict_data` VALUES (12139, 2139, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12140, 2140, 'menu.security.tenantRemark', '租户管理菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12141, 2141, 'menu.common.batchadd', '批量增加', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12142, 2142, 'menu.common.checkdel', '勾选删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12143, 2143, 'menu.common.loaddata', '加载数据', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12144, 2144, 'menu.common.export', '导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12145, 2145, 'menu.common.checkexport', '勾选导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12146, 2146, 'menu.common.batchdel', '批量删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12147, 2147, 'menu.common.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12148, 2148, 'dictData.tenancy.imsi', 'SIM卡', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12149, 2149, 'dictData.tenancy.apn', '接入点', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12150, 2150, 'dictData.tenancy.slice', '网络切片', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12151, 2151, 'dictData.tenancy.ne', 'UPF', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12152, 2152, 'dictData.tenancy.radio', '无线基站', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12153, 2153, 'role.tenant', '租户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12154, 2154, 'log.operate.title.sysTenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12155, 2155, 'menu.tenant.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12156, 2156, 'menu.tenant.subscriber', '签约用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12157, 2157, 'menu.tenant.onlineUE', '在线用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12158, 2158, 'menu.tenant.radio', '基站信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12159, 2159, 'menu.tenant.imsCDR', '语音话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12160, 2160, 'menu.tenant.smfCDR', '数据话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12161, 2161, 'menu.tenant.amfUE', '5G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12162, 2162, 'menu.tenant.mmeUE', '4G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (12163, 2163, 'menu.tenant.log', '操作日志', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10000, 2139, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10001, 2140, 'menu.security.tenantRemark', '租户管理菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10002, 2141, 'menu.common.batchadd', '批量增加', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10003, 2142, 'menu.common.checkdel', '勾选删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10004, 2143, 'menu.common.loaddata', '加载数据', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10005, 2144, 'menu.common.export', '导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10006, 2145, 'menu.common.checkexport', '勾选导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10007, 2146, 'menu.common.batchdel', '批量删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10008, 2147, 'menu.common.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10009, 2148, 'dictData.tenancy.imsi', 'SIM卡', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10010, 2149, 'dictData.tenancy.apn', '接入点', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10011, 2150, 'dictData.tenancy.slice', '网络切片', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10012, 2151, 'dictData.tenancy.ne', 'UPF', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10013, 2152, 'dictData.tenancy.radio', '无线基站', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10014, 2153, 'role.tenant', '租户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10015, 2154, 'log.operate.title.sysTenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10016, 2155, 'menu.tenant.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10017, 2156, 'menu.tenant.subscriber', '签约用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10018, 2157, 'menu.tenant.onlineUE', '在线用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10019, 2158, 'menu.tenant.radio', '基站信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10020, 2159, 'menu.tenant.imsCDR', '语音话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10021, 2160, 'menu.tenant.smfCDR', '数据话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10022, 2161, 'menu.tenant.amfUE', '5G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10023, 2162, 'menu.tenant.mmeUE', '4G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (10024, 2163, 'menu.tenant.log', '操作日志', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); diff --git a/database/install/sys_dict_data2_i18n_en.sql b/database/install/sys_dict_data2_i18n_en.sql index efb13832..6d69fa6c 100644 --- a/database/install/sys_dict_data2_i18n_en.sql +++ b/database/install/sys_dict_data2_i18n_en.sql @@ -660,31 +660,31 @@ INSERT INTO `sys_dict_data` VALUES (4149, 4149, 'dictData.udm_sub_cn_type.2', 'E INSERT INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5GC and EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, ''); -- 多租户 -INSERT INTO `sys_dict_data` VALUES (14139, 4139, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT INTO `sys_dict_data` VALUES (14140, 4140, 'menu.security.tenantRemark', 'Tenant Management Menu', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -INSERT INTO `sys_dict_data` VALUES (14141, 4141, 'menu.common.batchadd', 'Batch Add', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14142, 4142, 'menu.common.checkdel', 'Check Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14143, 4143, 'menu.common.loaddata', 'Load Data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14144, 4144, 'menu.common.export', 'Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14145, 4145, 'menu.common.checkexport', 'Check Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14146, 4146, 'menu.common.batchdel', 'Batch Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14147, 4147, 'menu.common.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14148, 4148, 'dictData.tenancy.imsi', 'SIM Card', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14149, 4149, 'dictData.tenancy.apn', 'Access Point Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14150, 4150, 'dictData.tenancy.slice', 'Network Slice', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14151, 4151, 'dictData.tenancy.ne', 'UPF', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14152, 4152, 'dictData.tenancy.radio', 'Radio', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14153, 4153, 'role.tenant', 'Tenants', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14154, 4154, 'log.operate.title.sysTenant', 'Tenant Management', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14155, 4155, 'menu.tenant.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14156, 4156, 'menu.tenant.subscriber', 'Subscribers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14157, 4157, 'menu.tenant.onlineUE', 'Online Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14158, 4158, 'menu.tenant.radio', 'Radio Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14159, 4159, 'menu.tenant.imsCDR', 'IMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14160, 4160, 'menu.tenant.smfCDR', 'SMF CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14161, 4161, 'menu.tenant.amfUE', '5G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14162, 4162, 'menu.tenant.mmeUE', '4G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -INSERT INTO `sys_dict_data` VALUES (14163, 4163, 'menu.tenant.log', 'Operation Logs', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15000, 4139, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT INTO `sys_dict_data` VALUES (15001, 4140, 'menu.security.tenantRemark', 'Tenant Management Menu', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +INSERT INTO `sys_dict_data` VALUES (15002, 4141, 'menu.common.batchadd', 'Batch Add', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15003, 4142, 'menu.common.checkdel', 'Check Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15004, 4143, 'menu.common.loaddata', 'Load Data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15005, 4144, 'menu.common.export', 'Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15006, 4145, 'menu.common.checkexport', 'Check Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15007, 4146, 'menu.common.batchdel', 'Batch Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15008, 4147, 'menu.common.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15009, 4148, 'dictData.tenancy.imsi', 'SIM Card', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15010, 4149, 'dictData.tenancy.apn', 'Access Point Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15011, 4150, 'dictData.tenancy.slice', 'Network Slice', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15012, 4151, 'dictData.tenancy.ne', 'UPF', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15013, 4152, 'dictData.tenancy.radio', 'Radio', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15014, 4153, 'role.tenant', 'Tenants', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15015, 4154, 'log.operate.title.sysTenant', 'Tenant Management', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15016, 4155, 'menu.tenant.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15017, 4156, 'menu.tenant.subscriber', 'Subscribers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15018, 4157, 'menu.tenant.onlineUE', 'Online Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15019, 4158, 'menu.tenant.radio', 'Radio Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15020, 4159, 'menu.tenant.imsCDR', 'IMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15021, 4160, 'menu.tenant.smfCDR', 'SMF CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15022, 4161, 'menu.tenant.amfUE', '5G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15023, 4162, 'menu.tenant.mmeUE', '4G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +INSERT INTO `sys_dict_data` VALUES (15024, 4163, 'menu.tenant.log', 'Operation Logs', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); diff --git a/database/install/sys_dict_type.sql b/database/install/sys_dict_type.sql index 32f6b55f..5789f607 100644 --- a/database/install/sys_dict_type.sql +++ b/database/install/sys_dict_type.sql @@ -57,7 +57,7 @@ INSERT INTO `sys_dict_type` VALUES (122, 'dictType.ne_info_status', 'ne_info_sta INSERT INTO `sys_dict_type` VALUES (123, 'dictType.ne_license_status', 'ne_license_status', '1', 'supervisor', 1702020000000, '', 0, ''); -- 多租户 -INSERT INTO `sys_dict_type` VALUES (1000, 'dictType.tenancy_type', 'tenancy_type', '1', 'supervisor', 1702020000000, '', 0, ''); +INSERT INTO `sys_dict_type` VALUES (10000, 'dictType.tenancy_type', 'tenancy_type', '1', 'supervisor', 1702020000000, '', 0, ''); UNLOCK TABLES; diff --git a/database/install/sys_menu.sql b/database/install/sys_menu.sql index af46c3ad..dddcd662 100644 --- a/database/install/sys_menu.sql +++ b/database/install/sys_menu.sql @@ -191,25 +191,25 @@ INSERT INTO `sys_menu` VALUES (2149, 'menu.dashboard.mmeUE', 2141, 5, 'mmeUE', ' INSERT INTO `sys_menu` VALUES (2150, 'menu.system.user.editPost', 100, 9, '', '', '1', '1', 'B', '1', '1', 'system:user:editPost', '#', 'supervisor', 1700000000000, '', 0, ''); -- tenant management for admin user -INSERT INTO `sys_menu` VALUES (2148, 'menu.security.tenant', 2113, 5, 'tenant', 'system/tenant/index', '1', '1', 'M', '1', '1', 'system:tenant:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.tenantRemark'); -INSERT INTO `sys_menu` VALUES (2149, 'menu.common.add', 2158, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:add', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); -INSERT INTO `sys_menu` VALUES (2150, 'menu.common.batchadd', 2158, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchAdd', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); -INSERT INTO `sys_menu` VALUES (2151, 'menu.common.checkdel', 2158, 2, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkDel', '#', 'supervisor', 1717491501662, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2152, 'menu.common.batchdel', 2158, 3, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchDel', '#', 'supervisor', 1717491702980, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2153, 'menu.common.loaddata', 2158, 4, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:load', '#', 'supervisor', 1717491838364, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2154, 'menu.common.import', 2158, 5, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:import', '#', 'supervisor', 1717491874118, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10000, 'menu.security.tenant', 2113, 5, 'tenant', 'system/tenant/index', '1', '1', 'M', '1', '1', 'system:tenant:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.tenantRemark'); +INSERT INTO `sys_menu` VALUES (10001, 'menu.common.add', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:add', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); +INSERT INTO `sys_menu` VALUES (10002, 'menu.common.batchadd', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchAdd', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); +INSERT INTO `sys_menu` VALUES (10003, 'menu.common.checkdel', 10010, 2, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkDel', '#', 'supervisor', 1717491501662, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10004, 'menu.common.batchdel', 10010, 3, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchDel', '#', 'supervisor', 1717491702980, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10005, 'menu.common.loaddata', 10010, 4, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:load', '#', 'supervisor', 1717491838364, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10006, 'menu.common.import', 10010, 5, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:import', '#', 'supervisor', 1717491874118, '', 0, ''); -- menu and button for tenant user -INSERT INTO `sys_menu` VALUES (2155, 'menu.common.export', 2158, 6, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:export', '#', 'supervisor', 1717491901916, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2156, 'menu.common.checkexport', 2158, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2157, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants'); -INSERT INTO `sys_menu` VALUES (2158, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu'); -INSERT INTO `sys_menu` VALUES (2159, 'menu.tenant.onlineUE', 0, 92, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-xiangmuchengyuan', 'supervisor', 1718697278784, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2160, 'menu.tenant.radio', 0, 93, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-paixu', 'supervisor', 1718696648153, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2161, 'menu.tenant.imsCDR', 0, 94, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '0', '1', 'tenant:imsCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2162, 'menu.tenant.smfCDR', 0, 95, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '0', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -INSERT INTO `sys_menu` VALUES (2163, 'menu.tenant.amfUE', 0, 96, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '0', '1', 'tenant:amfUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -INSERT INTO `sys_menu` VALUES (2164, 'menu.tenant.mmeUE', 0, 97, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '0', '1', 'tenant:amfUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -INSERT INTO `sys_menu` VALUES (2165, 'menu.tenant.log', 0, 98, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); +INSERT INTO `sys_menu` VALUES (10007, 'menu.common.export', 10010, 6, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:export', '#', 'supervisor', 1717491901916, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10008, 'menu.common.checkexport', 10010, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10009, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants'); +INSERT INTO `sys_menu` VALUES (10010, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu'); +INSERT INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 0, 92, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-xiangmuchengyuan', 'supervisor', 1718697278784, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 93, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-paixu', 'supervisor', 1718696648153, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 0, 94, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '0', '1', 'tenant:imsCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 0, 95, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '0', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +INSERT INTO `sys_menu` VALUES (10015, 'menu.tenant.amfUE', 0, 96, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '0', '1', 'tenant:amfUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +INSERT INTO `sys_menu` VALUES (10016, 'menu.tenant.mmeUE', 0, 97, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '0', '1', 'tenant:amfUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +INSERT INTO `sys_menu` VALUES (10017, 'menu.tenant.log', 0, 98, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); -- end for tenant user SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_sys_dict_data0.sql b/database/upgrade/upg_sys_dict_data0.sql index 568efdfb..162b12d4 100644 --- a/database/upgrade/upg_sys_dict_data0.sql +++ b/database/upgrade/upg_sys_dict_data0.sql @@ -160,11 +160,12 @@ INSERT IGNORE INTO `sys_dict_data` VALUES (132, 3, 'dictData.udm_sub_cn_type.3', -- 指定记录条件更新 -REPLACE INTO `sys_dict_data` VALUES (129, 1, 'dictData.tenancy.imsi', 'IMSI', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (130, 2, 'dictData.tenancy.apn', 'APN', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (131, 3, 'dictData.tenancy.slice', 'SLICE', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (132, 1, 'dictData.tenancy.ne', 'UPF', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (133, 2, 'dictData.tenancy.radio', 'RADIO', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); +-- multi-tenancy +INSERT IGNORE INTO `sys_dict_data` VALUES (10000, 1, 'dictData.tenancy.imsi', 'IMSI', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT IGNORE INTO `sys_dict_data` VALUES (10001, 2, 'dictData.tenancy.apn', 'APN', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT IGNORE INTO `sys_dict_data` VALUES (10002, 3, 'dictData.tenancy.slice', 'SLICE', 'tenancy_type', NULL, NULL, '0', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT IGNORE INTO `sys_dict_data` VALUES (10003, 1, 'dictData.tenancy.ne', 'UPF', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); +INSERT IGNORE INTO `sys_dict_data` VALUES (10004, 2, 'dictData.tenancy.radio', 'RADIO', 'tenancy_type', NULL, NULL, '1', 'supervisor', 1699350000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_sys_dict_data1_i18n_zh.sql b/database/upgrade/upg_sys_dict_data1_i18n_zh.sql index e1389061..2eefa20d 100644 --- a/database/upgrade/upg_sys_dict_data1_i18n_zh.sql +++ b/database/upgrade/upg_sys_dict_data1_i18n_zh.sql @@ -667,31 +667,31 @@ REPLACE INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.udm_sub_cn_type.2', ' REPLACE INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.udm_sub_cn_type.3', '5GC和EPC', 'i18n_zh', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -- 多租户 -REPLACE INTO `sys_dict_data` VALUES (2139, 2139, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2140, 2140, 'menu.security.tenantRemark', '租户管理菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2141, 2141, 'menu.common.batchadd', '批量增加', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2142, 2142, 'menu.common.checkdel', '勾选删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2143, 2143, 'menu.common.loaddata', '加载数据', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2144, 2144, 'menu.common.export', '导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2145, 2145, 'menu.common.checkexport', '勾选导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2146, 2146, 'menu.common.batchdel', '批量删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2147, 2147, 'menu.common.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2148, 2148, 'dictData.tenancy.imsi', 'SIM卡', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2149, 2149, 'dictData.tenancy.apn', '接入点', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2150, 2150, 'dictData.tenancy.slice', '网络切片', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2151, 2151, 'dictData.tenancy.ne', 'UPF', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2152, 2152, 'dictData.tenancy.radio', '无线基站', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2153, 2153, 'role.tenant', '租户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2154, 2154, 'log.operate.title.sysTenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2155, 2155, 'menu.tenant.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2156, 2156, 'menu.tenant.subscriber', '签约用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2157, 2157, 'menu.tenant.onlineUE', '在线用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2158, 2158, 'menu.tenant.radio', '基站信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2159, 2159, 'menu.tenant.imsCDR', '语音话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2160, 2160, 'menu.tenant.smfCDR', '数据话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2161, 2161, 'menu.tenant.amfUE', '5G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2162, 2162, 'menu.tenant.mmeUE', '4G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (2163, 2163, 'menu.tenant.log', '操作日志', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10000, 2139, 'menu.security.tenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10001, 2140, 'menu.security.tenantRemark', '租户管理菜单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10002, 2141, 'menu.common.batchadd', '批量增加', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10003, 2142, 'menu.common.checkdel', '勾选删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10004, 2143, 'menu.common.loaddata', '加载数据', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10005, 2144, 'menu.common.export', '导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10006, 2145, 'menu.common.checkexport', '勾选导出', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10007, 2146, 'menu.common.batchdel', '批量删除', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10008, 2147, 'menu.common.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10009, 2148, 'dictData.tenancy.imsi', 'SIM卡', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10010, 2149, 'dictData.tenancy.apn', '接入点', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10011, 2150, 'dictData.tenancy.slice', '网络切片', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10012, 2151, 'dictData.tenancy.ne', 'UPF', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10013, 2152, 'dictData.tenancy.radio', '无线基站', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10014, 2153, 'role.tenant', '租户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10015, 2154, 'log.operate.title.sysTenant', '租户管理', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10016, 2155, 'menu.tenant.overview', '概览', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10017, 2156, 'menu.tenant.subscriber', '签约用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10018, 2157, 'menu.tenant.onlineUE', '在线用户', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10019, 2158, 'menu.tenant.radio', '基站信息', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10020, 2159, 'menu.tenant.imsCDR', '语音话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10021, 2160, 'menu.tenant.smfCDR', '数据话单', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10022, 2161, 'menu.tenant.amfUE', '5G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10023, 2162, 'menu.tenant.mmeUE', '4G终端事件', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (10024, 2163, 'menu.tenant.log', '操作日志', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_sys_dict_data2_i18n_en.sql b/database/upgrade/upg_sys_dict_data2_i18n_en.sql index b7313241..2f29cd91 100644 --- a/database/upgrade/upg_sys_dict_data2_i18n_en.sql +++ b/database/upgrade/upg_sys_dict_data2_i18n_en.sql @@ -662,32 +662,30 @@ REPLACE INTO `sys_dict_data` VALUES (4149, 4149, 'dictData.udm_sub_cn_type.2', ' REPLACE INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.udm_sub_cn_type.3', '5GC and EPC', 'i18n_en', '', '', '1', 'supervisor', 1718441035866, '', 0, ''); -- 多租户 -REPLACE INTO `sys_dict_data` VALUES (4139, 4139, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -REPLACE INTO `sys_dict_data` VALUES (4140, 4140, 'menu.security.tenantRemark', 'Tenant Management Menu', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); -REPLACE INTO `sys_dict_data` VALUES (4141, 4141, 'menu.common.batchadd', 'Batch Add', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4142, 4142, 'menu.common.checkdel', 'Check Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4143, 4143, 'menu.common.loaddata', 'Load Data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4144, 4144, 'menu.common.export', 'Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4145, 4145, 'menu.common.checkexport', 'Check Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4146, 4146, 'menu.common.batchdel', 'Batch Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4147, 4147, 'menu.common.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4148, 4148, 'dictData.tenancy.imsi', 'SIM Card', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4149, 4149, 'dictData.tenancy.apn', 'Access Point Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4150, 4150, 'dictData.tenancy.slice', 'Network Slice', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4151, 4151, 'dictData.tenancy.ne', 'UPF', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4152, 4152, 'dictData.tenancy.radio', 'Radio', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4153, 4153, 'role.tenant', 'Tenants', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4154, 4154, 'log.operate.title.sysTenant', 'Tenant Management', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4155, 4155, 'menu.tenant.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4156, 4156, 'menu.tenant.subscriber', 'Subscribers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4157, 4157, 'menu.tenant.onlineUE', 'Online Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4158, 4158, 'menu.tenant.radio', 'Radio Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4159, 4159, 'menu.tenant.imsCDR', 'IMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4160, 4160, 'menu.tenant.smfCDR', 'SMF CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4161, 4161, 'menu.tenant.amfUE', '5G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4162, 4162, 'menu.tenant.mmeUE', '4G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); -REPLACE INTO `sys_dict_data` VALUES (4163, 4163, 'menu.tenant.log', 'Operation Logs', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); - - +REPLACE INTO `sys_dict_data` VALUES (15000, 4139, 'menu.security.tenant', 'Tenant Management', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +REPLACE INTO `sys_dict_data` VALUES (15001, 4140, 'menu.security.tenantRemark', 'Tenant Management Menu', 'i18n_en', '', '', '1', 'supervisor', 1705550000000, '', 0, ''); +REPLACE INTO `sys_dict_data` VALUES (15002, 4141, 'menu.common.batchadd', 'Batch Add', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15003, 4142, 'menu.common.checkdel', 'Check Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15004, 4143, 'menu.common.loaddata', 'Load Data', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15005, 4144, 'menu.common.export', 'Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15006, 4145, 'menu.common.checkexport', 'Check Export', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15007, 4146, 'menu.common.batchdel', 'Batch Delete', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15008, 4147, 'menu.common.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15009, 4148, 'dictData.tenancy.imsi', 'SIM Card', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15010, 4149, 'dictData.tenancy.apn', 'Access Point Name', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15011, 4150, 'dictData.tenancy.slice', 'Network Slice', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15012, 4151, 'dictData.tenancy.ne', 'UPF', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15013, 4152, 'dictData.tenancy.radio', 'Radio', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15014, 4153, 'role.tenant', 'Tenants', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15015, 4154, 'log.operate.title.sysTenant', 'Tenant Management', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15016, 4155, 'menu.tenant.overview', 'Overview', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15017, 4156, 'menu.tenant.subscriber', 'Subscribers', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15018, 4157, 'menu.tenant.onlineUE', 'Online Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15019, 4158, 'menu.tenant.radio', 'Radio Information', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15020, 4159, 'menu.tenant.imsCDR', 'IMS CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15021, 4160, 'menu.tenant.smfCDR', 'SMF CDR', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15022, 4161, 'menu.tenant.amfUE', '5G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15023, 4162, 'menu.tenant.mmeUE', '4G UE Event', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); +REPLACE INTO `sys_dict_data` VALUES (15024, 4163, 'menu.tenant.log', 'Operation Logs', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_sys_dict_type.sql b/database/upgrade/upg_sys_dict_type.sql index 569c6e40..a4522e8f 100644 --- a/database/upgrade/upg_sys_dict_type.sql +++ b/database/upgrade/upg_sys_dict_type.sql @@ -56,6 +56,6 @@ INSERT IGNORE INTO `sys_dict_type` VALUES (123, 'dictType.ne_license_status', 'n INSERT IGNORE INTO `sys_dict_type` VALUES (124, 'dictType.udm_sub_cn_type', 'udm_sub_cn_type', '1', 'supervisor', 1702020000000, '', 0, ''); -- 多租户 -INSERT IGNORE INTO `sys_dict_type` VALUES (1000, 'dictType.tenancy_type', 'tenancy_type', '1', 'supervisor', 1702020000000, '', 0, ''); +INSERT IGNORE INTO `sys_dict_type` VALUES (10000, 'dictType.tenancy_type', 'tenancy_type', '1', 'supervisor', 1702020000000, '', 0, ''); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_sys_menu.sql b/database/upgrade/upg_sys_menu.sql index 1964338b..9d76ab1e 100644 --- a/database/upgrade/upg_sys_menu.sql +++ b/database/upgrade/upg_sys_menu.sql @@ -176,25 +176,25 @@ INSERT IGNORE INTO `sys_menu` VALUES (2150, 'menu.system.user.editPost', 100, 9, -- 多租户 -- tenant management for admin user -INSERT IGNORE INTO `sys_menu` VALUES (12148, 'menu.security.tenant', 2113, 5, 'tenant', 'system/tenant/index', '1', '1', 'M', '1', '1', 'system:tenant:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.tenantRemark'); -INSERT IGNORE INTO `sys_menu` VALUES (12149, 'menu.common.add', 2158, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:add', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12150, 'menu.common.batchadd', 2158, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchAdd', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12151, 'menu.common.checkdel', 2158, 2, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkDel', '#', 'supervisor', 1717491501662, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12152, 'menu.common.batchdel', 2158, 3, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchDel', '#', 'supervisor', 1717491702980, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12153, 'menu.common.loaddata', 2158, 4, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:load', '#', 'supervisor', 1717491838364, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12154, 'menu.common.import', 2158, 5, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:import', '#', 'supervisor', 1717491874118, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10000, 'menu.security.tenant', 2113, 5, 'tenant', 'system/tenant/index', '1', '1', 'M', '1', '1', 'system:tenant:list', 'icon-yuzhanghao1', 'supervisor', 1700000000000, NULL, 0, 'menu.security.tenantRemark'); +INSERT IGNORE INTO `sys_menu` VALUES (10001, 'menu.common.add', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:add', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10002, 'menu.common.batchadd', 10010, 1, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchAdd', '#', 'supervisor', 1717491040044, 'supervisor', 1717491508620, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10003, 'menu.common.checkdel', 10010, 2, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkDel', '#', 'supervisor', 1717491501662, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10004, 'menu.common.batchdel', 10010, 3, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:batchDel', '#', 'supervisor', 1717491702980, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10005, 'menu.common.loaddata', 10010, 4, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:load', '#', 'supervisor', 1717491838364, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10006, 'menu.common.import', 10010, 5, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:import', '#', 'supervisor', 1717491874118, '', 0, ''); -- menu and button for tenant user -INSERT IGNORE INTO `sys_menu` VALUES (12155, 'menu.common.export', 2158, 6, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:export', '#', 'supervisor', 1717491901916, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12156, 'menu.common.checkexport', 2158, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12157, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants'); -INSERT IGNORE INTO `sys_menu` VALUES (12158, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu'); -INSERT IGNORE INTO `sys_menu` VALUES (12159, 'menu.tenant.onlineUE', 0, 92, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-xiangmuchengyuan', 'supervisor', 1718697278784, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12160, 'menu.tenant.radio', 0, 93, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-paixu', 'supervisor', 1718696648153, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12161, 'menu.tenant.imsCDR', 0, 94, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '0', '1', 'tenant:imsCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12162, 'menu.tenant.smfCDR', 0, 95, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '0', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12163, 'menu.tenant.amfUE', 0, 96, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '0', '1', 'tenant:amfUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12164, 'menu.tenant.mmeUE', 0, 97, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '0', '1', 'dashboard:mmeUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); -INSERT IGNORE INTO `sys_menu` VALUES (12165, 'menu.tenant.log', 0, 98, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); +INSERT IGNORE INTO `sys_menu` VALUES (10007, 'menu.common.export', 10010, 6, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:export', '#', 'supervisor', 1717491901916, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10008, 'menu.common.checkexport', 10010, 7, '', '', '1', '1', 'B', '1', '1', 'tenant:subs:checkExport', '#', 'supervisor', 1717492147021, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10009, 'menu.tenant.overview', 0, 90, 'overview', 'index/index', '1', '0', 'M', '0', '1', 'index:index', 'icon-paixu', 'admin', 1716445027021, 'supervisor', 1716453627718, 'Overview interface for tenants'); +INSERT IGNORE INTO `sys_menu` VALUES (10010, 'menu.tenant.subscriber', 0, 91, 'sub', 'tenant/sub/index', '1', '1', 'M', '1', '1', 'tenant:sub:index', 'icon-xiangmuchengyuan', 'supervisor', 1716446941420, 'supervisor', 1716453604732, 'UDM Subscriber Menu'); +INSERT IGNORE INTO `sys_menu` VALUES (10011, 'menu.tenant.onlineUE', 0, 92, 'ue', 'tenant/ue/index', '1', '0', 'M', '1', '1', 'tenant:ue:index', 'icon-xiangmuchengyuan', 'supervisor', 1718697278784, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10012, 'menu.tenant.radio', 0, 93, 'base5G', 'tenant/base5G/index', '1', '0', 'M', '1', '1', 'tenant:base5G:index', 'icon-paixu', 'supervisor', 1718696648153, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10013, 'menu.tenant.imsCDR', 0, 94, 'imsCDR', 'tenant/imsCDR/index', '1', '0', 'M', '0', '1', 'tenant:imsCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10014, 'menu.tenant.smfCDR', 0, 95, 'smfCDR', 'tenant/smfCDR/index', '1', '0', 'M', '0', '1', 'tenant:smfCDR:index', 'icon-paixu', 'supervisor', 1716454666743, '', 0, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10015, 'menu.tenant.amfUE', 0, 96, 'amfUE', 'tenant/amfUE/index', '1', '0', 'M', '0', '1', 'tenant:amfUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10016, 'menu.tenant.mmeUE', 0, 97, 'mmeUE', 'tenant/mmeUE/index', '1', '0', 'M', '0', '1', 'tenant:amfUE:index', 'icon-paixu', 'supervisor', 1716454666743, 'supervisor', 1718621454168, ''); +INSERT IGNORE INTO `sys_menu` VALUES (10017, 'menu.tenant.log', 0, 98, 'operate', 'tenant/operate/index', '1', '1', 'M', '1', '1', 'tenant:operate:list', 'icon-fuzhidaima', 'supervisor', 1716447063341, 'supervisor', 1716453612175, 'Operation log menu'); -- end for tenant user -- update department management to non visible diff --git a/src/modules/system/controller/sys_tenant.go b/src/modules/system/controller/sys_tenant.go index 7b0b64da..e02dae12 100644 --- a/src/modules/system/controller/sys_tenant.go +++ b/src/modules/system/controller/sys_tenant.go @@ -154,10 +154,11 @@ func (s *SysTenantController) Add(c *gin.Context) { body.CreateBy = ctx.LoginUserToUserName(c) insertId := s.sysTenantService.InsertTenant(body) if insertId != "" { - // 如果是增加SIM Card类型的，需更新udm_sub_user + // 如果是增加SIM Card类型的，需更新u_sub_user if body.TenancyType == "IMSI" && body.Status == "1" { affected := s.sysTenantService.UpdateUDMSubTenantID(body.ParentID, body.TenancyKey) - log.Tracef("body.ParentID=%s, body.TenancyKey=%s, update affected=%v", body.ParentID, body.TenancyKey, affected) + log.Tracef("body.ParentID=%s, body.TenancyKey=%s, update affected=%v", + body.ParentID, body.TenancyKey, affected) } c.JSON(200, result.Ok(nil)) return @@ -244,7 +245,7 @@ func (s *SysTenantController) Edit(c *gin.Context) { body.UpdateBy = ctx.LoginUserToUserName(c) rows := s.sysTenantService.UpdateTenant(body) if rows > 0 { - // 如果是更新的是SIM Card类型的，需更新udm_sub_user + // 如果是更新的是SIM Card类型的，需更新u_sub_user // 先清空签约用户原有的租户信息 if tenantOldInfo.TenancyType == "IMSI" && tenantOldInfo.Status == "1" { affected := s.sysTenantService.UpdateUDMSubTenantID("", tenantOldInfo.TenancyKey) @@ -304,10 +305,11 @@ func (s *SysTenantController) Remove(c *gin.Context) { tenantOldInfo := s.sysTenantService.SelectTenantById(tenantId) rows := s.sysTenantService.DeleteTenantById(tenantId) if rows > 0 { - // 如果是删除的是SIM Card类型的，需删除相关的udm_sub_user的租户信息 + // 如果是删除的是SIM Card类型的，需删除相关的u_sub_user的租户信息 if tenantOldInfo.TenancyType == "IMSI" && tenantOldInfo.Status == "1" { affected := s.sysTenantService.UpdateUDMSubTenantID("", tenantOldInfo.TenancyKey) - log.Tracef("tenantOldInfo.ParentID=%s, tenantOldInfo.TenancyKey=%s, update affected=%v", tenantOldInfo.ParentID, tenantOldInfo.TenancyKey, affected) + log.Tracef("tenantOldInfo.ParentID=%s, tenantOldInfo.TenancyKey=%s, update affected=%v", + tenantOldInfo.ParentID, tenantOldInfo.TenancyKey, affected) } // 删除成功：%d msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})