From b8116ce203651d582639ecc05bf68d46276d0502 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 6 Sep 2025 17:41:16 +0800 Subject: [PATCH] =?UTF-8?q?ref:=20v3=E5=8F=98=E6=9B=B4,=EF=BC=8Capi?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B0=83=E6=95=B4=EF=BC=8C=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/std/install/sys_i18n.sql | 14 +- build/database/std/install/sys_menu.sql | 16 +- build/database/std/install/sys_role.sql | 2 +- build/database/std/install/sys_role_menu.sql | 101 ++-- build/database/std/install/sys_user.sql | 8 +- build/default/omc.yaml | 2 - local/omc.yaml | 2 - src/app.go | 9 +- src/config/config.default.yaml | 2 - src/framework/middleware/authorize_user.go | 4 +- src/framework/utils/machine/launch.go | 25 +- .../backup_export_cdr/backup_export_cdr.go | 5 +- .../backup_export_table.go | 9 +- .../backup_export_udm/backup_export_udm.go | 33 +- .../processor/ne_data_udm/ne_data_udm.go | 22 +- src/modules/ne/controller/ne_config.go | 2 +- src/modules/ne/controller/ne_info.go | 2 +- src/modules/ne/controller/ne_license.go | 2 +- src/modules/ne/controller/ne_version.go | 7 +- src/modules/ne/repository/ne_version.go | 3 + src/modules/ne/service/ne_info.go | 2 +- src/modules/ne/service/ne_version.go | 2 +- .../{core => ne_core}/controller/core_info.go | 4 +- src/modules/{core => ne_core}/core.go | 6 +- .../{core => ne_core}/model/core_info.go | 0 .../{core => ne_core}/repository/core_info.go | 2 +- .../{core => ne_core}/service/core_info.go | 4 +- .../controller/{all_alarm.go => alarm.go} | 4 +- ...{all_alarm_forward.go => alarm_forward.go} | 2 +- .../{all_alarm_log.go => alarm_log.go} | 4 +- .../controller/{all_backup.go => backup.go} | 0 .../ne_data/controller/{all_kpi.go => kpi.go} | 4 +- .../controller/{all_kpi_c.go => kpi_c.go} | 2 +- .../{all_nb_state.go => nb_state.go} | 0 .../{all_ne_state.go => ne_state.go} | 0 src/modules/ne_data/ne_data.go | 422 +---------------- .../{ne_data => ne_data_nf}/controller/amf.go | 20 +- .../{ne_data => ne_data_nf}/controller/cbc.go | 30 +- .../{ne_data => ne_data_nf}/controller/ims.go | 19 +- .../{ne_data => ne_data_nf}/controller/mme.go | 20 +- .../controller/n3iwf.go | 4 +- .../controller/nssf.go | 6 +- .../{ne_data => ne_data_nf}/controller/pcf.go | 14 +- .../controller/sgwc.go | 19 +- .../{ne_data => ne_data_nf}/controller/smf.go | 24 +- .../controller/smsc.go | 14 +- .../controller/udm_auth.go | 22 +- .../controller/udm_sub.go | 20 +- .../controller/udm_voip.go | 18 +- .../controller/udm_volte_ims.go | 18 +- .../{ne_data => ne_data_nf}/controller/upf.go | 2 +- .../{ne => ne_data_nf}/fetch_link/alarm.go | 0 .../{ne => ne_data_nf}/fetch_link/amf.go | 0 .../{ne => ne_data_nf}/fetch_link/hlr.go | 0 .../{ne => ne_data_nf}/fetch_link/ims.go | 0 .../{ne => ne_data_nf}/fetch_link/mme.go | 0 .../{ne => ne_data_nf}/fetch_link/n3iwf.go | 0 .../fetch_link/ne_config.go | 0 .../{ne => ne_data_nf}/fetch_link/ne_state.go | 0 .../{ne => ne_data_nf}/fetch_link/ne_trace.go | 0 .../{ne => ne_data_nf}/fetch_link/nssf.go | 0 .../{ne => ne_data_nf}/fetch_link/pcf.go | 0 .../{ne => ne_data_nf}/fetch_link/smf.go | 0 .../{ne => ne_data_nf}/fetch_link/udm.go | 0 .../model/cbc_message.go | 0 .../model/cdr_event.go | 0 .../{ne_data => ne_data_nf}/model/udm_auth.go | 0 .../model/udm_extend.go | 0 .../{ne_data => ne_data_nf}/model/udm_sub.go | 0 .../{ne_data => ne_data_nf}/model/udm_voip.go | 0 .../model/udm_volte_ims.go | 0 .../{ne_data => ne_data_nf}/model/ue_event.go | 0 src/modules/ne_data_nf/ne_data_nf.go | 438 ++++++++++++++++++ .../repository/cbc_message.go | 2 +- .../repository/cdr_event.go | 2 +- .../repository/udm_auth.go | 2 +- .../repository/udm_extend.go | 2 +- .../repository/udm_sub.go | 2 +- .../repository/udm_voip.go | 2 +- .../repository/udm_volte_ims.go | 2 +- .../repository/ue_event.go | 2 +- .../service/cbc_message.go | 4 +- .../service/cdr_event.go | 4 +- .../service/udm_auth.go | 4 +- .../service/udm_extend.go | 4 +- .../service/udm_sub.go | 4 +- .../service/udm_voip.go | 4 +- .../service/udm_volte_ims.go | 4 +- .../service/ue_event.go | 4 +- .../udm_auth_k4_test.go | 2 +- src/modules/oam/controller/api_rest.go | 2 +- src/modules/oam/service/cbs_state.go | 6 +- src/modules/oam/service/cdr.go | 10 +- src/modules/oam/service/ue_nb.go | 10 +- src/modules/trace/service/trace_task.go | 2 +- src/modules/trace/service/trace_task_hlr.go | 2 +- src/modules/ws/processor/cdr_connect.go | 4 +- src/modules/ws/processor/ne_state.go | 2 +- src/modules/ws/processor/ue_connect.go | 4 +- 99 files changed, 749 insertions(+), 759 deletions(-) rename src/modules/{core => ne_core}/controller/core_info.go (98%) rename src/modules/{core => ne_core}/core.go (92%) rename src/modules/{core => ne_core}/model/core_info.go (100%) rename src/modules/{core => ne_core}/repository/core_info.go (99%) rename src/modules/{core => ne_core}/service/core_info.go (96%) rename src/modules/ne_data/controller/{all_alarm.go => alarm.go} (99%) rename src/modules/ne_data/controller/{all_alarm_forward.go => alarm_forward.go} (96%) rename src/modules/ne_data/controller/{all_alarm_log.go => alarm_log.go} (97%) rename src/modules/ne_data/controller/{all_backup.go => backup.go} (100%) rename src/modules/ne_data/controller/{all_kpi.go => kpi.go} (98%) rename src/modules/ne_data/controller/{all_kpi_c.go => kpi_c.go} (99%) rename src/modules/ne_data/controller/{all_nb_state.go => nb_state.go} (100%) rename src/modules/ne_data/controller/{all_ne_state.go => ne_state.go} (100%) rename src/modules/{ne_data => ne_data_nf}/controller/amf.go (93%) rename src/modules/{ne_data => ne_data_nf}/controller/cbc.go (88%) rename src/modules/{ne_data => ne_data_nf}/controller/ims.go (95%) rename src/modules/{ne_data => ne_data_nf}/controller/mme.go (93%) rename src/modules/{ne_data => ne_data_nf}/controller/n3iwf.go (95%) rename src/modules/{ne_data => ne_data_nf}/controller/nssf.go (95%) rename src/modules/{ne_data => ne_data_nf}/controller/pcf.go (97%) rename src/modules/{ne_data => ne_data_nf}/controller/sgwc.go (90%) rename src/modules/{ne_data => ne_data_nf}/controller/smf.go (92%) rename src/modules/{ne_data => ne_data_nf}/controller/smsc.go (92%) rename src/modules/{ne_data => ne_data_nf}/controller/udm_auth.go (97%) rename src/modules/{ne_data => ne_data_nf}/controller/udm_sub.go (97%) rename src/modules/{ne_data => ne_data_nf}/controller/udm_voip.go (97%) rename src/modules/{ne_data => ne_data_nf}/controller/udm_volte_ims.go (97%) rename src/modules/{ne_data => ne_data_nf}/controller/upf.go (97%) rename src/modules/{ne => ne_data_nf}/fetch_link/alarm.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/amf.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/hlr.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/ims.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/mme.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/n3iwf.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/ne_config.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/ne_state.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/ne_trace.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/nssf.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/pcf.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/smf.go (100%) rename src/modules/{ne => ne_data_nf}/fetch_link/udm.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/cbc_message.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/cdr_event.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/udm_auth.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/udm_extend.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/udm_sub.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/udm_voip.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/udm_volte_ims.go (100%) rename src/modules/{ne_data => ne_data_nf}/model/ue_event.go (100%) create mode 100644 src/modules/ne_data_nf/ne_data_nf.go rename src/modules/{ne_data => ne_data_nf}/repository/cbc_message.go (99%) rename src/modules/{ne_data => ne_data_nf}/repository/cdr_event.go (99%) rename src/modules/{ne_data => ne_data_nf}/repository/udm_auth.go (99%) rename src/modules/{ne_data => ne_data_nf}/repository/udm_extend.go (98%) rename src/modules/{ne_data => ne_data_nf}/repository/udm_sub.go (99%) rename src/modules/{ne_data => ne_data_nf}/repository/udm_voip.go (99%) rename src/modules/{ne_data => ne_data_nf}/repository/udm_volte_ims.go (99%) rename src/modules/{ne_data => ne_data_nf}/repository/ue_event.go (99%) rename src/modules/{ne_data => ne_data_nf}/service/cbc_message.go (99%) rename src/modules/{ne_data => ne_data_nf}/service/cdr_event.go (99%) rename src/modules/{ne_data => ne_data_nf}/service/udm_auth.go (98%) rename src/modules/{ne_data => ne_data_nf}/service/udm_extend.go (91%) rename src/modules/{ne_data => ne_data_nf}/service/udm_sub.go (99%) rename src/modules/{ne_data => ne_data_nf}/service/udm_voip.go (98%) rename src/modules/{ne_data => ne_data_nf}/service/udm_volte_ims.go (98%) rename src/modules/{ne_data => ne_data_nf}/service/ue_event.go (98%) rename src/modules/{ne_data => ne_data_nf}/udm_auth_k4_test.go (98%) diff --git a/build/database/std/install/sys_i18n.sql b/build/database/std/install/sys_i18n.sql index a2a3f898..1192f258 100644 --- a/build/database/std/install/sys_i18n.sql +++ b/build/database/std/install/sys_i18n.sql @@ -124,7 +124,7 @@ INSERT INTO `sys_i18n` VALUES (106, 'menu.perf.data', '性能数据', 'Performan INSERT INTO `sys_i18n` VALUES (107, 'menu.perf.kpiOverView', '关键指标概览', 'Key Performance Overview'); INSERT INTO `sys_i18n` VALUES (108, 'menu.perf.threshold', '性能门限', 'Performance Thresholds'); INSERT INTO `sys_i18n` VALUES (109, 'menu.perf.kpi', '关键指标', 'Key Performance Indicators'); -INSERT INTO `sys_i18n` VALUES (110, 'menu.perf.kpicTitle', '自定义指标', 'Custom Key Performance Title'); +INSERT INTO `sys_i18n` VALUES (110, 'menu.perf.kpicTitle', '自定义指标标题', 'Custom Key Performance Title'); INSERT INTO `sys_i18n` VALUES (111, 'menu.perf.kpiKeyTarget', '关键指标报表', 'Key Performance Reports'); INSERT INTO `sys_i18n` VALUES (112, 'menu.mml', 'MML', 'MML'); INSERT INTO `sys_i18n` VALUES (113, 'menu.mml.ne', '网元操作', 'NE Operation'); @@ -136,7 +136,7 @@ INSERT INTO `sys_i18n` VALUES (118, 'menu.perf.dataRemark', '性能数据菜单' INSERT INTO `sys_i18n` VALUES (119, 'menu.dashboard.smscCDR.content', '可见短信内容', 'Visible SMS content'); INSERT INTO `sys_i18n` VALUES (120, 'menu.perf.thresholdRemark', '性能门限菜单', 'Performance Threshold Menu'); INSERT INTO `sys_i18n` VALUES (121, 'menu.perf.kpiRemark', '黄金指标菜单', 'Key Performance Indicator Menu'); -INSERT INTO `sys_i18n` VALUES (122, 'menu.perf.kpicTitleRemark', '自定义指标菜单', 'Custom Key Performance Title Menu'); +INSERT INTO `sys_i18n` VALUES (122, 'menu.perf.kpicTitleRemark', '自定义指标标题菜单', 'Custom Key Performance Title Menu'); INSERT INTO `sys_i18n` VALUES (123, 'menu.dashboard.smfCDRByIMSI', 'SMF数据流量报表', 'SMF Data Usage Report'); INSERT INTO `sys_i18n` VALUES (124, 'menu.mmlRemark', 'MML管理目录', 'MML Management Catalog'); INSERT INTO `sys_i18n` VALUES (125, 'menu.mml.neRemark', '网元操作菜单', 'Network Element Operations Menu'); @@ -330,12 +330,12 @@ INSERT INTO `sys_i18n` VALUES (312, 'job.errCronExpression', '操作调度任务 INSERT INTO `sys_i18n` VALUES (313, 'job.errJobExists', '调度任务新增【{name}】失败，同任务组内有相同任务名称', 'Failed to add a new task [{name}] to a scheduling task, same task name in the same task group'); INSERT INTO `sys_i18n` VALUES (314, 'job.statusEq', '变更状态与旧值相等！', 'The change state is equal to the old value!'); INSERT INTO `sys_i18n` VALUES (315, 'role.system', '系统', 'System'); -INSERT INTO `sys_i18n` VALUES (316, 'role.admin', '管理人员', 'Administrator'); +INSERT INTO `sys_i18n` VALUES (316, 'role.manager', '管理人员', 'Manager'); INSERT INTO `sys_i18n` VALUES (317, 'role.operator', '运维人员', 'Operators'); INSERT INTO `sys_i18n` VALUES (318, 'role.monitor', '监控人员', 'Monitor'); INSERT INTO `sys_i18n` VALUES (319, 'role.vistor', '普通用户', 'General Users'); INSERT INTO `sys_i18n` VALUES (320, 'role.systemRemark', '系统，无法修改删除', 'System, cannot modify or delete'); -INSERT INTO `sys_i18n` VALUES (321, 'role.adminRemark', '管理人员 可以对设备进行任何操作', 'Administrators can perform any operation on the device'); +INSERT INTO `sys_i18n` VALUES (321, 'role.managerRemark', '管理人员 可以对设备进行任何操作', 'Manager can perform any operation on the device'); INSERT INTO `sys_i18n` VALUES (322, 'role.operatorRemark', '运维人员 可以从设备读取数据，并对设备进行配置，但是不能对设备进行软件升级操作。', 'Operation and maintenance personnel can read data from the device and configure the device, but cannot perform software upgrade operations on the device.'); INSERT INTO `sys_i18n` VALUES (323, 'role.monitorRemark', '监控人员 只能从设备读取数据，而不能对设备进行任何设置', 'Monitoring personnel Can only read data from the device, but cannot make any settings on the device'); INSERT INTO `sys_i18n` VALUES (324, 'role.vistorRemark', '普通用户 只可看系统相关信息', 'Ordinary users can only see system-related information'); @@ -497,7 +497,7 @@ INSERT INTO `sys_i18n` VALUES (479, 'config.sys.helpDocRemark', '静态文件目 INSERT INTO `sys_i18n` VALUES (480, 'log.operate.title.neAction', '网元处理', 'Network Element Processing'); INSERT INTO `sys_i18n` VALUES (481, 'log.operate.title.helpDoc', '系统使用文档', 'System Usage Documentation'); INSERT INTO `sys_i18n` VALUES (482, 'menu.ueUser.n3iwf', 'N3IWF在线用户', 'N3IWF Online User'); -INSERT INTO `sys_i18n` VALUES (483, 'menu.neData.pcfSub', 'PCF用户规则', 'PCF User Rule'); +INSERT INTO `sys_i18n` VALUES (483, 'menu.neData.pcfSub', 'PCF 终端规则', 'PCF UE Rule'); INSERT INTO `sys_i18n` VALUES (484, 'menu.system.user.editRole', '修改用户角色', 'Modifying User Role'); INSERT INTO `sys_i18n` VALUES (485, 'config.sys.i18nOpen', '国际化切换', 'Internationalization Switching'); INSERT INTO `sys_i18n` VALUES (486, 'config.sys.i18nDefault', '国际化默认语言', 'Internationalization Default Language'); @@ -659,7 +659,7 @@ INSERT INTO `sys_i18n` VALUES (641, 'cache.name.oauth2_devices', '客户端令 INSERT INTO `sys_i18n` VALUES (642, 'job.backup_export_cdr', '备份-CDR数据定期导出', 'Backup-Periodic export of CDR Data'); INSERT INTO `sys_i18n` VALUES (643, 'job.backup_export_cdr_remark', 'dataType: 类型支持 ims/smf/sgwc/smsc\nfileType: 文件类型 csv/xlsx\nhour: 数据时间从任务执行时间前的小时数', 'Backup-Periodic export of dataType: type support ims/smf/sgwc/smsc\nfileType: file type csv/xlsx\nhour: data time from the hour before the task execution time'); -- INSERT INTO `sys_i18n` VALUES (644, 'menu.log.exportFile', '导出文件', 'Exported File'); -INSERT INTO `sys_i18n` VALUES (645, 'menu.perf.kpic', '自定义指标数据', 'Custom Key Performance Indicators'); +INSERT INTO `sys_i18n` VALUES (645, 'menu.perf.kpic', '自定义指标', 'Custom Key Performance Indicators'); INSERT INTO `sys_i18n` VALUES (646, 'menu.trace.taskHLR', 'HLR 跟踪任务', 'HLR Trace Task'); INSERT INTO `sys_i18n` VALUES (647, 'dictType.cdr_cause_code', 'CDR 响应原因代码类别类型', 'CDR Response Reason Code Category Type'); INSERT INTO `sys_i18n` VALUES (648, 'dictData.cdr_cause_code.0', '未知错误', 'Unknown Error'); @@ -692,7 +692,7 @@ INSERT INTO `sys_i18n` VALUES (674, 'config.sys.user.passwdNotAllowedHistory', ' INSERT INTO `sys_i18n` VALUES (675, 'config.sys.user.passwdNotAllowedHistoryRemark', '创建新密码不等于之前使用的x次中的密码', 'Creating a new password that is not equal to the previously used password in x times'); INSERT INTO `sys_i18n` VALUES (676, 'login.errPasswdHistory', '不允许使用最近密码', 'Recent passwords not allowed'); INSERT INTO `sys_i18n` VALUES (677, 'log.operate.title.oauth2client', 'Oauth2客户端授权', 'Oauth2 Client Authorization'); -INSERT INTO `sys_i18n` VALUES (678, 'log.operate.title.pcfRule', '终端策略规则', 'UE PCC Rule'); +INSERT INTO `sys_i18n` VALUES (678, 'log.operate.title.pcfRule', 'PCF规则', 'PCF Rule'); INSERT INTO `sys_i18n` VALUES (679, 'dictType.trace_msg_type', '跟踪消息类型', 'Trace Message Type'); INSERT INTO `sys_i18n` VALUES (680, 'dictData.trace_msg_type.0', '请求', 'Request'); INSERT INTO `sys_i18n` VALUES (681, 'dictData.trace_msg_type.1', '响应', 'Response'); diff --git a/build/database/std/install/sys_menu.sql b/build/database/std/install/sys_menu.sql index 356999b8..78f9bce6 100644 --- a/build/database/std/install/sys_menu.sql +++ b/build/database/std/install/sys_menu.sql @@ -120,7 +120,7 @@ INSERT INTO `sys_menu` VALUES (1059, 'menu.common.edit', 109, 3, '#', '', '1', ' INSERT INTO `sys_menu` VALUES (1060, 'menu.common.delete', 109, 4, '#', '', '1', '1', 'B', '1', '1', 'system:loginSource:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2000, 'menu.neData.udmAuth', 5, 1, 'udm-auth', 'neData/udm-auth/index', '1', '1', 'M', '1', '1', 'udm:auth:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', ''); INSERT INTO `sys_menu` VALUES (2001, 'menu.neData.udmSub', 5, 3, 'udm-sub', 'neData/udm-sub/index', '1', '1', 'M', '1', '1', 'udm:sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', ''); -INSERT INTO `sys_menu` VALUES (2002, 'menu.neData.udmVOIP', 5, 5, 'udm-voip', 'neData/udm-voip/index', '1', '0', 'M', '1', '1', 'udm:voip:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', ''); +INSERT INTO `sys_menu` VALUES (2002, 'menu.neData.udmVoIP', 5, 5, 'udm-voip', 'neData/udm-voip/index', '1', '0', 'M', '1', '1', 'udm:voip:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', ''); INSERT INTO `sys_menu` VALUES (2003, 'menu.neData.udmVolte', 5, 7, 'udm-volte', 'neData/udm-volte/index', '1', '0', 'M', '1', '1', 'udm:volte:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'udm+ims'); INSERT INTO `sys_menu` VALUES (2004, 'menu.neData.imsSub', 6, 10, 'ims-sub', 'neData/ims-sub/index', '1', '0', 'M', '1', '1', 'ims:sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'ims'); INSERT INTO `sys_menu` VALUES (2005, 'menu.neData.smfSub', 6, 12, 'smf-sub', 'neData/smf-sub/index', '1', '0', 'M', '1', '1', 'smf:sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'smf'); @@ -132,7 +132,7 @@ INSERT INTO `sys_menu` VALUES (2010, 'menu.neUser.nssf', 6, 19, 'nssf', 'neData/ INSERT INTO `sys_menu` VALUES (2011, 'menu.neUser.nssfAmf', 6, 20, 'nssfAmf', 'neData/nssf-amf/index', '1', '0', 'M', '1', '1', 'nssf:sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'nssf'); INSERT INTO `sys_menu` VALUES (2083, 'menu.trace', 2083, 30, 'trace', '', '1', '0', 'D', '1', '1', '', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.traceRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2084, 'menu.trace.task', 4, 40, 'task', 'ne/trace/task/index', '1', '0', 'M', '1', '1', 'traceManage:task:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1744453890548, 'menu.trace.taskRemark', '0', '0', ''); -INSERT INTO `sys_menu` VALUES (2085, 'menu.trace.taskData', 4, 41, 'task/inline/data', 'ne/trace/task/data', '1', '0', 'M', '0', '1', 'traceManage:task:data', '#', '0', 'system', 1728641403588, 'system', 1744453921381, '', '0', '0', ''); +INSERT INTO `sys_menu` VALUES (2085, 'menu.trace.taskData', 2084, 41, 'task/inline/data', 'ne/trace/task/data', '1', '0', 'M', '0', '1', 'traceManage:task:data', '#', '0', 'system', 1728641403588, 'system', 1744453921381, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2086, 'menu.trace.pcap', 60, 11, 'pcap', 'tool/pcap/index', '1', '1', 'M', '1', '1', 'traceManage:pcap:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.trace.pcapRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2087, 'menu.monitor', 0, 2, 'monitor', '', '1', '0', 'D', '1', '1', '', 'icon-jinggao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.faultRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2088, 'menu.fault.active', 2129, 1, 'active', 'alarm/active/index', '1', '1', 'M', '1', '1', 'faultManage:active-alarm:index', 'icon-wenjian', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.fault.activemRemark', '0', '0', ''); @@ -141,14 +141,14 @@ INSERT INTO `sys_menu` VALUES (2092, 'menu.log.alarm', 2129, 40, 'log', 'alarm/l INSERT INTO `sys_menu` VALUES (2094, 'menu.log.forwarding', 2129, 41, 'forwarding', 'alarm/forwarding/index', '1', '0', 'M', '1', '1', 'logManage:forwarding:index', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.log.forwardingRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2096, 'menu.neData.backupData', 0, 30, 'backup-data', 'neData/backup-data/index', '1', '0', 'M', '1', '1', 'ne-data:backup-data:list', 'icon-wenjian', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2097, 'menu.fault.history', 2129, 2, 'history', 'alarm/history/index', '1', '1', 'M', '1', '1', 'faultManage/history-alarm/index', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.fault.historyRemark', '0', '0', ''); -INSERT INTO `sys_menu` VALUES (2098, 'menu.fault.set', 2129, 100, 'set', 'alarm/set/index', '1', '0', 'M', '0', '1', 'faultManage/fault-setting/index', 'icon-gonggaodayi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.fault.setRemark', '0', '0', ''); +INSERT INTO `sys_menu` VALUES (2098, 'menu.fault.set', 2129, 100, 'set', 'alarm/set/index', '1', '0', 'M', '0', '0', 'faultManage/fault-setting/index', 'icon-gonggaodayi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.fault.setRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2099, 'menu.perf', 0, 5, 'perfManage', '', '1', '0', 'D', '1', '1', '', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perfRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2100, 'menu.perf.task', 2099, 1, 'taskManage', 'perfManage/taskManage/index', '1', '0', 'M', '0', '1', 'perfManage:taskManage:index', 'icon-wofaqi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.taskRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2101, 'menu.perf.data', 2099, 2, 'perfData', 'perfManage/perfData/index', '1', '0', 'M', '0', '1', 'perfManage:perfData:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.dataRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2102, 'menu.perf.kpiOverView', 2099, 10, 'kpiOverView', 'perfManage/kpiOverView/index', '1', '0', 'M', '1', '1', 'perfManage:perfReport:index', 'icon-gonggaodayi', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2103, 'menu.perf.threshold', 2099, 4, 'perfThreshold', 'perfManage/perfThreshold/index', '1', '0', 'M', '0', '0', 'perfManage:perfThreshold:index', 'icon-zhuanrang', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.thresholdRemark', '0', '0', ''); -INSERT INTO `sys_menu` VALUES (2104, 'menu.perf.kpi', 2099, 20, 'goldTarget', 'perfManage/goldTarget/index', '1', '1', 'M', '1', '1', 'perfManage:goldTarget:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.kpiRemark', '0', '0', ''); -INSERT INTO `sys_menu` VALUES (2105, 'menu.perf.customTarget', 2099, 99, 'customTarget', 'perfManage/customTarget/index', '1', '0', 'M', '1', '1', 'perfManage:customTarget:index', 'icon-fanhui1', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.customTargetRemark', '0', '0', ''); +INSERT INTO `sys_menu` VALUES (2104, 'menu.perf.kpi', 2099, 20, 'kpi', 'perfManage/kpi/index', '1', '1', 'M', '1', '1', 'perfManage:goldTarget:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.kpiRemark', '0', '0', ''); +INSERT INTO `sys_menu` VALUES (2105, 'menu.perf.kpicTitle', 2099, 99, 'kpic-title', 'perfManage/kpic-title/index', '1', '0', 'M', '1', '1', 'perfManage:customTarget:index', 'icon-fanhui1', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.customTargetRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2106, 'menu.perf.kpiKeyTarget', 2099, 12, 'kpiKeyTarget', 'perfManage/kpiKeyTarget/index', '1', '0', 'M', '1', '1', 'perfManage:kpiKeyTarget:index', 'icon-fuzhichenggong', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2107, 'menu.mml', 0, 19, 'mml', '', '1', '0', 'D', '1', '1', '', 'icon-zhizuoliucheng', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.mmlRemark', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2108, 'menu.mml.ne', 2107, 1, 'ne', 'mml/ne/index', '1', '1', 'M', '1', '1', 'mmlManage:neOperate:index', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.mml.neRemark', '0', '0', ''); @@ -180,7 +180,7 @@ INSERT INTO `sys_menu` VALUES (2135, 'menu.ne.neHost', 4, 15, 'neHost', 'ne/neHo INSERT INTO `sys_menu` VALUES (2136, 'menu.ne.neHostCommand', 4, 18, 'neHostCommand', 'ne/neHostCommand/index', '1', '0', 'M', '1', '0', 'ne:neHostCommand:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2137, 'menu.ne.neInfo', 4, 10, 'neInfo', 'ne/neInfo/index', '1', '0', 'M', '1', '1', 'ne:neInfo:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2138, 'menu.dashboard.amfUE', 2141, 1, 'amf-ue', 'neData/amf-ue/index', '1', '0', 'M', '1', '1', 'amf:ue:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'amf'); -INSERT INTO `sys_menu` VALUES (2139, 'menu.perf.kpiIMSOverview', 2099, 14, 'dashboard', 'perfManage/overview/index', '1', '0', 'M', '1', '1', 'ims:perfManage:dashboard:index', 'icon-fuzhichenggong', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'ims'); +INSERT INTO `sys_menu` VALUES (2139, 'menu.perf.kpiOverviewIMS', 2099, 14, 'overview-ims', 'perfManage/overview-ims/index', '1', '0', 'M', '1', '1', 'ims:perfManage:dashboard:index', 'icon-fuzhichenggong', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'ims'); INSERT INTO `sys_menu` VALUES (2140, 'menu.monitor.cdr', 6, 25, 'cdr', '', '1', '0', 'D', '1', '1', '', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2141, 'menu.monitor.event', 6, 26, 'event', '', '1', '0', 'D', '1', '1', '', 'icon-gengduo', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2142, 'menu.ne.neQuickSetup', 4, 50, 'neQuickSetup', 'ne/neQuickSetup/index', '1', '1', 'M', '1', '1', 'ne:neQuickSetup:list', 'icon-wofaqi', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); @@ -200,9 +200,9 @@ INSERT INTO `sys_menu` VALUES (2155, 'menu.common.delete', 2154, 1, '#', '', '1' INSERT INTO `sys_menu` VALUES (2156, 'menu.common.edit', 2154, 2, '#', '', '1', '1', 'B', '1', '1', 'ne:neConfigBackup:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2157, 'menu.dashboard.smscCDR', 2140, 9, 'smsc-cdr', 'neData/smsc-cdr/index', '1', '0', 'M', '1', '1', 'smsc:cdr:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'smsc'); INSERT INTO `sys_menu` VALUES (2158, 'menu.trace.pcapFile', 60, 12, 'pcap/inline/file', 'tool/pcap/file', '1', '0', 'M', '0', '1', 'traceManage:pcap:index', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); -INSERT INTO `sys_menu` VALUES (2160, 'menu.perf.kpiCReport', 2099, 100, 'kpiCReport', 'perfManage/kpiCReport/index', '1', '0', 'M', '1', '1', 'perfManage:kpiCReport:index', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); +INSERT INTO `sys_menu` VALUES (2160, 'menu.perf.kpic', 2099, 100, 'kpic', 'perfManage/kpic/index', '1', '0', 'M', '1', '1', 'perfManage:kpiCReport:index', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2161, 'menu.trace.taskHLR', 4, 45, 'taskHLR', 'ne/trace/task-hlr/index', '1', '0', 'M', '0', '1', 'traceManage:taskHLR:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); -INSERT INTO `sys_menu` VALUES (2162, 'menu.trace.taskAnalyze', 4, 42, 'task/inline/analyze', 'ne/trace/task/analyze', '1', '0', 'M', '0', '1', 'traceManage:task:analyze', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); +INSERT INTO `sys_menu` VALUES (2162, 'menu.trace.taskAnalyze', 2084, 42, 'task/inline/analyze', 'ne/trace/task/analyze', '1', '0', 'M', '0', '1', 'traceManage:task:analyze', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2163, 'menu.trace.tshark', 60, 14, 'tshark', 'tool/tshark/index', '1', '0', 'M', '1', '1', 'traceManage:tshark:index', 'icon-gengduo', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2164, 'menu.trace.wireshark', 60, 16, 'wireshark', 'tool/wireshark/index', '1', '0', 'M', '1', '1', 'traceManage:wireshark:index', 'icon-gengduo', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', ''); INSERT INTO `sys_menu` VALUES (2165, 'menu.ne.neOverview', 4, 1, 'neOverview', 'ne/neOverview/index', '1', '0', 'M', '1', '1', 'configManage:neOverview:index', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.ne.neOverviewRemark', '0', '0', ''); diff --git a/build/database/std/install/sys_role.sql b/build/database/std/install/sys_role.sql index 1e0c21bd..5b78365b 100644 --- a/build/database/std/install/sys_role.sql +++ b/build/database/std/install/sys_role.sql @@ -29,7 +29,7 @@ CREATE TABLE `sys_role` ( LOCK TABLES `sys_role` WRITE; INSERT INTO `sys_role` VALUES (1, 'role.system', 'system', 1, '1', '1', '1', '1', '0', 'system', 1697091437683, 'system', 1697091437683, 'role.systemRemark'); -INSERT INTO `sys_role` VALUES (2, 'role.admin', 'admin', 2, '1', '1', '1', '1', '0', 'system', 1697091437683, 'system', 1697091437683, 'role.adminRemark'); +INSERT INTO `sys_role` VALUES (2, 'role.manager', 'manager', 2, '1', '1', '1', '1', '0', 'system', 1697091437683, 'system', 1697091437683, 'role.managerRemark'); INSERT INTO `sys_role` VALUES (3, 'role.operator', 'operator', 3, '1', '1', '1', '1', '0', 'system', 1697091437683, 'system', 1697091437683, 'role.operatorRemark'); INSERT INTO `sys_role` VALUES (4, 'role.monitor', 'monitor', 4, '1', '1', '1', '1', '0', 'system', 1697091437683, 'system', 1697091437683, 'role.monitorRemark'); INSERT INTO `sys_role` VALUES (5, 'role.vistor', 'vistor', 5, '1', '1', '1', '1', '0', 'system', 1697091437683, 'system', 1697091437683, 'role.vistorRemark'); diff --git a/build/database/std/install/sys_role_menu.sql b/build/database/std/install/sys_role_menu.sql index 542dc973..eac80852 100644 --- a/build/database/std/install/sys_role_menu.sql +++ b/build/database/std/install/sys_role_menu.sql @@ -14,6 +14,7 @@ CREATE TABLE `sys_role_menu` ( INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 4); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 5); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 6); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 60); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 61); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 63); @@ -23,16 +24,13 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 66); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 100); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 101); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 102); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 103); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 104); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 105); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 108); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 109); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 111); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 112); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 115); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 116); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 117); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 500); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 501); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1000); @@ -47,10 +45,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1008); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1009); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1010); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1011); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1012); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1013); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1014); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1015); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1016); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1017); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1018); @@ -62,19 +56,15 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1023); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1024); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1030); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1032); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1034); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1039); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1041); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1042); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1044); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1045); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1048); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1049); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1050); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1051); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1052); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1053); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1054); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1055); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1056); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 1057); @@ -87,42 +77,36 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2002); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2003); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2004); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2005); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2006); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2007); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2008); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2009); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2010); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2011); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2083); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2084); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2086); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2087); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2088); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2089); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2091); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2092); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2094); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2096); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2097); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2099); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2100); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2101); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2102); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2103); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2104); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2105); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2106); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2107); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2108); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2109); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2112); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2113); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2114); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2115); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2116); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2117); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2118); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2121); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2122); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2123); +INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2125); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2126); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2128); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2129); @@ -143,7 +127,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2147); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2148); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2149); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2150); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2151); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2152); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2153); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2154); @@ -151,7 +134,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2155); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2156); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2157); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2158); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2159); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2160); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2162); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2163); @@ -161,54 +143,50 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2166); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2167); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2168); INSERT IGNORE INTO `sys_role_menu` VALUES (2, 2169); -INSERT IGNORE INTO `sys_role_menu` VALUES (2, 20000); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 4); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 5); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 6); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 60); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 61); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 63); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 64); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 65); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 66); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 108); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 112); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 500); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 501); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1030); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1032); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1034); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1039); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 1042); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2000); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2001); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2002); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2003); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2004); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2005); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2006); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2007); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2008); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2009); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2010); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2011); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2083); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2084); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2085); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2086); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2087); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2088); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2089); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2091); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2092); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2094); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2096); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2097); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2099); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2102); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2104); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2106); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2107); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2108); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2109); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2112); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2114); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2115); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2116); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2117); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2118); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2122); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2123); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2125); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2126); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2128); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2129); @@ -218,6 +196,7 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2132); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2133); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2137); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2138); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2139); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2140); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2141); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2143); @@ -225,66 +204,45 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2146); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2147); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2148); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2149); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2151); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2152); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2153); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2154); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2155); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2156); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2157); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2158); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2160); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2162); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2163); +INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2164); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2165); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2166); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2167); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2168); INSERT IGNORE INTO `sys_role_menu` VALUES (3, 2169); -INSERT IGNORE INTO `sys_role_menu` VALUES (3, 20000); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 4); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 112); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 115); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 500); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 501); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1039); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1041); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1042); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1044); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 1048); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2087); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2088); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2089); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2091); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2092); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2094); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2097); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2112); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2113); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2115); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2116); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2123); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2099); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2102); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2104); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2106); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2126); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2128); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2129); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2130); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2131); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2132); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2133); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2138); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2140); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2141); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2139); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2147); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2148); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2149); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2157); -INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2165); +INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2160); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2166); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2167); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2168); INSERT IGNORE INTO `sys_role_menu` VALUES (4, 2169); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 1); -INSERT IGNORE INTO `sys_role_menu` VALUES (5, 4); -INSERT IGNORE INTO `sys_role_menu` VALUES (5, 112); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2087); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2115); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2126); @@ -292,7 +250,6 @@ INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2128); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2130); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2131); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2132); -INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2165); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2166); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2167); INSERT IGNORE INTO `sys_role_menu` VALUES (5, 2168); diff --git a/build/database/std/install/sys_user.sql b/build/database/std/install/sys_user.sql index c8db9d4f..9c7288b3 100644 --- a/build/database/std/install/sys_user.sql +++ b/build/database/std/install/sys_user.sql @@ -32,9 +32,9 @@ CREATE TABLE `sys_user` ( -- -- Dumping data for table `sys_user` -- -INSERT INTO `sys_user` VALUES (1, 100, 'supervisor', 'supervisor', '', '', '0', '', '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); -INSERT INTO `sys_user` VALUES (2, 100, 'admin', 'admin', '', '', '0', '', '$2a$10$QgIcp6yuOEGrEU0TNU12K.uQRLbcufesEU7hiRYlRSSdUO7OAkoTq', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); -INSERT INTO `sys_user` VALUES (3, 100, 'manager', 'manager', '', '', '0', '', '$2a$10$RND3fUw9Ai.WcggYSI57tu.u3OIlktdPxFzlWkmiHC1paV038t0I2', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); -INSERT INTO `sys_user` VALUES (4, 100, 'monitor', 'monitor', '', '', '0', '', '$2a$10$t3zpKQ0olECotFyI1yO43.tCoS0EXoSRBDcqwl09xvrsmn14qFHHy', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); +INSERT INTO `sys_user` VALUES (1, 100, 'system', 'system', '', '', '0', '', '$2a$10$qnOkylvr5x9mfk8JhQWwjOFAzBd5N6lpdI523P7x82BeEaVi3cusC', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); +INSERT INTO `sys_user` VALUES (2, 100, 'manager', 'manager', '', '', '0', '', '$2a$10$q4VdKB/8VBTf5nuqUrAe7eUiiTdKOFqJri0fm4mFKXqLucuyx0s3m', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); +INSERT INTO `sys_user` VALUES (3, 100, 'operator', 'operator', '', '', '0', '', '$2a$10$KjsE7juzmtx1bIDElu9dFe1T9zKcF1YfGIu2PCcI3Q0CfN.LlAmRW', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); +INSERT INTO `sys_user` VALUES (4, 100, 'monitor', 'monitor', '', '', '0', '', '$2a$10$BLRV6x5FBBJmpRjHgkeGfOx9VLFUlRdmYlRDQSTeHKYevB2R6mUPm', 'System', '#', '1', '0', 0, 0, '127.0.0.1', 0, 'system', 0, '', 0, ''); -- Dump completed on 2025-02-14 15:26:56 diff --git a/build/default/omc.yaml b/build/default/omc.yaml index a09b76ac..cff33623 100644 --- a/build/default/omc.yaml +++ b/build/default/omc.yaml @@ -1,7 +1,5 @@ # Service Type Single Core Network (oc) / Multi Core Network (mc) / Tenant Core Network (tc) serverType: "oc" -# operation mode system/docker -# serverMode: "system" # login authentication, default true # serverLoginAuth: true # interface encryption, default false diff --git a/local/omc.yaml b/local/omc.yaml index 27a08dec..4cf87a57 100644 --- a/local/omc.yaml +++ b/local/omc.yaml @@ -1,7 +1,5 @@ # Service Type Single Core Network (oc) / Multi Core Network (mc) / Tenant Core Network (tc) serverType: "oc" -# operation mode system/docker -# serverMode: "system" # login authentication, default true # serverLoginAuth: true # interface encryption, default false diff --git a/src/app.go b/src/app.go index d565d2c2..0bae1c52 100644 --- a/src/app.go +++ b/src/app.go @@ -11,11 +11,12 @@ import ( "be.ems/src/modules/auth" "be.ems/src/modules/chart" "be.ems/src/modules/common" - "be.ems/src/modules/core" "be.ems/src/modules/crontask" "be.ems/src/modules/monitor" ne "be.ems/src/modules/ne" + neCore "be.ems/src/modules/ne_core" neData "be.ems/src/modules/ne_data" + neDataNf "be.ems/src/modules/ne_data_nf" "be.ems/src/modules/notification" "be.ems/src/modules/oam" "be.ems/src/modules/system" @@ -91,11 +92,13 @@ func ModulesRoute(app *gin.Engine) { common.Setup(app) // 核心网功能模块 - core.Setup(app) + neCore.Setup(app) // 网元功能模块 ne.Setup(app) - // 网元数据模块 + // 网元相关数据模块 neData.Setup(app) + // 网元特有数据模块 + neDataNf.Setup(app) // 通知模块 notification.Setup(app) diff --git a/src/config/config.default.yaml b/src/config/config.default.yaml index 81d3248a..47c3e90e 100644 --- a/src/config/config.default.yaml +++ b/src/config/config.default.yaml @@ -1,7 +1,5 @@ # 服务类型 单核心网oc 多核心网mc 租户核心网tc serverType: "oc" -# 运行模式 system/docker -serverMode: "system" # 登录认证，默认打开 serverLoginAuth: true # 接口加密，默认关闭 diff --git a/src/framework/middleware/authorize_user.go b/src/framework/middleware/authorize_user.go index 45a6d51c..65afab91 100644 --- a/src/framework/middleware/authorize_user.go +++ b/src/framework/middleware/authorize_user.go @@ -44,8 +44,8 @@ func AuthorizeUser(options map[string][]string) gin.HandlerFunc { loginUser, _ := reqctx.LoginUser(c) loginUser.UserId = 2 loginUser.User.UserId = 2 - loginUser.User.UserName = "admin" - loginUser.User.NickName = "admin" + loginUser.User.UserName = "manager" + loginUser.User.NickName = "manager" c.Set(constants.CTX_LOGIN_USER, loginUser) c.Next() return diff --git a/src/framework/utils/machine/launch.go b/src/framework/utils/machine/launch.go index f1edaa8c..8dffeedb 100644 --- a/src/framework/utils/machine/launch.go +++ b/src/framework/utils/machine/launch.go @@ -4,8 +4,10 @@ import ( "encoding/json" "fmt" "hash/fnv" + "net" "os" "runtime" + "strings" "time" "be.ems/src/framework/cmd" @@ -24,29 +26,32 @@ var LaunchInfo map[string]any // codeGenerate 生成机器的唯一标识符 func codeGenerate() string { - var machineID string + var machineID []string - // 获取主机名 - hostname, err := os.Hostname() - if err != nil { - panic(err) + // 获取所有网络接口信息 + interfaces, _ := net.Interfaces() + for _, iface := range interfaces { + // 检查接口是否有 MAC 地址 + if iface.HardwareAddr != nil { + machineID = append(machineID, iface.HardwareAddr.String()) + break + } } - machineID += hostname // 获取 CPU 信息 numCPU := runtime.NumCPU() - machineID += fmt.Sprintf("%d", numCPU) + machineID = append(machineID, fmt.Sprintf("%d", numCPU)) // 获取操作系统信息 osInfo := runtime.GOOS - machineID += osInfo + machineID = append(machineID, osInfo) // 使用哈希函数生成机器码 h := fnv.New32a() - h.Write([]byte(machineID)) + h.Write([]byte(strings.Join(machineID, "&"))) machineCode := h.Sum32() - return fmt.Sprintf("%x", machineCode) + return strings.ToUpper(fmt.Sprintf("%x", machineCode)) } // 网管本地路径 diff --git a/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go b/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go index 7e0eeadd..1bfd3f1e 100644 --- a/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go +++ b/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go @@ -18,6 +18,7 @@ import ( neModel "be.ems/src/modules/ne/model" neService "be.ems/src/modules/ne/service" neDataService "be.ems/src/modules/ne_data/service" + neDataNfService "be.ems/src/modules/ne_data_nf/service" systemService "be.ems/src/modules/system/service" ) @@ -26,7 +27,7 @@ var NewProcessor = &BackupExportCDRProcessor{ backupService: neDataService.NewBackup, sysDictService: systemService.NewSysDictData, neInfoService: neService.NewNeInfo, - cdrEventService: neDataService.NewCDREvent, + cdrEventService: neDataNfService.NewCDREvent, } // BackupExportCDR 队列任务处理 @@ -35,7 +36,7 @@ type BackupExportCDRProcessor struct { backupService *neDataService.Backup // 备份相关服务 sysDictService *systemService.SysDictData // 字典类型数据服务 neInfoService *neService.NeInfo // 网元信息服务 - cdrEventService *neDataService.CDREvent // CDR会话事件服务 + cdrEventService *neDataNfService.CDREvent // CDR会话事件服务 } func (s *BackupExportCDRProcessor) Execute(data any) (any, error) { diff --git a/src/modules/crontask/processor/backup_export_table/backup_export_table.go b/src/modules/crontask/processor/backup_export_table/backup_export_table.go index 34972f6e..0e0a4276 100644 --- a/src/modules/crontask/processor/backup_export_table/backup_export_table.go +++ b/src/modules/crontask/processor/backup_export_table/backup_export_table.go @@ -16,21 +16,22 @@ import ( "be.ems/src/framework/utils/file" "be.ems/src/framework/utils/parse" neDataService "be.ems/src/modules/ne_data/service" + neDataNfService "be.ems/src/modules/ne_data_nf/service" systemModel "be.ems/src/modules/system/model" systemService "be.ems/src/modules/system/service" ) var NewProcessor = &BackupExportTableProcessor{ backupService: neDataService.NewBackup, - cdrEventService: neDataService.NewCDREvent, + cdrEventService: neDataNfService.NewCDREvent, count: 0, } // BackupExportTable 备份导出数据表 type BackupExportTableProcessor struct { - backupService *neDataService.Backup // 备份相关服务 - cdrEventService *neDataService.CDREvent // CDR会话事件服务 - count int // 执行次数 + backupService *neDataService.Backup // 备份相关服务 + cdrEventService *neDataNfService.CDREvent // CDR会话事件服务 + count int // 执行次数 } func (s *BackupExportTableProcessor) Execute(data any) (any, error) { diff --git a/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go b/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go index 8c65f36a..1f44ae63 100644 --- a/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go +++ b/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go @@ -12,29 +12,30 @@ import ( "be.ems/src/framework/utils/file" neModel "be.ems/src/modules/ne/model" neService "be.ems/src/modules/ne/service" - neDataModel "be.ems/src/modules/ne_data/model" neDataService "be.ems/src/modules/ne_data/service" + neDataNfModel "be.ems/src/modules/ne_data_nf/model" + neDataNfService "be.ems/src/modules/ne_data_nf/service" ) var NewProcessor = &BackupExportUDMProcessor{ count: 0, neInfoService: neService.NewNeInfo, backupService: neDataService.NewBackup, - udmAuthService: neDataService.NewUDMAuthUser, - udmSubService: neDataService.NewUDMSubUser, - udmVOIPService: neDataService.NewUDMVOIPUser, - udmVolteIMSService: neDataService.NewUDMVolteIMSUser, + udmAuthService: neDataNfService.NewUDMAuthUser, + udmSubService: neDataNfService.NewUDMSubUser, + udmVOIPService: neDataNfService.NewUDMVOIPUser, + udmVolteIMSService: neDataNfService.NewUDMVolteIMSUser, } // BackupExportUDM 队列任务处理 type BackupExportUDMProcessor struct { - count int // 执行次数 - neInfoService *neService.NeInfo // 网元信息服务 - backupService *neDataService.Backup // 备份相关服务 - udmAuthService *neDataService.UDMAuthUser // UDM鉴权信息服务 - udmSubService *neDataService.UDMSubUser // UDM签约信息服务 - udmVOIPService *neDataService.UDMVOIPUser // UDMVOIP信息服务 - udmVolteIMSService *neDataService.UDMVolteIMSUser // UDMVolteIMS信息服务 + count int // 执行次数 + neInfoService *neService.NeInfo // 网元信息服务 + backupService *neDataService.Backup // 备份相关服务 + udmAuthService *neDataNfService.UDMAuthUser // UDM鉴权信息服务 + udmSubService *neDataNfService.UDMSubUser // UDM签约信息服务 + udmVOIPService *neDataNfService.UDMVOIPUser // UDMVOIP信息服务 + udmVolteIMSService *neDataNfService.UDMVolteIMSUser // UDMVolteIMS信息服务 } func (s *BackupExportUDMProcessor) Execute(data any) (any, error) { @@ -80,7 +81,7 @@ func (s *BackupExportUDMProcessor) Execute(data any) (any, error) { // exportAuth 导出鉴权用户数据 func (s BackupExportUDMProcessor) exportAuth(coreUid, neUid, fileType string) string { - rows := s.udmAuthService.Find(neDataModel.UDMAuthUser{CoreUID: coreUid, NeUID: neUid}) + rows := s.udmAuthService.Find(neDataNfModel.UDMAuthUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } @@ -134,7 +135,7 @@ func (s BackupExportUDMProcessor) exportAuth(coreUid, neUid, fileType string) st // exportSub 导出签约用户数据 func (s BackupExportUDMProcessor) exportSub(coreUid, neUid, fileType string) string { - rows := s.udmSubService.Find(neDataModel.UDMSubUser{CoreUID: coreUid, NeUID: neUid}) + rows := s.udmSubService.Find(neDataNfModel.UDMSubUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } @@ -182,7 +183,7 @@ func (s BackupExportUDMProcessor) exportSub(coreUid, neUid, fileType string) str // exportVOIP 导出VOIP用户数据 func (s BackupExportUDMProcessor) exportVOIP(coreUid, neUid, fileType string) string { - rows := s.udmVOIPService.Find(neDataModel.UDMVOIPUser{CoreUID: coreUid, NeUID: neUid}) + rows := s.udmVOIPService.Find(neDataNfModel.UDMVOIPUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } @@ -228,7 +229,7 @@ func (s BackupExportUDMProcessor) exportVOIP(coreUid, neUid, fileType string) st // exportVolte 导出Volte用户数据 func (s BackupExportUDMProcessor) exportVolte(coreUid, neUid, fileType string) string { - rows := s.udmVolteIMSService.Find(neDataModel.UDMVolteIMSUser{CoreUID: coreUid, NeUID: neUid}) + rows := s.udmVolteIMSService.Find(neDataNfModel.UDMVolteIMSUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } diff --git a/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go b/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go index d739d163..175040a6 100644 --- a/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go +++ b/src/modules/crontask/processor/ne_data_udm/ne_data_udm.go @@ -7,26 +7,26 @@ import ( "be.ems/src/framework/logger" neModel "be.ems/src/modules/ne/model" neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + neDataNfService "be.ems/src/modules/ne_data_nf/service" ) var NewProcessor = &NeDataUDM{ count: 0, neInfoService: neService.NewNeInfo, - udmAuthService: neDataService.NewUDMAuthUser, - udmSubService: neDataService.NewUDMSubUser, - udmVOIPService: neDataService.NewUDMVOIPUser, - udmVolteIMSService: neDataService.NewUDMVolteIMSUser, + udmAuthService: neDataNfService.NewUDMAuthUser, + udmSubService: neDataNfService.NewUDMSubUser, + udmVOIPService: neDataNfService.NewUDMVOIPUser, + udmVolteIMSService: neDataNfService.NewUDMVolteIMSUser, } // NeDataUDM 网元配置文件定期备份 type NeDataUDM struct { - count int // 执行次数 - neInfoService *neService.NeInfo // 网元信息服务 - udmAuthService *neDataService.UDMAuthUser // UDM鉴权信息服务 - udmSubService *neDataService.UDMSubUser // UDM签约信息服务 - udmVOIPService *neDataService.UDMVOIPUser // UDMVOIP信息服务 - udmVolteIMSService *neDataService.UDMVolteIMSUser // UDMVolteIMS信息服务 + count int // 执行次数 + neInfoService *neService.NeInfo // 网元信息服务 + udmAuthService *neDataNfService.UDMAuthUser // UDM鉴权信息服务 + udmSubService *neDataNfService.UDMSubUser // UDM签约信息服务 + udmVOIPService *neDataNfService.UDMVOIPUser // UDMVOIP信息服务 + udmVolteIMSService *neDataNfService.UDMVolteIMSUser // UDMVolteIMS信息服务 } func (s *NeDataUDM) Execute(data any) (any, error) { diff --git a/src/modules/ne/controller/ne_config.go b/src/modules/ne/controller/ne_config.go index 47d18bb9..0f87a120 100644 --- a/src/modules/ne/controller/ne_config.go +++ b/src/modules/ne/controller/ne_config.go @@ -8,9 +8,9 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" "be.ems/src/modules/ne/model" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" traceService "be.ems/src/modules/trace/service" "github.com/gin-gonic/gin" diff --git a/src/modules/ne/controller/ne_info.go b/src/modules/ne/controller/ne_info.go index c8203eee..58c75a71 100644 --- a/src/modules/ne/controller/ne_info.go +++ b/src/modules/ne/controller/ne_info.go @@ -8,9 +8,9 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" "be.ems/src/modules/ne/model" "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" "github.com/gin-gonic/gin" ) diff --git a/src/modules/ne/controller/ne_license.go b/src/modules/ne/controller/ne_license.go index 582f5dd5..51ef448a 100644 --- a/src/modules/ne/controller/ne_license.go +++ b/src/modules/ne/controller/ne_license.go @@ -10,9 +10,9 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" "be.ems/src/modules/ne/model" "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" ) // 实例化控制层 NeLicenseController 结构体 diff --git a/src/modules/ne/controller/ne_version.go b/src/modules/ne/controller/ne_version.go index 26cbdadd..940f1915 100644 --- a/src/modules/ne/controller/ne_version.go +++ b/src/modules/ne/controller/ne_version.go @@ -6,6 +6,7 @@ import ( "be.ems/src/framework/i18n" "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" + "be.ems/src/framework/utils/parse" ne "be.ems/src/modules/ne/service" "github.com/gin-gonic/gin" @@ -33,7 +34,11 @@ func (s *NeVersionController) List(c *gin.Context) { c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid is empty")) return } - rows, total := s.neVersionService.FindByPage(query, true) + checkVersion := true + if v, ok := query["checkVersion"]; ok { + checkVersion = parse.Boolean(v) + } + rows, total := s.neVersionService.FindByPage(query, checkVersion) c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows})) } diff --git a/src/modules/ne/repository/ne_version.go b/src/modules/ne/repository/ne_version.go index f9dd4903..682355fb 100644 --- a/src/modules/ne/repository/ne_version.go +++ b/src/modules/ne/repository/ne_version.go @@ -66,6 +66,9 @@ func (r NeVersion) Select(param model.NeVersion) []model.NeVersion { if param.NeUID != "" { tx = tx.Where("ne_uid = ?", param.NeUID) } + if param.NeType != "" { + tx = tx.Where("ne_type = ?", param.NeType) + } if param.Version != "" { tx = tx.Where("version like ?", fmt.Sprintf("%s%%", param.Version)) } diff --git a/src/modules/ne/service/ne_info.go b/src/modules/ne/service/ne_info.go index b0b11ec8..b65a8081 100644 --- a/src/modules/ne/service/ne_info.go +++ b/src/modules/ne/service/ne_info.go @@ -16,9 +16,9 @@ import ( "be.ems/src/framework/telnet" "be.ems/src/framework/utils/generate" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" "be.ems/src/modules/ne/model" "be.ems/src/modules/ne/repository" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" ) // 实例化服务层 NeInfo 结构体 diff --git a/src/modules/ne/service/ne_version.go b/src/modules/ne/service/ne_version.go index 33676a61..1e5aa515 100644 --- a/src/modules/ne/service/ne_version.go +++ b/src/modules/ne/service/ne_version.go @@ -9,9 +9,9 @@ import ( "be.ems/src/framework/ssh" "be.ems/src/framework/utils/file" - neFetchlink "be.ems/src/modules/ne/fetch_link" "be.ems/src/modules/ne/model" "be.ems/src/modules/ne/repository" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" ) // 实例化服务层 NeVersion 结构体 diff --git a/src/modules/core/controller/core_info.go b/src/modules/ne_core/controller/core_info.go similarity index 98% rename from src/modules/core/controller/core_info.go rename to src/modules/ne_core/controller/core_info.go index 8f456cc1..6bd58c37 100644 --- a/src/modules/core/controller/core_info.go +++ b/src/modules/ne_core/controller/core_info.go @@ -7,8 +7,8 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - "be.ems/src/modules/core/model" - "be.ems/src/modules/core/service" + "be.ems/src/modules/ne_core/model" + "be.ems/src/modules/ne_core/service" "github.com/gin-gonic/gin" ) diff --git a/src/modules/core/core.go b/src/modules/ne_core/core.go similarity index 92% rename from src/modules/core/core.go rename to src/modules/ne_core/core.go index 74d28c33..55cd586d 100644 --- a/src/modules/core/core.go +++ b/src/modules/ne_core/core.go @@ -1,17 +1,17 @@ -package core +package ne_core import ( "be.ems/src/framework/logger" "be.ems/src/framework/middleware" "be.ems/src/framework/middleware/collectlogs" - "be.ems/src/modules/core/controller" + "be.ems/src/modules/ne_core/controller" "github.com/gin-gonic/gin" ) // 模块路由注册 func Setup(router *gin.Engine) { - logger.Infof("开始加载 ====> core 模块路由") + logger.Infof("开始加载 ====> ne_core 模块路由") // 核心网信息 coreInfoGroup := router.Group("/core/info") diff --git a/src/modules/core/model/core_info.go b/src/modules/ne_core/model/core_info.go similarity index 100% rename from src/modules/core/model/core_info.go rename to src/modules/ne_core/model/core_info.go diff --git a/src/modules/core/repository/core_info.go b/src/modules/ne_core/repository/core_info.go similarity index 99% rename from src/modules/core/repository/core_info.go rename to src/modules/ne_core/repository/core_info.go index 3af7a240..a9997817 100644 --- a/src/modules/core/repository/core_info.go +++ b/src/modules/ne_core/repository/core_info.go @@ -6,7 +6,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/core/model" + "be.ems/src/modules/ne_core/model" ) // 实例化数据层 CoreInfo 结构体 diff --git a/src/modules/core/service/core_info.go b/src/modules/ne_core/service/core_info.go similarity index 96% rename from src/modules/core/service/core_info.go rename to src/modules/ne_core/service/core_info.go index aa3372c5..784dcdeb 100644 --- a/src/modules/core/service/core_info.go +++ b/src/modules/ne_core/service/core_info.go @@ -6,8 +6,8 @@ import ( "be.ems/src/framework/utils/generate" "be.ems/src/framework/utils/machine" - "be.ems/src/modules/core/model" - "be.ems/src/modules/core/repository" + "be.ems/src/modules/ne_core/model" + "be.ems/src/modules/ne_core/repository" ) // 实例化服务层 CoreInfo 结构体 diff --git a/src/modules/ne_data/controller/all_alarm.go b/src/modules/ne_data/controller/alarm.go similarity index 99% rename from src/modules/ne_data/controller/all_alarm.go rename to src/modules/ne_data/controller/alarm.go index 3c2fae2c..77651c88 100644 --- a/src/modules/ne_data/controller/all_alarm.go +++ b/src/modules/ne_data/controller/alarm.go @@ -53,7 +53,7 @@ type AlarmController struct { // @Security TokenAuth // @Summary Alarm List // @Description Alarm List -// @Router /neData/alarm/list [get] +// @Router /ne/data/alarm/list [get] func (s AlarmController) List(c *gin.Context) { var query model.AlarmQuery if err := c.ShouldBindQuery(&query); err != nil { @@ -229,7 +229,7 @@ func (s AlarmController) CountTop(c *gin.Context) { // @Security TokenAuth // @Summary Alarm List Export // @Description Alarm List Export -// @Router /neData/alarm/export [get] +// @Router /ne/data/alarm/export [get] func (s AlarmController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 查询结果，根据查询条件结果，单页最大值限制 diff --git a/src/modules/ne_data/controller/all_alarm_forward.go b/src/modules/ne_data/controller/alarm_forward.go similarity index 96% rename from src/modules/ne_data/controller/all_alarm_forward.go rename to src/modules/ne_data/controller/alarm_forward.go index da78dc62..5ca6508a 100644 --- a/src/modules/ne_data/controller/all_alarm_forward.go +++ b/src/modules/ne_data/controller/alarm_forward.go @@ -38,7 +38,7 @@ type AlarmForwardController struct { // @Security TokenAuth // @Summary Alarm Forward Log List // @Description Alarm Forward Log List -// @Router /neData/alarm/forward/log/list [get] +// @Router /ne/data/data/alarm/forward/log/list [get] func (s AlarmForwardController) List(c *gin.Context) { var query model.AlarmForwardLogQuery if err := c.ShouldBindQuery(&query); err != nil { diff --git a/src/modules/ne_data/controller/all_alarm_log.go b/src/modules/ne_data/controller/alarm_log.go similarity index 97% rename from src/modules/ne_data/controller/all_alarm_log.go rename to src/modules/ne_data/controller/alarm_log.go index f66185b3..056d006d 100644 --- a/src/modules/ne_data/controller/all_alarm_log.go +++ b/src/modules/ne_data/controller/alarm_log.go @@ -44,7 +44,7 @@ type AlarmLogController struct { // @Security TokenAuth // @Summary AlarmLog List // @Description AlarmLog List -// @Router /neData/alarm/log/list [get] +// @Router /ne/data/alarm/log/list [get] func (s AlarmLogController) List(c *gin.Context) { var query model.AlarmLogQuery if err := c.ShouldBindQuery(&query); err != nil { @@ -77,7 +77,7 @@ func (s AlarmLogController) List(c *gin.Context) { // @Security TokenAuth // @Summary Alarm Event Log List // @Description Alarm Event Log List -// @Router /neData/alarm/log/event [get] +// @Router /ne/data/alarm/log/event [get] func (s AlarmLogController) Event(c *gin.Context) { var query model.AlarmEventQuery if err := c.ShouldBindQuery(&query); err != nil { diff --git a/src/modules/ne_data/controller/all_backup.go b/src/modules/ne_data/controller/backup.go similarity index 100% rename from src/modules/ne_data/controller/all_backup.go rename to src/modules/ne_data/controller/backup.go diff --git a/src/modules/ne_data/controller/all_kpi.go b/src/modules/ne_data/controller/kpi.go similarity index 98% rename from src/modules/ne_data/controller/all_kpi.go rename to src/modules/ne_data/controller/kpi.go index 6241239e..dedb5782 100644 --- a/src/modules/ne_data/controller/all_kpi.go +++ b/src/modules/ne_data/controller/kpi.go @@ -44,7 +44,7 @@ type KPIController struct { // @Security TokenAuth // @Summary Access to statistical data // @Description Access to statistical data -// @Router /neData/kpi/data [get] +// @Router /ne/data/kpi/data [get] func (s KPIController) KPIData(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys model.KPIQuery @@ -78,7 +78,7 @@ func (s KPIController) KPIData(c *gin.Context) { // @Security TokenAuth // @Summary Get Statistical Headings // @Description Get Statistical Headings -// @Router /neData/kpi/title [get] +// @Router /ne/data/kpi/title [get] func (s KPIController) KPITitle(c *gin.Context) { neType := c.Query("neType") if neType == "" { diff --git a/src/modules/ne_data/controller/all_kpi_c.go b/src/modules/ne_data/controller/kpi_c.go similarity index 99% rename from src/modules/ne_data/controller/all_kpi_c.go rename to src/modules/ne_data/controller/kpi_c.go index b640dafa..702c0886 100644 --- a/src/modules/ne_data/controller/all_kpi_c.go +++ b/src/modules/ne_data/controller/kpi_c.go @@ -46,7 +46,7 @@ type KPICController struct { // @Security TokenAuth // @Summary Access to statistical data // @Description Access to statistical data -// @Router /neData/kpic/data [get] +// @Router /ne/data/kpic/data [get] func (s KPICController) KPIData(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys model.KPICQuery diff --git a/src/modules/ne_data/controller/all_nb_state.go b/src/modules/ne_data/controller/nb_state.go similarity index 100% rename from src/modules/ne_data/controller/all_nb_state.go rename to src/modules/ne_data/controller/nb_state.go diff --git a/src/modules/ne_data/controller/all_ne_state.go b/src/modules/ne_data/controller/ne_state.go similarity index 100% rename from src/modules/ne_data/controller/all_ne_state.go rename to src/modules/ne_data/controller/ne_state.go diff --git a/src/modules/ne_data/ne_data.go b/src/modules/ne_data/ne_data.go index 43585a5b..b2ffbbdc 100644 --- a/src/modules/ne_data/ne_data.go +++ b/src/modules/ne_data/ne_data.go @@ -4,7 +4,6 @@ import ( "be.ems/src/framework/logger" "be.ems/src/framework/middleware" "be.ems/src/framework/middleware/collectlogs" - "be.ems/src/framework/middleware/repeat" "be.ems/src/modules/ne_data/controller" "be.ems/src/modules/ne_data/service" @@ -18,7 +17,7 @@ func Setup(router *gin.Engine) { // 启动时需要的初始参数 InitLoad() - neDataGroup := router.Group("/neData") + neDataGroup := router.Group("/ne/data") // 性能统计信息 kpiGroup := neDataGroup.Group("/kpi") @@ -178,425 +177,6 @@ func Setup(router *gin.Engine) { ) } - // 网元IMS - imsGroup := neDataGroup.Group("/ims") - { - imsGroup.GET("/cdr/list", - middleware.AuthorizeUser(nil), - controller.NewIMS.CDRList, - ) - imsGroup.DELETE("/cdr/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.imsCDR", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewIMS.CDRRemove, - ) - imsGroup.GET("/cdr/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.imsCDR", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewIMS.CDRExport, - ) - imsGroup.GET("/session/num", - middleware.AuthorizeUser(nil), - controller.NewIMS.UeSessionNum, - ) - imsGroup.GET("/session/list", - middleware.AuthorizeUser(nil), - controller.NewIMS.UeSessionList, - ) - imsGroup.GET("/kpi/busy-hour", - middleware.AuthorizeUser(nil), - controller.NewIMS.KPIBusyHour, - ) - } - - // 网元SMSC - smscGroup := neDataGroup.Group("/smsc") - { - smscGroup.GET("/cdr/list", - middleware.AuthorizeUser(nil), - controller.NewSMSC.CDRList, - ) - smscGroup.DELETE("/cdr/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smscCDR", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewSMSC.CDRRemove, - ) - smscGroup.GET("/cdr/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smscCDR", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewSMSC.CDRExport, - ) - } - - // 网元SMF - smfGroup := neDataGroup.Group("/smf") - { - smfGroup.GET("/cdr/list", - middleware.AuthorizeUser(nil), - controller.NewSMF.CDRList, - ) - smfGroup.DELETE("/cdr/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smfCDR", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewSMF.CDRRemove, - ) - smfGroup.GET("/cdr/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smfCDR", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewSMF.CDRExport, - ) - smfGroup.GET("/sub/num", - middleware.AuthorizeUser(nil), - controller.NewSMF.SubUserNum, - ) - smfGroup.GET("/sub/list", - middleware.AuthorizeUser(nil), - controller.NewSMF.SubUserList, - ) - } - - // 网元AMF - amfGroup := neDataGroup.Group("/amf") - { - amfGroup.GET("/ue/list", - middleware.AuthorizeUser(nil), - controller.NewAMF.UEList, - ) - amfGroup.DELETE("/ue/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.amfUE", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewAMF.UERemove, - ) - amfGroup.GET("/ue/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.amfUE", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewAMF.UEExport, - ) - amfGroup.GET("/nb/list", - middleware.AuthorizeUser(nil), - controller.NewAMF.NbInfoList, - ) - amfGroup.GET("/nb/addrs", - middleware.AuthorizeUser(nil), - controller.NewAMF.NbStateList, - ) - } - - // 网元UPF - upfGroup := neDataGroup.Group("/upf") - { - upfGroup.GET("/kpi/flow-total", - middleware.AuthorizeUser(nil), - controller.NewUPF.KPIFlowTotal, - ) - } - - // 网元N3IWF - n3iwfGroup := neDataGroup.Group("/n3iwf") - { - n3iwfGroup.GET("/sub/list", - middleware.AuthorizeUser(nil), - controller.NewN3IWF.SubUserList, - ) - } - - // 网元N3IWF - nssf := controller.NewNSSF - nssfGroup := neDataGroup.Group("/nssf") - { - nssfGroup.GET("/sub/list", - middleware.AuthorizeUser(nil), - nssf.SubUserList, - ) - nssfGroup.GET("/amf/list", - middleware.AuthorizeUser(nil), - nssf.AvailableList, - ) - } - - // 网元UDM 鉴权用户信息 - udmAuthGroup := neDataGroup.Group("/udm/auth") - { - udmAuthGroup.PUT("/reset", - repeat.RepeatSubmit(5), - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_CLEAN)), - controller.NewUDMAuth.ResetData, - ) - udmAuthGroup.GET("/list", - middleware.AuthorizeUser(nil), - controller.NewUDMAuth.List, - ) - udmAuthGroup.GET("", - middleware.AuthorizeUser(nil), - controller.NewUDMAuth.Info, - ) - udmAuthGroup.POST("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMAuth.Add, - ) - udmAuthGroup.PUT("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_UPDATE)), - controller.NewUDMAuth.Edit, - ) - udmAuthGroup.DELETE("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMAuth.Remove, - ) - udmAuthGroup.GET("/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewUDMAuth.Export, - ) - udmAuthGroup.POST("/import", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_IMPORT)), - controller.NewUDMAuth.Import, - ) - } - - // 网元UDM 签约用户信息 - udmSubGroup := neDataGroup.Group("/udm/sub") - { - udmSubGroup.PUT("/reset", - repeat.RepeatSubmit(5), - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_CLEAN)), - controller.NewUDMSub.ResetData, - ) - udmSubGroup.GET("/list", - middleware.AuthorizeUser(nil), - controller.NewUDMSub.List, - ) - udmSubGroup.GET("", - middleware.AuthorizeUser(nil), - controller.NewUDMSub.Info, - ) - udmSubGroup.POST("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMSub.Add, - ) - udmSubGroup.PUT("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_UPDATE)), - controller.NewUDMSub.Edit, - ) - udmSubGroup.DELETE("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMSub.Remove, - ) - udmSubGroup.GET("/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewUDMSub.Export, - ) - udmSubGroup.POST("/import", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_IMPORT)), - controller.NewUDMSub.Import, - ) - } - - // 网元UDM VOIP用户信息 - udmVOIPGroup := neDataGroup.Group("/udm/voip") - { - udmVOIPGroup.PUT("/reset", - repeat.RepeatSubmit(5), - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_CLEAN)), - controller.NewUDMVOIP.ResetData, - ) - udmVOIPGroup.GET("/list", - middleware.AuthorizeUser(nil), - controller.NewUDMVOIP.List, - ) - udmVOIPGroup.GET("", - middleware.AuthorizeUser(nil), - controller.NewUDMVOIP.Info, - ) - udmVOIPGroup.POST("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMVOIP.Add, - ) - udmVOIPGroup.DELETE("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMVOIP.Remove, - ) - udmVOIPGroup.GET("/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewUDMVOIP.Export, - ) - udmVOIPGroup.POST("/import", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_IMPORT)), - controller.NewUDMVOIP.Import, - ) - } - - // 网元UDM VolteIMS用户信息 - udmVolteIMSGroup := neDataGroup.Group("/udm/volte-ims") - { - udmVolteIMSGroup.PUT("/reset", - repeat.RepeatSubmit(5), - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_CLEAN)), - controller.NewUDMVolteIMS.ResetData, - ) - udmVolteIMSGroup.GET("/list", - middleware.AuthorizeUser(nil), - controller.NewUDMVolteIMS.List, - ) - udmVolteIMSGroup.GET("", - middleware.AuthorizeUser(nil), - controller.NewUDMVolteIMS.Info, - ) - udmVolteIMSGroup.POST("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMVolteIMS.Add, - ) - udmVolteIMSGroup.DELETE("", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMVolteIMS.Remove, - ) - udmVolteIMSGroup.GET("/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewUDMVolteIMS.Export, - ) - udmVolteIMSGroup.POST("/import", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_IMPORT)), - controller.NewUDMVolteIMS.Import, - ) - } - - // 网元MME - mmeGroup := neDataGroup.Group("/mme") - { - mmeGroup.GET("/ue/list", - middleware.AuthorizeUser(nil), - controller.NewMME.UEList, - ) - mmeGroup.DELETE("/ue/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.mmeUE", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewMME.UERemove, - ) - mmeGroup.GET("/ue/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.mmeUE", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewMME.UEExport, - ) - mmeGroup.GET("/nb/list", - middleware.AuthorizeUser(nil), - controller.NewMME.NbInfoList, - ) - mmeGroup.GET("/nb/addrs", - middleware.AuthorizeUser(nil), - controller.NewMME.NbStateList, - ) - } - - // 网元SGWC - sgwcGroup := neDataGroup.Group("/sgwc") - { - sgwcGroup.GET("/cdr/list", - middleware.AuthorizeUser(nil), - controller.NewSGWC.CDRList, - ) - sgwcGroup.DELETE("/cdr/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sgwcCDR", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewSGWC.CDRRemove, - ) - sgwcGroup.POST("/cdr/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sgwcCDR", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewSGWC.CDRExport, - ) - } - - // 网元PCF - pcfGroup := neDataGroup.Group("/pcf") - { - pcfGroup.GET("/rule/list", - middleware.AuthorizeUser(nil), - controller.NewPCF.RuleInfoList, - ) - pcfGroup.POST("/rule", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_IMPORT)), - controller.NewPCF.RuleInfoAdd, - ) - pcfGroup.PUT("/rule", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_UPDATE)), - controller.NewPCF.RuleInfoEdit, - ) - pcfGroup.DELETE("/rule", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewPCF.RuleInfoRemove, - ) - pcfGroup.GET("/rule/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewPCF.RuleInfoExport, - ) - pcfGroup.PUT("/rule/import", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_IMPORT)), - controller.NewPCF.RuleInfoImport, - ) - } - - // 网元CBC - cbcGroup := neDataGroup.Group("/cbc") - { - cbcGroup.GET("/message/list", - middleware.AuthorizeUser(nil), - controller.NewCBC.List, - ) - cbcGroup.GET("/message/:id", - middleware.AuthorizeUser(nil), - controller.NewCBC.ListById, - ) - cbcGroup.POST("/message", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_IMPORT)), - controller.NewCBC.Insert, - ) - cbcGroup.PUT("/message/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_UPDATE)), - controller.NewCBC.Update, - ) - cbcGroup.PUT("/message/:id/:status", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_UPDATE)), - controller.NewCBC.UpdateStatus, - ) - cbcGroup.DELETE("/message/:id", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewCBC.Delete, - ) - cbcGroup.GET("/message/export", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_EXPORT)), - controller.NewCBC.Export, - ) - } } // InitLoad 初始参数 diff --git a/src/modules/ne_data/controller/amf.go b/src/modules/ne_data_nf/controller/amf.go similarity index 93% rename from src/modules/ne_data/controller/amf.go rename to src/modules/ne_data_nf/controller/amf.go index 31f7175b..088bdbf1 100644 --- a/src/modules/ne_data/controller/amf.go +++ b/src/modules/ne_data_nf/controller/amf.go @@ -8,9 +8,9 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" + service "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -18,15 +18,15 @@ import ( // 实例化控制层 AMFController 结构体 var NewAMF = &AMFController{ neInfoService: neService.NewNeInfo, - ueEventService: neDataService.NewUEEvent, + ueEventService: service.NewUEEvent, } // 网元AMF // // PATH /amf type AMFController struct { - neInfoService *neService.NeInfo // 网元信息服务 - ueEventService *neDataService.UEEvent // UE会话事件服务 + neInfoService *neService.NeInfo // 网元信息服务 + ueEventService *service.UEEvent // UE会话事件服务 } // UE会话列表 @@ -45,7 +45,7 @@ type AMFController struct { // @Security TokenAuth // @Summary UE Session List // @Description UE Session List -// @Router /neData/amf/ue/list [get] +// @Router /nf/amf/ue/list [get] func (s *AMFController) UEList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -83,7 +83,7 @@ func (s *AMFController) UEList(c *gin.Context) { // @Security TokenAuth // @Summary UE Session Deletion // @Description UE Session Deletion -// @Router /neData/amf/ue/{id} [delete] +// @Router /nf/amf/ue/{id} [delete] func (s *AMFController) UERemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) id := c.Param("id") @@ -121,7 +121,7 @@ func (s *AMFController) UERemove(c *gin.Context) { // @Security TokenAuth // @Summary UE Session List Export // @Description UE Session List Export -// @Router /neData/amf/ue/export [get] +// @Router /nf/amf/ue/export [get] func (s *AMFController) UEExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -175,7 +175,7 @@ func (s *AMFController) UEExport(c *gin.Context) { // @Security TokenAuth // @Summary Access Base Station Information List // @Description Access Base Station Information List -// @Router /neData/amf/nb/list [get] +// @Router /nf/amf/nb/list [get] func (s *AMFController) NbInfoList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -220,7 +220,7 @@ func (s *AMFController) NbInfoList(c *gin.Context) { // @Security TokenAuth // @Summary Access to the base station status information list // @Description Access to the base station status information list -// @Router /neData/amf/nb/addrs [get] +// @Router /nf/amf/nb/addrs [get] func (s *AMFController) NbStateList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { diff --git a/src/modules/ne_data/controller/cbc.go b/src/modules/ne_data_nf/controller/cbc.go similarity index 88% rename from src/modules/ne_data/controller/cbc.go rename to src/modules/ne_data_nf/controller/cbc.go index 34ec2312..104c419d 100644 --- a/src/modules/ne_data/controller/cbc.go +++ b/src/modules/ne_data_nf/controller/cbc.go @@ -10,8 +10,8 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - neDataService "be.ems/src/modules/ne_data/service" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -21,14 +21,14 @@ const ( // 实例化控制层 CBCController 结构体 var NewCBC = &CBCController{ - neInfoService: neService.NewNeInfo, - neCBCMessageService: neDataService.NewCBCMessage, + neInfoService: neService.NewNeInfo, + cbcMessageService: service.NewCBCMessage, } // 网元CBC type CBCController struct { - neInfoService *neService.NeInfo // 网元信息服务 - neCBCMessageService *neDataService.CBCMessage // CBC消息服务 + neInfoService *neService.NeInfo // 网元信息服务 + cbcMessageService *service.CBCMessage // CBC消息服务 } func (m *CBCController) List(c *gin.Context) { @@ -46,7 +46,7 @@ func (m *CBCController) List(c *gin.Context) { query.NeType = neType query.NeId = neId - data, total, err := neDataService.NewCBCMessage.SelectByPage(query) + data, total, err := m.cbcMessageService.SelectByPage(query) if err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return @@ -113,7 +113,7 @@ func (m *CBCController) Insert(c *gin.Context) { msg.MessageJson = json.RawMessage(jsonBytes) - if err := neDataService.NewCBCMessage.Insert(msg); err != nil { + if err := m.cbcMessageService.Insert(msg); err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return } @@ -152,7 +152,7 @@ func (m *CBCController) Update(c *gin.Context) { } messageJson := json.RawMessage(jsonBytes) - if err := neDataService.NewCBCMessage.Update(id, messageJson); err != nil { + if err := m.cbcMessageService.Update(id, messageJson); err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return } @@ -186,7 +186,7 @@ func (m *CBCController) UpdateStatus(c *gin.Context) { return } // 如果提供了 messageId，则更新特定消息的状态 - if err := neDataService.NewCBCMessage.UpdateStatus(id, status); err != nil { + if err := m.cbcMessageService.UpdateStatus(id, status); err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return } @@ -194,7 +194,7 @@ func (m *CBCController) UpdateStatus(c *gin.Context) { return } // 如果没有提供 messageId，则更新所有消息的状态 - if err := neDataService.NewCBCMessage.UpdateStatusByNeId(neId, status); err != nil { + if err := m.cbcMessageService.UpdateStatusByNeId(neId, status); err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return } @@ -218,7 +218,7 @@ func (m *CBCController) Delete(c *gin.Context) { return } - if err := neDataService.NewCBCMessage.Delete(id); err != nil { + if err := m.cbcMessageService.Delete(id); err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return } @@ -243,7 +243,7 @@ func (m *CBCController) ListById(c *gin.Context) { return } - data, err := neDataService.NewCBCMessage.SelectById(id) + data, err := m.cbcMessageService.SelectById(id) if err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return @@ -293,7 +293,7 @@ func (m *CBCController) Export(c *gin.Context) { query.PageSize = 10000 } // 查询数据 - rows, total, err := m.neCBCMessageService.SelectByPage(query) + rows, total, err := m.cbcMessageService.SelectByPage(query) if err != nil { c.JSON(500, resp.ErrMsg(err.Error())) return @@ -307,7 +307,7 @@ func (m *CBCController) Export(c *gin.Context) { // 导出文件名称 fileName := fmt.Sprintf("cbc_message_export_%d_%d.xlsx", len(rows), time.Now().UnixMilli()) // 导出数据表格 - saveFilePath, err := m.neCBCMessageService.ExportXlsx(rows, fileName, language) + saveFilePath, err := m.cbcMessageService.ExportXlsx(rows, fileName, language) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return diff --git a/src/modules/ne_data/controller/ims.go b/src/modules/ne_data_nf/controller/ims.go similarity index 95% rename from src/modules/ne_data/controller/ims.go rename to src/modules/ne_data_nf/controller/ims.go index b0d7bfa7..7e25ad0f 100644 --- a/src/modules/ne_data/controller/ims.go +++ b/src/modules/ne_data_nf/controller/ims.go @@ -8,9 +8,10 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" neDataService "be.ems/src/modules/ne_data/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -18,7 +19,7 @@ import ( // 实例化控制层 IMSController 结构体 var NewIMS = &IMSController{ neInfoService: neService.NewNeInfo, - cdrEventService: neDataService.NewCDREvent, + cdrEventService: service.NewCDREvent, kpiReportService: neDataService.NewKpiReport, } @@ -27,7 +28,7 @@ var NewIMS = &IMSController{ // PATH /ims type IMSController struct { neInfoService *neService.NeInfo // 网元信息服务 - cdrEventService *neDataService.CDREvent // CDR会话事件服务 + cdrEventService *service.CDREvent // CDR会话事件服务 kpiReportService *neDataService.KpiReport // 统计信息服务 } @@ -48,7 +49,7 @@ type IMSController struct { // @Security TokenAuth // @Summary CDR Session List // @Description CDR Session List -// @Router /neData/ims/cdr/list [get] +// @Router /nf/ims/cdr/list [get] func (s *IMSController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -86,7 +87,7 @@ func (s *IMSController) CDRList(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session Delete // @Description CDR Session Delete -// @Router /neData/ims/cdr/{id} [delete] +// @Router /nf/ims/cdr/{id} [delete] func (s *IMSController) CDRRemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) id := c.Param("id") @@ -124,7 +125,7 @@ func (s *IMSController) CDRRemove(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session List Export // @Description CDR Session List Export -// @Router /neData/ims/cdr/export [get] +// @Router /nf/ims/cdr/export [get] func (s *IMSController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -177,7 +178,7 @@ func (s *IMSController) CDRExport(c *gin.Context) { // @Security TokenAuth // @Summary Number of online session users // @Description Number of online session users -// @Router /neData/ims/session/num [get] +// @Router /nf/ims/session/num [get] func (s *IMSController) UeSessionNum(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -221,7 +222,7 @@ func (s *IMSController) UeSessionNum(c *gin.Context) { // @Security TokenAuth // @Summary Online session user list information // @Description Online session user list information -// @Router /neData/ims/session/list [get] +// @Router /nf/ims/session/list [get] func (s *IMSController) UeSessionList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -269,7 +270,7 @@ func (s *IMSController) UeSessionList(c *gin.Context) { // @Security TokenAuth // @Summary Busy hour statistics // @Description Busy hour statistics -// @Router /neData/ims/kpi/busy-hour [get] +// @Router /nf/ims/kpi/busy-hour [get] func (s IMSController) KPIBusyHour(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { diff --git a/src/modules/ne_data/controller/mme.go b/src/modules/ne_data_nf/controller/mme.go similarity index 93% rename from src/modules/ne_data/controller/mme.go rename to src/modules/ne_data_nf/controller/mme.go index 8205ef2b..b7aa9793 100644 --- a/src/modules/ne_data/controller/mme.go +++ b/src/modules/ne_data_nf/controller/mme.go @@ -8,9 +8,9 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -18,15 +18,15 @@ import ( // 实例化控制层 MMEController 结构体 var NewMME = &MMEController{ neInfoService: neService.NewNeInfo, - ueEventService: neDataService.NewUEEvent, + ueEventService: service.NewUEEvent, } // 网元MME // // PATH /mme type MMEController struct { - neInfoService *neService.NeInfo // 网元信息服务 - ueEventService *neDataService.UEEvent // UE会话事件服务 + neInfoService *neService.NeInfo // 网元信息服务 + ueEventService *service.UEEvent // UE会话事件服务 } // UE会话列表 @@ -45,7 +45,7 @@ type MMEController struct { // @Security TokenAuth // @Summary UE Session List // @Description UE Session List -// @Router /neData/mme/ue/list [get] +// @Router /nf/mme/ue/list [get] func (s *MMEController) UEList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -83,7 +83,7 @@ func (s *MMEController) UEList(c *gin.Context) { // @Security TokenAuth // @Summary UE Session Deletion // @Description UE Session Deletion -// @Router /neData/mme/ue/{id} [delete] +// @Router /nf/mme/ue/{id} [delete] func (s *MMEController) UERemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) id := c.Param("id") @@ -121,7 +121,7 @@ func (s *MMEController) UERemove(c *gin.Context) { // @Security TokenAuth // @Summary UE Session List Export // @Description UE Session List Export -// @Router /neData/mme/ue/export [get] +// @Router /nf/mme/ue/export [get] func (s *MMEController) UEExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -175,7 +175,7 @@ func (s *MMEController) UEExport(c *gin.Context) { // @Security TokenAuth // @Summary Access Base Station Information List // @Description Access Base Station Information List -// @Router /neData/mme/nb/list [get] +// @Router /nf/mme/nb/list [get] func (s *MMEController) NbInfoList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -220,7 +220,7 @@ func (s *MMEController) NbInfoList(c *gin.Context) { // @Security TokenAuth // @Summary Access to the base station status information list // @Description Access to the base station status information list -// @Router /neData/mme/nb/addrs [get] +// @Router /nf/mme/nb/addrs [get] func (s *MMEController) NbStateList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { diff --git a/src/modules/ne_data/controller/n3iwf.go b/src/modules/ne_data_nf/controller/n3iwf.go similarity index 95% rename from src/modules/ne_data/controller/n3iwf.go rename to src/modules/ne_data_nf/controller/n3iwf.go index a2a7ecbe..74d178e0 100644 --- a/src/modules/ne_data/controller/n3iwf.go +++ b/src/modules/ne_data_nf/controller/n3iwf.go @@ -6,8 +6,8 @@ import ( "be.ems/src/framework/i18n" "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" "github.com/gin-gonic/gin" ) @@ -37,7 +37,7 @@ type N3IWFController struct { // @Security TokenAuth // @Summary Online session user list information // @Description Online session user list information -// @Router /neData/n3iwf/sub/list [get] +// @Router /nf/n3iwf/sub/list [get] func (s N3IWFController) SubUserList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { diff --git a/src/modules/ne_data/controller/nssf.go b/src/modules/ne_data_nf/controller/nssf.go similarity index 95% rename from src/modules/ne_data/controller/nssf.go rename to src/modules/ne_data_nf/controller/nssf.go index a1043e25..6b6e69f6 100644 --- a/src/modules/ne_data/controller/nssf.go +++ b/src/modules/ne_data_nf/controller/nssf.go @@ -6,8 +6,8 @@ import ( "be.ems/src/framework/i18n" "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" "github.com/gin-gonic/gin" ) @@ -36,7 +36,7 @@ type NSSFController struct { // @Security TokenAuth // @Summary Online session user list information // @Description Online session user list information -// @Router /neData/nssf/sub/list [get] +// @Router /nf/nssf/sub/list [get] func (s NSSFController) SubUserList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -78,7 +78,7 @@ func (s NSSFController) SubUserList(c *gin.Context) { // @Security TokenAuth // @Summary Online session user list information // @Description Online session user list information -// @Router /neData/nssf/amf/list [get] +// @Router /nf/nssf/amf/list [get] func (s NSSFController) AvailableList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { diff --git a/src/modules/ne_data/controller/pcf.go b/src/modules/ne_data_nf/controller/pcf.go similarity index 97% rename from src/modules/ne_data/controller/pcf.go rename to src/modules/ne_data_nf/controller/pcf.go index 342dc338..65068bbe 100644 --- a/src/modules/ne_data/controller/pcf.go +++ b/src/modules/ne_data_nf/controller/pcf.go @@ -6,8 +6,8 @@ import ( "be.ems/src/framework/i18n" "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" "github.com/gin-gonic/gin" ) @@ -38,7 +38,7 @@ type PCFController struct { // @Security TokenAuth // @Summary Policy Configuration List // @Description Policy Configuration List -// @Router /ne/link/pcf/rule/list [get] +// @Router /nf/pcf/rule/list [get] func (s PCFController) RuleInfoList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -85,7 +85,7 @@ func (s PCFController) RuleInfoList(c *gin.Context) { // @Security TokenAuth // @Summary Policy Configuration Additions // @Description Policy Configuration Additions -// @Router /ne/link/pcf/rule [post] +// @Router /nf/pcf/rule [post] func (s PCFController) RuleInfoAdd(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { @@ -143,7 +143,7 @@ func (s PCFController) RuleInfoAdd(c *gin.Context) { // @Security TokenAuth // @Summary Policy Configuration Updates // @Description Policy Configuration Updates -// @Router /ne/link/pcf/rule [put] +// @Router /nf/pcf/rule [put] func (s PCFController) RuleInfoEdit(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { @@ -203,7 +203,7 @@ func (s PCFController) RuleInfoEdit(c *gin.Context) { // @Security TokenAuth // @Summary Policy Configuration Deletion // @Description Policy Configuration Deletion -// @Router /ne/link/pcf/rule [delete] +// @Router /nf/pcf/rule [delete] func (s PCFController) RuleInfoRemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -252,7 +252,7 @@ func (s PCFController) RuleInfoRemove(c *gin.Context) { // @Security TokenAuth // @Summary Policy Configuration Export // @Description Policy Configuration Export -// @Router /ne/link/pcf/rule/export [get] +// @Router /nf/pcf/rule/export [get] func (s PCFController) RuleInfoExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -299,7 +299,7 @@ func (s PCFController) RuleInfoExport(c *gin.Context) { // @Security TokenAuth // @Summary Policy Configuration Import // @Description Policy Configuration Import -// @Router /ne/link/pcf/rule/import [put] +// @Router /nf/pcf/rule/import [put] func (s PCFController) RuleInfoImport(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { diff --git a/src/modules/ne_data/controller/sgwc.go b/src/modules/ne_data_nf/controller/sgwc.go similarity index 90% rename from src/modules/ne_data/controller/sgwc.go rename to src/modules/ne_data_nf/controller/sgwc.go index d54f0f8e..f918bd44 100644 --- a/src/modules/ne_data/controller/sgwc.go +++ b/src/modules/ne_data_nf/controller/sgwc.go @@ -9,24 +9,25 @@ import ( "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + "be.ems/src/modules/ne_data_nf/service" + "github.com/gin-gonic/gin" ) // 实例化控制层 SGWCController 结构体 var NewSGWC = &SGWCController{ neInfoService: neService.NewNeInfo, - cdrEventService: neDataService.NewCDREvent, - UDMExtendService: neDataService.NewUDMExtend, + cdrEventService: service.NewCDREvent, + UDMExtendService: service.NewUDMExtend, } // 网元SGWC // // PATH /sgwc type SGWCController struct { - neInfoService *neService.NeInfo // 网元信息服务 - cdrEventService *neDataService.CDREvent // CDR会话事件服务 - UDMExtendService *neDataService.UDMExtend // UDM用户信息服务 + neInfoService *neService.NeInfo // 网元信息服务 + cdrEventService *service.CDREvent // CDR会话事件服务 + UDMExtendService *service.UDMExtend // UDM用户信息服务 } // CDR会话列表 @@ -46,7 +47,7 @@ type SGWCController struct { // @Security TokenAuth // @Summary CDR Session List // @Description CDR Session List -// @Router /neData/sgwc/cdr/list [get] +// @Router /nf/sgwc/cdr/list [get] func (s *SGWCController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -84,7 +85,7 @@ func (s *SGWCController) CDRList(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session Delete // @Description CDR Session Delete -// @Router /neData/sgwc/cdr/{id} [delete] +// @Router /nf/sgwc/cdr/{id} [delete] func (s *SGWCController) CDRRemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) id := c.Param("id") @@ -122,7 +123,7 @@ func (s *SGWCController) CDRRemove(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session List Export // @Description CDR Session List Export -// @Router /neData/sgwc/cdr/export [post] +// @Router /nf/sgwc/cdr/export [post] func (s *SGWCController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) diff --git a/src/modules/ne_data/controller/smf.go b/src/modules/ne_data_nf/controller/smf.go similarity index 92% rename from src/modules/ne_data/controller/smf.go rename to src/modules/ne_data_nf/controller/smf.go index 925a851a..62bdc37d 100644 --- a/src/modules/ne_data/controller/smf.go +++ b/src/modules/ne_data_nf/controller/smf.go @@ -9,9 +9,9 @@ import ( "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -19,17 +19,17 @@ import ( // 实例化控制层 SMFController 结构体 var NewSMF = &SMFController{ neInfoService: neService.NewNeInfo, - cdrEventService: neDataService.NewCDREvent, - UDMExtendService: neDataService.NewUDMExtend, + cdrEventService: service.NewCDREvent, + UDMExtendService: service.NewUDMExtend, } // 网元SMF // // PATH /smf type SMFController struct { - neInfoService *neService.NeInfo // 网元信息服务 - cdrEventService *neDataService.CDREvent // CDR会话事件服务 - UDMExtendService *neDataService.UDMExtend // UDM用户信息服务 + neInfoService *neService.NeInfo // 网元信息服务 + cdrEventService *service.CDREvent // CDR会话事件服务 + UDMExtendService *service.UDMExtend // UDM用户信息服务 } // CDR会话列表 @@ -48,7 +48,7 @@ type SMFController struct { // @Security TokenAuth // @Summary CDR Session List // @Description CDR Session List -// @Router /neData/smf/cdr/list [get] +// @Router /nf/smf/cdr/list [get] func (s *SMFController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -86,7 +86,7 @@ func (s *SMFController) CDRList(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session Delete // @Description CDR Session Delete -// @Router /neData/smf/cdr/{id} [delete] +// @Router /nf/smf/cdr/{id} [delete] func (s *SMFController) CDRRemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) id := c.Param("id") @@ -124,7 +124,7 @@ func (s *SMFController) CDRRemove(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session List Export // @Description CDR Session List Export -// @Router /neData/smf/cdr/export [get] +// @Router /nf/smf/cdr/export [get] func (s *SMFController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -177,7 +177,7 @@ func (s *SMFController) CDRExport(c *gin.Context) { // @Security TokenAuth // @Summary Number of online session users // @Description Number of online session users -// @Router /neData/smf/sub/num [get] +// @Router /nf/smf/sub/num [get] func (s *SMFController) SubUserNum(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -223,7 +223,7 @@ func (s *SMFController) SubUserNum(c *gin.Context) { // @Security TokenAuth // @Summary Online session user list information // @Description Online session user list information -// @Router /neData/smf/sub/list [get] +// @Router /nf/smf/sub/list [get] func (s *SMFController) SubUserList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { diff --git a/src/modules/ne_data/controller/smsc.go b/src/modules/ne_data_nf/controller/smsc.go similarity index 92% rename from src/modules/ne_data/controller/smsc.go rename to src/modules/ne_data_nf/controller/smsc.go index 302d5861..c9d9beab 100644 --- a/src/modules/ne_data/controller/smsc.go +++ b/src/modules/ne_data_nf/controller/smsc.go @@ -9,7 +9,7 @@ import ( "be.ems/src/framework/resp" "be.ems/src/framework/utils/parse" neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -17,15 +17,15 @@ import ( // 实例化控制层 SMSCController 结构体 var NewSMSC = &SMSCController{ neInfoService: neService.NewNeInfo, - cdrEventService: neDataService.NewCDREvent, + cdrEventService: service.NewCDREvent, } // 网元SMSC // // PATH /smsc type SMSCController struct { - neInfoService *neService.NeInfo // 网元信息服务 - cdrEventService *neDataService.CDREvent // CDR会话事件服务 + neInfoService *neService.NeInfo // 网元信息服务 + cdrEventService *service.CDREvent // CDR会话事件服务 } // CDR会话列表 @@ -45,7 +45,7 @@ type SMSCController struct { // @Security TokenAuth // @Summary CDR Session List // @Description CDR Session List -// @Router /neData/smsc/cdr/list [get] +// @Router /nf/smsc/cdr/list [get] func (s *SMSCController) CDRList(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) @@ -83,7 +83,7 @@ func (s *SMSCController) CDRList(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session Delete // @Description CDR Session Delete -// @Router /neData/smsc/cdr/{id} [delete] +// @Router /nf/smsc/cdr/{id} [delete] func (s *SMSCController) CDRRemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) id := c.Param("id") @@ -121,7 +121,7 @@ func (s *SMSCController) CDRRemove(c *gin.Context) { // @Security TokenAuth // @Summary CDR Session List Export // @Description CDR Session List Export -// @Router /neData/smsc/cdr/export [get] +// @Router /nf/smsc/cdr/export [get] func (s *SMSCController) CDRExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) query := reqctx.QueryMap(c) diff --git a/src/modules/ne_data/controller/udm_auth.go b/src/modules/ne_data_nf/controller/udm_auth.go similarity index 97% rename from src/modules/ne_data/controller/udm_auth.go rename to src/modules/ne_data_nf/controller/udm_auth.go index fa649727..d3710305 100644 --- a/src/modules/ne_data/controller/udm_auth.go +++ b/src/modules/ne_data_nf/controller/udm_auth.go @@ -13,10 +13,10 @@ import ( "be.ems/src/framework/telnet" "be.ems/src/framework/utils/file" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -47,7 +47,7 @@ type UDMAuthController struct { // @Security TokenAuth // @Summary UDM Authentication User Data Refresh // @Description UDM Authenticated User Data List Refresh Synchronization Latest -// @Router /ne/link/udm/auth/reset [put] +// @Router /nf/udm/auth/reset [put] func (s *UDMAuthController) ResetData(c *gin.Context) { var query struct { CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 @@ -78,7 +78,7 @@ func (s *UDMAuthController) ResetData(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authentication User List // @Description UDM Authentication User List -// @Router /ne/link/udm/auth/list [get] +// @Router /nf/udm/auth/list [get] func (s *UDMAuthController) List(c *gin.Context) { query := reqctx.QueryMap(c) rows, total := s.udmAuthService.FindByPage(query) @@ -99,7 +99,7 @@ func (s *UDMAuthController) List(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authentication User Information // @Description UDM Authentication User Information -// @Router /ne/link/udm/auth [get] +// @Router /nf/udm/auth [get] func (s *UDMAuthController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -159,7 +159,7 @@ func (s *UDMAuthController) Info(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authentication User Added // @Description UDM Authentication User Added -// @Router /ne/link/udm/auth [post] +// @Router /nf/udm/auth [post] func (s *UDMAuthController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 传入数量大于0时，为批量新增 @@ -242,7 +242,7 @@ func (s *UDMAuthController) Add(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authenticated User Modification // @Description UDM Authenticated User Modification -// @Router /ne/link/udm/auth [put] +// @Router /nf/udm/auth [put] func (s *UDMAuthController) Edit(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body model.UDMAuthUser @@ -299,7 +299,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authenticated User Deletion // @Description UDM Authenticated User Deletion -// @Router /ne/link/udm/auth/{neId}/{value} [delete] +// @Router /nf/udm/auth/{neId}/{value} [delete] func (s *UDMAuthController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -387,7 +387,7 @@ func (s *UDMAuthController) Remove(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authenticated User Export // @Description UDM Authenticated User Export -// @Router /ne/link/udm/auth/export [get] +// @Router /nf/udm/auth/export [get] func (s *UDMAuthController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) neUid := c.Query("neUid") @@ -468,7 +468,7 @@ func (s *UDMAuthController) Export(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authenticated User Import // @Description UDM Authenticated User Import -// @Router /ne/link/udm/auth/import [post] +// @Router /nf/udm/auth/import [post] func (s *UDMAuthController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { diff --git a/src/modules/ne_data/controller/udm_sub.go b/src/modules/ne_data_nf/controller/udm_sub.go similarity index 97% rename from src/modules/ne_data/controller/udm_sub.go rename to src/modules/ne_data_nf/controller/udm_sub.go index 2f7e1743..e05d3c76 100644 --- a/src/modules/ne_data/controller/udm_sub.go +++ b/src/modules/ne_data_nf/controller/udm_sub.go @@ -14,8 +14,8 @@ import ( "be.ems/src/framework/utils/file" "be.ems/src/framework/utils/parse" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/service" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -46,7 +46,7 @@ type UDMSubController struct { // @Security TokenAuth // @Summary UDM Subscriber User Reload Data // @Description UDM Subscriber User Reload Data -// @Router /ne/link/udm/sub/reset [put] +// @Router /nf/udm/sub/reset [put] func (s *UDMSubController) ResetData(c *gin.Context) { var query struct { CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 @@ -78,7 +78,7 @@ func (s *UDMSubController) ResetData(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User List // @Description UDM Subscriber User List -// @Router /ne/link/udm/sub/list [get] +// @Router /nf/udm/sub/list [get] func (s *UDMSubController) List(c *gin.Context) { query := reqctx.QueryMap(c) rows, total := s.udmSubService.FindByPage(query) @@ -98,7 +98,7 @@ func (s *UDMSubController) List(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Information // @Description UDM Subscriber User Information -// @Router /ne/link/udm/sub [get] +// @Router /nf/udm/sub [get] func (s *UDMSubController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -158,7 +158,7 @@ func (s *UDMSubController) Info(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Added // @Description UDM Subscriber User Added -// @Router /ne/link/udm/sub [post] +// @Router /nf/udm/sub [post] func (s *UDMSubController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 传入数量大于0时，为批量新增 @@ -244,7 +244,7 @@ func (s *UDMSubController) Add(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Modification // @Description UDM Subscriber User Modification -// @Router /ne/link/udm/sub [put] +// @Router /nf/udm/sub [put] func (s *UDMSubController) Edit(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body model.UDMSubUser @@ -301,7 +301,7 @@ func (s *UDMSubController) Edit(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Deletion // @Description UDM Subscriber User Deletion -// @Router /ne/link/udm/sub [delete] +// @Router /nf/udm/sub [delete] func (s *UDMSubController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -390,7 +390,7 @@ func (s *UDMSubController) Remove(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Export // @Description UDM Subscriber User Export -// @Router /ne/link/udm/sub/export [post] +// @Router /nf/udm/sub/export [post] func (s *UDMSubController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) neUid := c.Query("neUid") @@ -465,7 +465,7 @@ func (s *UDMSubController) Export(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Import // @Description UDM Subscriber User Import -// @Router /ne/link/udm/sub/import [post] +// @Router /nf/udm/sub/import [post] func (s *UDMSubController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { diff --git a/src/modules/ne_data/controller/udm_voip.go b/src/modules/ne_data_nf/controller/udm_voip.go similarity index 97% rename from src/modules/ne_data/controller/udm_voip.go rename to src/modules/ne_data_nf/controller/udm_voip.go index 5c948385..2cba942d 100644 --- a/src/modules/ne_data/controller/udm_voip.go +++ b/src/modules/ne_data_nf/controller/udm_voip.go @@ -14,8 +14,8 @@ import ( "be.ems/src/framework/utils/file" "be.ems/src/framework/utils/parse" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/service" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -47,7 +47,7 @@ type UDMVOIPController struct { // @Security TokenAuth // @Summary UDM VOIP User Data Refresh // @Description UDM VOIP User Data List Refresh Synchronization Latest -// @Router /ne/link/udm/voip/reset [put] +// @Router /nf/udm/voip/reset [put] func (s *UDMVOIPController) ResetData(c *gin.Context) { var query struct { CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 @@ -79,7 +79,7 @@ func (s *UDMVOIPController) ResetData(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User List // @Description UDM VOIP User List -// @Router /ne/link/udm/voip/list [get] +// @Router /nf/udm/voip/list [get] func (s *UDMVOIPController) List(c *gin.Context) { query := reqctx.QueryMap(c) rows, total := s.udmVOIPService.FindByPage(query) @@ -99,7 +99,7 @@ func (s *UDMVOIPController) List(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Information // @Description UDM VOIP User Information -// @Router /ne/link/udm/voip [get] +// @Router /nf/udm/voip [get] func (s *UDMVOIPController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -163,7 +163,7 @@ func (s *UDMVOIPController) Info(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Added // @Description UDM VOIP User Added -// @Router /ne/link/udm/voip [post] +// @Router /nf/udm/voip [post] func (s *UDMVOIPController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 传入数量大于0时，为批量新增 @@ -244,7 +244,7 @@ func (s *UDMVOIPController) Add(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Deletion // @Description UDM VOIP User Deletion -// @Router /ne/link/udm/voip [delete] +// @Router /nf/udm/voip [delete] func (s *UDMVOIPController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -332,7 +332,7 @@ func (s *UDMVOIPController) Remove(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Export // @Description UDM VOIP User Export -// @Router /ne/link/udm/voip/export [get] +// @Router /nf/udm/voip/export [get] func (s *UDMVOIPController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 查询结果，根据查询条件结果，单页最大值限制 @@ -408,7 +408,7 @@ func (s *UDMVOIPController) Export(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Import // @Description UDM VOIP User Import -// @Router /ne/link/udm/voip/import [post] +// @Router /nf/udm/voip/import [post] func (s *UDMVOIPController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { diff --git a/src/modules/ne_data/controller/udm_volte_ims.go b/src/modules/ne_data_nf/controller/udm_volte_ims.go similarity index 97% rename from src/modules/ne_data/controller/udm_volte_ims.go rename to src/modules/ne_data_nf/controller/udm_volte_ims.go index 9910df89..289e7f54 100644 --- a/src/modules/ne_data/controller/udm_volte_ims.go +++ b/src/modules/ne_data_nf/controller/udm_volte_ims.go @@ -14,8 +14,8 @@ import ( "be.ems/src/framework/utils/file" "be.ems/src/framework/utils/parse" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/service" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/service" "github.com/gin-gonic/gin" ) @@ -47,7 +47,7 @@ type UDMVolteIMSController struct { // @Security TokenAuth // @Summary UDM VolteIMS User Data Refresh // @Description UDM Authenticated User Data List Refresh Synchronization Latest -// @Router /ne/link/udm/volte-ims/reset [put] +// @Router /nf/udm/volte-ims/reset [put] func (s *UDMVolteIMSController) ResetData(c *gin.Context) { var query struct { CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 @@ -78,7 +78,7 @@ func (s *UDMVolteIMSController) ResetData(c *gin.Context) { // @Security TokenAuth // @Summary UDM VolteIMS User List // @Description UDM VolteIMS User List -// @Router /ne/link/udm/volte-ims/list [get] +// @Router /nf/udm/volte-ims/list [get] func (s *UDMVolteIMSController) List(c *gin.Context) { query := reqctx.QueryMap(c) rows, total := s.udmVolteIMSService.FindByPage(query) @@ -99,7 +99,7 @@ func (s *UDMVolteIMSController) List(c *gin.Context) { // @Security TokenAuth // @Summary UDM VolteIMS User Information // @Description UDM VolteIMS User Information -// @Router /ne/link/udm/volte-ims [get] +// @Router /nf/udm/volte-ims [get] func (s *UDMVolteIMSController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -165,7 +165,7 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) { // @Security TokenAuth // @Summary UDM VolteIMS User Added // @Description UDM VolteIMS User Added If VoIP tag=0, then MSISDN and IMSI need to be the same. -// @Router /ne/link/udm/volte-ims [post] +// @Router /nf/udm/volte-ims [post] func (s *UDMVolteIMSController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) // 传入数量大于0时，为批量新增 @@ -256,7 +256,7 @@ func (s *UDMVolteIMSController) Add(c *gin.Context) { // @Security TokenAuth // @Summary UDM VolteIMS User Batch Deletion // @Description UDM VolteIMS User Batch Deletion -// @Router /ne/link/udm/volte-ims [delete] +// @Router /nf/udm/volte-ims [delete] func (s *UDMVolteIMSController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { @@ -342,7 +342,7 @@ func (s *UDMVolteIMSController) Remove(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authenticated User Export // @Description UDM Authenticated User Export -// @Router /ne/link/udm/volte-ims/export [get] +// @Router /nf/udm/volte-ims/export [get] func (s *UDMVolteIMSController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) neUid := c.Query("neUid") @@ -415,7 +415,7 @@ func (s *UDMVolteIMSController) Export(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authenticated User Import // @Description UDM Authenticated User Import -// @Router /ne/link/udm/volte-ims/import [post] +// @Router /nf/udm/volte-ims/import [post] func (s *UDMVolteIMSController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { diff --git a/src/modules/ne_data/controller/upf.go b/src/modules/ne_data_nf/controller/upf.go similarity index 97% rename from src/modules/ne_data/controller/upf.go rename to src/modules/ne_data_nf/controller/upf.go index c48cef03..e0f6c5eb 100644 --- a/src/modules/ne_data/controller/upf.go +++ b/src/modules/ne_data_nf/controller/upf.go @@ -40,7 +40,7 @@ type UPFController struct { // @Security TokenAuth // @Summary Total number of flows N3 upstream N6 downstream // @Description Total number of flows N3 upstream N6 downstream -// @Router /ne/link/upf/kpi/flow-total [get] +// @Router /nf/upf/kpi/flow-total [get] func (s UPFController) KPIFlowTotal(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { diff --git a/src/modules/ne/fetch_link/alarm.go b/src/modules/ne_data_nf/fetch_link/alarm.go similarity index 100% rename from src/modules/ne/fetch_link/alarm.go rename to src/modules/ne_data_nf/fetch_link/alarm.go diff --git a/src/modules/ne/fetch_link/amf.go b/src/modules/ne_data_nf/fetch_link/amf.go similarity index 100% rename from src/modules/ne/fetch_link/amf.go rename to src/modules/ne_data_nf/fetch_link/amf.go diff --git a/src/modules/ne/fetch_link/hlr.go b/src/modules/ne_data_nf/fetch_link/hlr.go similarity index 100% rename from src/modules/ne/fetch_link/hlr.go rename to src/modules/ne_data_nf/fetch_link/hlr.go diff --git a/src/modules/ne/fetch_link/ims.go b/src/modules/ne_data_nf/fetch_link/ims.go similarity index 100% rename from src/modules/ne/fetch_link/ims.go rename to src/modules/ne_data_nf/fetch_link/ims.go diff --git a/src/modules/ne/fetch_link/mme.go b/src/modules/ne_data_nf/fetch_link/mme.go similarity index 100% rename from src/modules/ne/fetch_link/mme.go rename to src/modules/ne_data_nf/fetch_link/mme.go diff --git a/src/modules/ne/fetch_link/n3iwf.go b/src/modules/ne_data_nf/fetch_link/n3iwf.go similarity index 100% rename from src/modules/ne/fetch_link/n3iwf.go rename to src/modules/ne_data_nf/fetch_link/n3iwf.go diff --git a/src/modules/ne/fetch_link/ne_config.go b/src/modules/ne_data_nf/fetch_link/ne_config.go similarity index 100% rename from src/modules/ne/fetch_link/ne_config.go rename to src/modules/ne_data_nf/fetch_link/ne_config.go diff --git a/src/modules/ne/fetch_link/ne_state.go b/src/modules/ne_data_nf/fetch_link/ne_state.go similarity index 100% rename from src/modules/ne/fetch_link/ne_state.go rename to src/modules/ne_data_nf/fetch_link/ne_state.go diff --git a/src/modules/ne/fetch_link/ne_trace.go b/src/modules/ne_data_nf/fetch_link/ne_trace.go similarity index 100% rename from src/modules/ne/fetch_link/ne_trace.go rename to src/modules/ne_data_nf/fetch_link/ne_trace.go diff --git a/src/modules/ne/fetch_link/nssf.go b/src/modules/ne_data_nf/fetch_link/nssf.go similarity index 100% rename from src/modules/ne/fetch_link/nssf.go rename to src/modules/ne_data_nf/fetch_link/nssf.go diff --git a/src/modules/ne/fetch_link/pcf.go b/src/modules/ne_data_nf/fetch_link/pcf.go similarity index 100% rename from src/modules/ne/fetch_link/pcf.go rename to src/modules/ne_data_nf/fetch_link/pcf.go diff --git a/src/modules/ne/fetch_link/smf.go b/src/modules/ne_data_nf/fetch_link/smf.go similarity index 100% rename from src/modules/ne/fetch_link/smf.go rename to src/modules/ne_data_nf/fetch_link/smf.go diff --git a/src/modules/ne/fetch_link/udm.go b/src/modules/ne_data_nf/fetch_link/udm.go similarity index 100% rename from src/modules/ne/fetch_link/udm.go rename to src/modules/ne_data_nf/fetch_link/udm.go diff --git a/src/modules/ne_data/model/cbc_message.go b/src/modules/ne_data_nf/model/cbc_message.go similarity index 100% rename from src/modules/ne_data/model/cbc_message.go rename to src/modules/ne_data_nf/model/cbc_message.go diff --git a/src/modules/ne_data/model/cdr_event.go b/src/modules/ne_data_nf/model/cdr_event.go similarity index 100% rename from src/modules/ne_data/model/cdr_event.go rename to src/modules/ne_data_nf/model/cdr_event.go diff --git a/src/modules/ne_data/model/udm_auth.go b/src/modules/ne_data_nf/model/udm_auth.go similarity index 100% rename from src/modules/ne_data/model/udm_auth.go rename to src/modules/ne_data_nf/model/udm_auth.go diff --git a/src/modules/ne_data/model/udm_extend.go b/src/modules/ne_data_nf/model/udm_extend.go similarity index 100% rename from src/modules/ne_data/model/udm_extend.go rename to src/modules/ne_data_nf/model/udm_extend.go diff --git a/src/modules/ne_data/model/udm_sub.go b/src/modules/ne_data_nf/model/udm_sub.go similarity index 100% rename from src/modules/ne_data/model/udm_sub.go rename to src/modules/ne_data_nf/model/udm_sub.go diff --git a/src/modules/ne_data/model/udm_voip.go b/src/modules/ne_data_nf/model/udm_voip.go similarity index 100% rename from src/modules/ne_data/model/udm_voip.go rename to src/modules/ne_data_nf/model/udm_voip.go diff --git a/src/modules/ne_data/model/udm_volte_ims.go b/src/modules/ne_data_nf/model/udm_volte_ims.go similarity index 100% rename from src/modules/ne_data/model/udm_volte_ims.go rename to src/modules/ne_data_nf/model/udm_volte_ims.go diff --git a/src/modules/ne_data/model/ue_event.go b/src/modules/ne_data_nf/model/ue_event.go similarity index 100% rename from src/modules/ne_data/model/ue_event.go rename to src/modules/ne_data_nf/model/ue_event.go diff --git a/src/modules/ne_data_nf/ne_data_nf.go b/src/modules/ne_data_nf/ne_data_nf.go new file mode 100644 index 00000000..9399b799 --- /dev/null +++ b/src/modules/ne_data_nf/ne_data_nf.go @@ -0,0 +1,438 @@ +package ne_data_nf + +import ( + "be.ems/src/framework/logger" + "be.ems/src/framework/middleware" + "be.ems/src/framework/middleware/collectlogs" + "be.ems/src/framework/middleware/repeat" + "be.ems/src/modules/ne_data_nf/controller" + + "github.com/gin-gonic/gin" +) + +// 模块路由注册 +func Setup(router *gin.Engine) { + logger.Infof("开始加载 ====> ne_data_nf 模块路由") + + nfGroup := router.Group("/nf") + + // 网元IMS + imsGroup := nfGroup.Group("/ims") + { + imsGroup.GET("/cdr/list", + middleware.AuthorizeUser(nil), + controller.NewIMS.CDRList, + ) + imsGroup.DELETE("/cdr/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.imsCDR", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewIMS.CDRRemove, + ) + imsGroup.GET("/cdr/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.imsCDR", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewIMS.CDRExport, + ) + imsGroup.GET("/session/num", + middleware.AuthorizeUser(nil), + controller.NewIMS.UeSessionNum, + ) + imsGroup.GET("/session/list", + middleware.AuthorizeUser(nil), + controller.NewIMS.UeSessionList, + ) + imsGroup.GET("/kpi/busy-hour", + middleware.AuthorizeUser(nil), + controller.NewIMS.KPIBusyHour, + ) + } + + // 网元SMSC + smscGroup := nfGroup.Group("/smsc") + { + smscGroup.GET("/cdr/list", + middleware.AuthorizeUser(nil), + controller.NewSMSC.CDRList, + ) + smscGroup.DELETE("/cdr/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smscCDR", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewSMSC.CDRRemove, + ) + smscGroup.GET("/cdr/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smscCDR", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewSMSC.CDRExport, + ) + } + + // 网元SMF + smfGroup := nfGroup.Group("/smf") + { + smfGroup.GET("/cdr/list", + middleware.AuthorizeUser(nil), + controller.NewSMF.CDRList, + ) + smfGroup.DELETE("/cdr/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smfCDR", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewSMF.CDRRemove, + ) + smfGroup.GET("/cdr/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smfCDR", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewSMF.CDRExport, + ) + smfGroup.GET("/sub/num", + middleware.AuthorizeUser(nil), + controller.NewSMF.SubUserNum, + ) + smfGroup.GET("/sub/list", + middleware.AuthorizeUser(nil), + controller.NewSMF.SubUserList, + ) + } + + // 网元AMF + amfGroup := nfGroup.Group("/amf") + { + amfGroup.GET("/ue/list", + middleware.AuthorizeUser(nil), + controller.NewAMF.UEList, + ) + amfGroup.DELETE("/ue/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.amfUE", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewAMF.UERemove, + ) + amfGroup.GET("/ue/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.amfUE", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewAMF.UEExport, + ) + amfGroup.GET("/nb/list", + middleware.AuthorizeUser(nil), + controller.NewAMF.NbInfoList, + ) + amfGroup.GET("/nb/addrs", + middleware.AuthorizeUser(nil), + controller.NewAMF.NbStateList, + ) + } + + // 网元UPF + upfGroup := nfGroup.Group("/upf") + { + upfGroup.GET("/kpi/flow-total", + middleware.AuthorizeUser(nil), + controller.NewUPF.KPIFlowTotal, + ) + } + + // 网元N3IWF + n3iwfGroup := nfGroup.Group("/n3iwf") + { + n3iwfGroup.GET("/sub/list", + middleware.AuthorizeUser(nil), + controller.NewN3IWF.SubUserList, + ) + } + + // 网元N3IWF + nssf := controller.NewNSSF + nssfGroup := nfGroup.Group("/nssf") + { + nssfGroup.GET("/sub/list", + middleware.AuthorizeUser(nil), + nssf.SubUserList, + ) + nssfGroup.GET("/amf/list", + middleware.AuthorizeUser(nil), + nssf.AvailableList, + ) + } + + // 网元UDM 鉴权用户信息 + udmAuthGroup := nfGroup.Group("/udm/auth") + { + udmAuthGroup.PUT("/reset", + repeat.RepeatSubmit(5), + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_CLEAN)), + controller.NewUDMAuth.ResetData, + ) + udmAuthGroup.GET("/list", + middleware.AuthorizeUser(nil), + controller.NewUDMAuth.List, + ) + udmAuthGroup.GET("", + middleware.AuthorizeUser(nil), + controller.NewUDMAuth.Info, + ) + udmAuthGroup.POST("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)), + controller.NewUDMAuth.Add, + ) + udmAuthGroup.PUT("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_UPDATE)), + controller.NewUDMAuth.Edit, + ) + udmAuthGroup.DELETE("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewUDMAuth.Remove, + ) + udmAuthGroup.GET("/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewUDMAuth.Export, + ) + udmAuthGroup.POST("/import", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_IMPORT)), + controller.NewUDMAuth.Import, + ) + } + + // 网元UDM 签约用户信息 + udmSubGroup := nfGroup.Group("/udm/sub") + { + udmSubGroup.PUT("/reset", + repeat.RepeatSubmit(5), + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_CLEAN)), + controller.NewUDMSub.ResetData, + ) + udmSubGroup.GET("/list", + middleware.AuthorizeUser(nil), + controller.NewUDMSub.List, + ) + udmSubGroup.GET("", + middleware.AuthorizeUser(nil), + controller.NewUDMSub.Info, + ) + udmSubGroup.POST("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)), + controller.NewUDMSub.Add, + ) + udmSubGroup.PUT("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_UPDATE)), + controller.NewUDMSub.Edit, + ) + udmSubGroup.DELETE("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewUDMSub.Remove, + ) + udmSubGroup.GET("/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewUDMSub.Export, + ) + udmSubGroup.POST("/import", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_IMPORT)), + controller.NewUDMSub.Import, + ) + } + + // 网元UDM VOIP用户信息 + udmVOIPGroup := nfGroup.Group("/udm/voip") + { + udmVOIPGroup.PUT("/reset", + repeat.RepeatSubmit(5), + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_CLEAN)), + controller.NewUDMVOIP.ResetData, + ) + udmVOIPGroup.GET("/list", + middleware.AuthorizeUser(nil), + controller.NewUDMVOIP.List, + ) + udmVOIPGroup.GET("", + middleware.AuthorizeUser(nil), + controller.NewUDMVOIP.Info, + ) + udmVOIPGroup.POST("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_INSERT)), + controller.NewUDMVOIP.Add, + ) + udmVOIPGroup.DELETE("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewUDMVOIP.Remove, + ) + udmVOIPGroup.GET("/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewUDMVOIP.Export, + ) + udmVOIPGroup.POST("/import", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_IMPORT)), + controller.NewUDMVOIP.Import, + ) + } + + // 网元UDM VolteIMS用户信息 + udmVolteIMSGroup := nfGroup.Group("/udm/volte-ims") + { + udmVolteIMSGroup.PUT("/reset", + repeat.RepeatSubmit(5), + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_CLEAN)), + controller.NewUDMVolteIMS.ResetData, + ) + udmVolteIMSGroup.GET("/list", + middleware.AuthorizeUser(nil), + controller.NewUDMVolteIMS.List, + ) + udmVolteIMSGroup.GET("", + middleware.AuthorizeUser(nil), + controller.NewUDMVolteIMS.Info, + ) + udmVolteIMSGroup.POST("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_INSERT)), + controller.NewUDMVolteIMS.Add, + ) + udmVolteIMSGroup.DELETE("", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewUDMVolteIMS.Remove, + ) + udmVolteIMSGroup.GET("/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewUDMVolteIMS.Export, + ) + udmVolteIMSGroup.POST("/import", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_IMPORT)), + controller.NewUDMVolteIMS.Import, + ) + } + + // 网元MME + mmeGroup := nfGroup.Group("/mme") + { + mmeGroup.GET("/ue/list", + middleware.AuthorizeUser(nil), + controller.NewMME.UEList, + ) + mmeGroup.DELETE("/ue/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.mmeUE", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewMME.UERemove, + ) + mmeGroup.GET("/ue/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.mmeUE", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewMME.UEExport, + ) + mmeGroup.GET("/nb/list", + middleware.AuthorizeUser(nil), + controller.NewMME.NbInfoList, + ) + mmeGroup.GET("/nb/addrs", + middleware.AuthorizeUser(nil), + controller.NewMME.NbStateList, + ) + } + + // 网元SGWC + sgwcGroup := nfGroup.Group("/sgwc") + { + sgwcGroup.GET("/cdr/list", + middleware.AuthorizeUser(nil), + controller.NewSGWC.CDRList, + ) + sgwcGroup.DELETE("/cdr/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sgwcCDR", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewSGWC.CDRRemove, + ) + sgwcGroup.POST("/cdr/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sgwcCDR", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewSGWC.CDRExport, + ) + } + + // 网元PCF + pcfGroup := nfGroup.Group("/pcf") + { + pcfGroup.GET("/rule/list", + middleware.AuthorizeUser(nil), + controller.NewPCF.RuleInfoList, + ) + pcfGroup.POST("/rule", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_IMPORT)), + controller.NewPCF.RuleInfoAdd, + ) + pcfGroup.PUT("/rule", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_UPDATE)), + controller.NewPCF.RuleInfoEdit, + ) + pcfGroup.DELETE("/rule", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewPCF.RuleInfoRemove, + ) + pcfGroup.GET("/rule/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewPCF.RuleInfoExport, + ) + pcfGroup.PUT("/rule/import", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.pcfRule", collectlogs.BUSINESS_TYPE_IMPORT)), + controller.NewPCF.RuleInfoImport, + ) + } + + // 网元CBC + cbcGroup := nfGroup.Group("/cbc") + { + cbcGroup.GET("/message/list", + middleware.AuthorizeUser(nil), + controller.NewCBC.List, + ) + cbcGroup.GET("/message/:id", + middleware.AuthorizeUser(nil), + controller.NewCBC.ListById, + ) + cbcGroup.POST("/message", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_IMPORT)), + controller.NewCBC.Insert, + ) + cbcGroup.PUT("/message/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_UPDATE)), + controller.NewCBC.Update, + ) + cbcGroup.PUT("/message/:id/:status", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_UPDATE)), + controller.NewCBC.UpdateStatus, + ) + cbcGroup.DELETE("/message/:id", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_DELETE)), + controller.NewCBC.Delete, + ) + cbcGroup.GET("/message/export", + middleware.AuthorizeUser(nil), + collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.cbcMessage", collectlogs.BUSINESS_TYPE_EXPORT)), + controller.NewCBC.Export, + ) + } +} diff --git a/src/modules/ne_data/repository/cbc_message.go b/src/modules/ne_data_nf/repository/cbc_message.go similarity index 99% rename from src/modules/ne_data/repository/cbc_message.go rename to src/modules/ne_data_nf/repository/cbc_message.go index 274922c7..8d9b984b 100644 --- a/src/modules/ne_data/repository/cbc_message.go +++ b/src/modules/ne_data_nf/repository/cbc_message.go @@ -6,7 +6,7 @@ import ( "time" "be.ems/src/framework/database/db" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" "gorm.io/gorm" ) diff --git a/src/modules/ne_data/repository/cdr_event.go b/src/modules/ne_data_nf/repository/cdr_event.go similarity index 99% rename from src/modules/ne_data/repository/cdr_event.go rename to src/modules/ne_data_nf/repository/cdr_event.go index 2dacc067..8bdd7ad5 100644 --- a/src/modules/ne_data/repository/cdr_event.go +++ b/src/modules/ne_data_nf/repository/cdr_event.go @@ -8,7 +8,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" ) // 实例化数据层 CDREvent 结构体 diff --git a/src/modules/ne_data/repository/udm_auth.go b/src/modules/ne_data_nf/repository/udm_auth.go similarity index 99% rename from src/modules/ne_data/repository/udm_auth.go rename to src/modules/ne_data_nf/repository/udm_auth.go index 99dc6a79..42a333ee 100644 --- a/src/modules/ne_data/repository/udm_auth.go +++ b/src/modules/ne_data_nf/repository/udm_auth.go @@ -6,7 +6,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" ) // 实例化数据层 UDMAuthUser 结构体 diff --git a/src/modules/ne_data/repository/udm_extend.go b/src/modules/ne_data_nf/repository/udm_extend.go similarity index 98% rename from src/modules/ne_data/repository/udm_extend.go rename to src/modules/ne_data_nf/repository/udm_extend.go index 3a59084e..43bfbf7e 100644 --- a/src/modules/ne_data/repository/udm_extend.go +++ b/src/modules/ne_data_nf/repository/udm_extend.go @@ -5,7 +5,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" ) // 实例化数据层 UDMExtend 结构体 diff --git a/src/modules/ne_data/repository/udm_sub.go b/src/modules/ne_data_nf/repository/udm_sub.go similarity index 99% rename from src/modules/ne_data/repository/udm_sub.go rename to src/modules/ne_data_nf/repository/udm_sub.go index 2d7b13fb..28ee447c 100644 --- a/src/modules/ne_data/repository/udm_sub.go +++ b/src/modules/ne_data_nf/repository/udm_sub.go @@ -6,7 +6,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" ) // 实例化数据层 UDMSubUser 结构体 diff --git a/src/modules/ne_data/repository/udm_voip.go b/src/modules/ne_data_nf/repository/udm_voip.go similarity index 99% rename from src/modules/ne_data/repository/udm_voip.go rename to src/modules/ne_data_nf/repository/udm_voip.go index 604fbddd..07feaa5c 100644 --- a/src/modules/ne_data/repository/udm_voip.go +++ b/src/modules/ne_data_nf/repository/udm_voip.go @@ -6,7 +6,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" ) // 实例化数据层 UDMVOIPUser 结构体 diff --git a/src/modules/ne_data/repository/udm_volte_ims.go b/src/modules/ne_data_nf/repository/udm_volte_ims.go similarity index 99% rename from src/modules/ne_data/repository/udm_volte_ims.go rename to src/modules/ne_data_nf/repository/udm_volte_ims.go index 9157e8ce..b93318ae 100644 --- a/src/modules/ne_data/repository/udm_volte_ims.go +++ b/src/modules/ne_data_nf/repository/udm_volte_ims.go @@ -6,7 +6,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" ) // 实例化数据层 UDMVolteIMSUser 结构体 diff --git a/src/modules/ne_data/repository/ue_event.go b/src/modules/ne_data_nf/repository/ue_event.go similarity index 99% rename from src/modules/ne_data/repository/ue_event.go rename to src/modules/ne_data_nf/repository/ue_event.go index 9a734aeb..102d1d78 100644 --- a/src/modules/ne_data/repository/ue_event.go +++ b/src/modules/ne_data_nf/repository/ue_event.go @@ -8,7 +8,7 @@ import ( "be.ems/src/framework/database/db" "be.ems/src/framework/logger" - "be.ems/src/modules/ne_data/model" + "be.ems/src/modules/ne_data_nf/model" ) // 实例化数据层 UEEvent 结构体 diff --git a/src/modules/ne_data/service/cbc_message.go b/src/modules/ne_data_nf/service/cbc_message.go similarity index 99% rename from src/modules/ne_data/service/cbc_message.go rename to src/modules/ne_data_nf/service/cbc_message.go index 8f4463b7..8621a32a 100644 --- a/src/modules/ne_data/service/cbc_message.go +++ b/src/modules/ne_data_nf/service/cbc_message.go @@ -12,8 +12,8 @@ import ( "be.ems/src/framework/i18n" "be.ems/src/framework/utils/file" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" "gorm.io/gorm" ) diff --git a/src/modules/ne_data/service/cdr_event.go b/src/modules/ne_data_nf/service/cdr_event.go similarity index 99% rename from src/modules/ne_data/service/cdr_event.go rename to src/modules/ne_data_nf/service/cdr_event.go index 70b8191b..5da02237 100644 --- a/src/modules/ne_data/service/cdr_event.go +++ b/src/modules/ne_data_nf/service/cdr_event.go @@ -11,8 +11,8 @@ import ( "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/file" "be.ems/src/framework/utils/parse" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" sysService "be.ems/src/modules/system/service" ) diff --git a/src/modules/ne_data/service/udm_auth.go b/src/modules/ne_data_nf/service/udm_auth.go similarity index 98% rename from src/modules/ne_data/service/udm_auth.go rename to src/modules/ne_data_nf/service/udm_auth.go index 220f9f4b..17b78054 100644 --- a/src/modules/ne_data/service/udm_auth.go +++ b/src/modules/ne_data_nf/service/udm_auth.go @@ -9,8 +9,8 @@ import ( "be.ems/src/framework/database/redis" "be.ems/src/framework/utils/date" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" ) // 实例化服务层 UDMAuthUser 结构体 diff --git a/src/modules/ne_data/service/udm_extend.go b/src/modules/ne_data_nf/service/udm_extend.go similarity index 91% rename from src/modules/ne_data/service/udm_extend.go rename to src/modules/ne_data_nf/service/udm_extend.go index 410e5a41..a0b1d070 100644 --- a/src/modules/ne_data/service/udm_extend.go +++ b/src/modules/ne_data_nf/service/udm_extend.go @@ -1,8 +1,8 @@ package service import ( - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" ) // 实例化服务层 UDMExtend 结构体 diff --git a/src/modules/ne_data/service/udm_sub.go b/src/modules/ne_data_nf/service/udm_sub.go similarity index 99% rename from src/modules/ne_data/service/udm_sub.go rename to src/modules/ne_data_nf/service/udm_sub.go index 424042a2..5c722d93 100644 --- a/src/modules/ne_data/service/udm_sub.go +++ b/src/modules/ne_data_nf/service/udm_sub.go @@ -7,8 +7,8 @@ import ( "be.ems/src/framework/database/redis" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" ) // 实例化服务层 UDMSubUser 结构体 diff --git a/src/modules/ne_data/service/udm_voip.go b/src/modules/ne_data_nf/service/udm_voip.go similarity index 98% rename from src/modules/ne_data/service/udm_voip.go rename to src/modules/ne_data_nf/service/udm_voip.go index f4a9afa0..6c57fda1 100644 --- a/src/modules/ne_data/service/udm_voip.go +++ b/src/modules/ne_data_nf/service/udm_voip.go @@ -7,8 +7,8 @@ import ( "be.ems/src/framework/database/redis" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" ) // 实例化服务层 UDMVOIPUser 结构体 diff --git a/src/modules/ne_data/service/udm_volte_ims.go b/src/modules/ne_data_nf/service/udm_volte_ims.go similarity index 98% rename from src/modules/ne_data/service/udm_volte_ims.go rename to src/modules/ne_data_nf/service/udm_volte_ims.go index 8ad98f51..311ee144 100644 --- a/src/modules/ne_data/service/udm_volte_ims.go +++ b/src/modules/ne_data_nf/service/udm_volte_ims.go @@ -7,8 +7,8 @@ import ( "be.ems/src/framework/database/redis" neService "be.ems/src/modules/ne/service" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" ) // 实例化服务层 UDMVolteIMSUser 结构体 diff --git a/src/modules/ne_data/service/ue_event.go b/src/modules/ne_data_nf/service/ue_event.go similarity index 98% rename from src/modules/ne_data/service/ue_event.go rename to src/modules/ne_data_nf/service/ue_event.go index eae4b542..2d6a22ec 100644 --- a/src/modules/ne_data/service/ue_event.go +++ b/src/modules/ne_data_nf/service/ue_event.go @@ -10,8 +10,8 @@ import ( "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/file" "be.ems/src/framework/utils/parse" - "be.ems/src/modules/ne_data/model" - "be.ems/src/modules/ne_data/repository" + "be.ems/src/modules/ne_data_nf/model" + "be.ems/src/modules/ne_data_nf/repository" sysService "be.ems/src/modules/system/service" "github.com/tsmask/go-oam" ) diff --git a/src/modules/ne_data/udm_auth_k4_test.go b/src/modules/ne_data_nf/udm_auth_k4_test.go similarity index 98% rename from src/modules/ne_data/udm_auth_k4_test.go rename to src/modules/ne_data_nf/udm_auth_k4_test.go index f7419d72..5c5490df 100644 --- a/src/modules/ne_data/udm_auth_k4_test.go +++ b/src/modules/ne_data_nf/udm_auth_k4_test.go @@ -1,4 +1,4 @@ -package ne_data +package ne_data_nf import ( "crypto/des" diff --git a/src/modules/oam/controller/api_rest.go b/src/modules/oam/controller/api_rest.go index faca2aae..4b93f470 100644 --- a/src/modules/oam/controller/api_rest.go +++ b/src/modules/oam/controller/api_rest.go @@ -15,9 +15,9 @@ import ( "be.ems/src/framework/resp" "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" neModel "be.ems/src/modules/ne/model" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" oamService "be.ems/src/modules/oam/service" ) diff --git a/src/modules/oam/service/cbs_state.go b/src/modules/oam/service/cbs_state.go index 196fe517..0b117006 100644 --- a/src/modules/oam/service/cbs_state.go +++ b/src/modules/oam/service/cbs_state.go @@ -2,19 +2,19 @@ package service import ( neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + neDataNfService "be.ems/src/modules/ne_data_nf/service" ) // 实例化服务层 CDR 结构体 var NewCBS = &CBS{ neInfoService: neService.NewNeInfo, - cbcMessageService: neDataService.NewCBCMessage, + cbcMessageService: neDataNfService.NewCBCMessage, } // CDR 消息处理 type CBS struct { neInfoService *neService.NeInfo - cbcMessageService *neDataService.CBCMessage // CDR会话事件服务 + cbcMessageService *neDataNfService.CBCMessage // CDR会话事件服务 } type CBSEventData struct { diff --git a/src/modules/oam/service/cdr.go b/src/modules/oam/service/cdr.go index 1fd6b893..5ba4b5be 100644 --- a/src/modules/oam/service/cdr.go +++ b/src/modules/oam/service/cdr.go @@ -7,8 +7,8 @@ import ( "github.com/tsmask/go-oam" neService "be.ems/src/modules/ne/service" - neDataModel "be.ems/src/modules/ne_data/model" - neDataService "be.ems/src/modules/ne_data/service" + neDataNfModel "be.ems/src/modules/ne_data_nf/model" + neDataNfService "be.ems/src/modules/ne_data_nf/service" wsService "be.ems/src/modules/ws/service" ) @@ -16,14 +16,14 @@ import ( var NewCDR = &CDR{ neInfoService: neService.NewNeInfo, wsService: wsService.NewWSSend, - cdrEventService: neDataService.NewCDREvent, + cdrEventService: neDataNfService.NewCDREvent, } // CDR 消息处理 type CDR struct { neInfoService *neService.NeInfo wsService *wsService.WSSend - cdrEventService *neDataService.CDREvent // CDR会话事件服务 + cdrEventService *neDataNfService.CDREvent // CDR会话事件服务 } // Resolve 接收处理 @@ -38,7 +38,7 @@ func (s *CDR) Resolve(c oam.CDR) error { } cdrByte, _ := json.Marshal(c.Data) - cdrEvent := neDataModel.CDREvent{ + cdrEvent := neDataNfModel.CDREvent{ CoreUID: neInfo.CoreUID, NeUID: neInfo.NeUID, NeType: neInfo.NeType, diff --git a/src/modules/oam/service/ue_nb.go b/src/modules/oam/service/ue_nb.go index 8351ee60..9204274e 100644 --- a/src/modules/oam/service/ue_nb.go +++ b/src/modules/oam/service/ue_nb.go @@ -7,8 +7,8 @@ import ( "github.com/tsmask/go-oam" neService "be.ems/src/modules/ne/service" - neDataModel "be.ems/src/modules/ne_data/model" - neDataService "be.ems/src/modules/ne_data/service" + neDataNfModel "be.ems/src/modules/ne_data_nf/model" + neDataNfService "be.ems/src/modules/ne_data_nf/service" wsService "be.ems/src/modules/ws/service" ) @@ -16,14 +16,14 @@ import ( var NewUENB = &UENB{ neInfoService: neService.NewNeInfo, wsService: wsService.NewWSSend, - ueEventService: neDataService.NewUEEvent, + ueEventService: neDataNfService.NewUEEvent, } // UENB 消息处理 type UENB struct { neInfoService *neService.NeInfo wsService *wsService.WSSend - ueEventService *neDataService.UEEvent // UE会话事件服务 + ueEventService *neDataNfService.UEEvent // UE会话事件服务 } // Resolve 接收处理 @@ -35,7 +35,7 @@ func (s *UENB) Resolve(u oam.UENB) error { } uenbByte, _ := json.Marshal(u) - uenbEvent := neDataModel.UEEvent{ + uenbEvent := neDataNfModel.UEEvent{ CoreUID: neInfo.CoreUID, NeUID: neInfo.NeUID, NeType: neInfo.NeType, diff --git a/src/modules/trace/service/trace_task.go b/src/modules/trace/service/trace_task.go index a70f8c4a..14d3bd8f 100644 --- a/src/modules/trace/service/trace_task.go +++ b/src/modules/trace/service/trace_task.go @@ -12,9 +12,9 @@ import ( "be.ems/src/framework/logger" "be.ems/src/framework/utils/date" "be.ems/src/framework/utils/parse" - neFetchlink "be.ems/src/modules/ne/fetch_link" neModel "be.ems/src/modules/ne/model" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" "be.ems/src/modules/trace/model" "be.ems/src/modules/trace/repository" wsService "be.ems/src/modules/ws/service" diff --git a/src/modules/trace/service/trace_task_hlr.go b/src/modules/trace/service/trace_task_hlr.go index c8a56d6a..202bfda2 100644 --- a/src/modules/trace/service/trace_task_hlr.go +++ b/src/modules/trace/service/trace_task_hlr.go @@ -7,9 +7,9 @@ import ( "be.ems/src/framework/ssh" "be.ems/src/framework/utils/date" - neFetchlink "be.ems/src/modules/ne/fetch_link" neModel "be.ems/src/modules/ne/model" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" "be.ems/src/modules/trace/model" "be.ems/src/modules/trace/repository" ) diff --git a/src/modules/ws/processor/cdr_connect.go b/src/modules/ws/processor/cdr_connect.go index cf124215..ea494eac 100644 --- a/src/modules/ws/processor/cdr_connect.go +++ b/src/modules/ws/processor/cdr_connect.go @@ -7,7 +7,7 @@ import ( "be.ems/src/framework/logger" "be.ems/src/framework/resp" neInfoService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + neDataNfService "be.ems/src/modules/ne_data_nf/service" ) // GetCDRConnect 获取CDR会话事件 @@ -33,7 +33,7 @@ func GetCDRConnect(requestID string, data any) ([]byte, error) { if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid { return nil, fmt.Errorf("query neinfo not found") } - rows, total := neDataService.NewCDREvent.FindByPage(neInfo.NeType, query) + rows, total := neDataNfService.NewCDREvent.FindByPage(neInfo.NeType, query) resultByte, err := json.Marshal(resp.Ok(map[string]any{ "requestId": requestID, "data": map[string]any{"rows": rows, "total": total}, diff --git a/src/modules/ws/processor/ne_state.go b/src/modules/ws/processor/ne_state.go index fd6614ac..84b3a765 100644 --- a/src/modules/ws/processor/ne_state.go +++ b/src/modules/ws/processor/ne_state.go @@ -6,8 +6,8 @@ import ( "be.ems/src/framework/logger" "be.ems/src/framework/resp" - neFetchlink "be.ems/src/modules/ne/fetch_link" neService "be.ems/src/modules/ne/service" + neFetchlink "be.ems/src/modules/ne_data_nf/fetch_link" ) // GetNeState 获取网元服务状态 diff --git a/src/modules/ws/processor/ue_connect.go b/src/modules/ws/processor/ue_connect.go index 0b9bbe36..a5353cef 100644 --- a/src/modules/ws/processor/ue_connect.go +++ b/src/modules/ws/processor/ue_connect.go @@ -7,7 +7,7 @@ import ( "be.ems/src/framework/logger" "be.ems/src/framework/resp" neService "be.ems/src/modules/ne/service" - neDataService "be.ems/src/modules/ne_data/service" + neDataNfService "be.ems/src/modules/ne_data_nf/service" ) // GetUEConnect 获取UE会话事件 @@ -33,7 +33,7 @@ func GetUEConnect(requestID string, data any) ([]byte, error) { if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid { return nil, fmt.Errorf("query neinfo not found") } - rows, total := neDataService.NewUEEvent.FindByPage(neInfo.NeType, query) + rows, total := neDataNfService.NewUEEvent.FindByPage(neInfo.NeType, query) resultByte, err := json.Marshal(resp.Ok(map[string]any{ "requestId": requestID, "data": map[string]any{"rows": rows, "total": total},