From cfe6ab61e3e6032e4fd3154634c601c87edba58c Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 10 Jun 2025 17:50:54 +0800 Subject: [PATCH] =?UTF-8?q?ref:=20=E5=A4=9Acore=E8=A1=A8=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/database/std/install/alarm.sql | 21 +- build/database/std/install/alarm_event.sql | 16 +- .../std/install/alarm_forward_log.sql | 11 +- build/database/std/install/alarm_log.sql | 9 +- build/database/std/install/cdr_event.sql | 9 +- build/database/std/install/cdr_event_ims.sql | 9 +- build/database/std/install/cdr_event_sgwc.sql | 9 +- build/database/std/install/cdr_event_smf.sql | 9 +- build/database/std/install/cdr_event_smsc.sql | 9 +- build/database/std/install/core_info.sql | 20 ++ build/database/std/install/kpi_c_report.sql | 9 +- .../database/std/install/kpi_c_report_amf.sql | 14 +- .../std/install/kpi_c_report_ausf.sql | 14 +- .../database/std/install/kpi_c_report_cbc.sql | 14 +- .../database/std/install/kpi_c_report_hlr.sql | 14 +- .../database/std/install/kpi_c_report_ims.sql | 14 +- .../database/std/install/kpi_c_report_mme.sql | 14 +- .../std/install/kpi_c_report_mocngw.sql | 14 +- .../std/install/kpi_c_report_nssf.sql | 14 +- .../database/std/install/kpi_c_report_pcf.sql | 14 +- .../database/std/install/kpi_c_report_smf.sql | 14 +- .../std/install/kpi_c_report_smsc.sql | 14 +- .../database/std/install/kpi_c_report_udm.sql | 14 +- .../database/std/install/kpi_c_report_upf.sql | 14 +- build/database/std/install/kpi_report.sql | 14 +- build/database/std/install/kpi_report_amf.sql | 14 +- .../database/std/install/kpi_report_ausf.sql | 14 +- build/database/std/install/kpi_report_cbc.sql | 14 +- build/database/std/install/kpi_report_hlr.sql | 14 +- build/database/std/install/kpi_report_ims.sql | 14 +- build/database/std/install/kpi_report_mme.sql | 14 +- .../std/install/kpi_report_mocngw.sql | 14 +- .../database/std/install/kpi_report_nssf.sql | 14 +- build/database/std/install/kpi_report_pcf.sql | 14 +- build/database/std/install/kpi_report_smf.sql | 14 +- .../database/std/install/kpi_report_smsc.sql | 14 +- build/database/std/install/kpi_report_udm.sql | 14 +- build/database/std/install/kpi_report_upf.sql | 14 +- build/database/std/install/mml_log.sql | 31 +- build/database/std/install/nb_state.sql | 12 +- .../database/std/install/ne_config_backup.sql | 11 +- build/database/std/install/ne_host.sql | 11 - build/database/std/install/ne_host_cmd.sql | 9 - build/database/std/install/ne_info.sql | 24 +- build/database/std/install/ne_license.sql | 21 +- build/database/std/install/ne_software.sql | 7 - build/database/std/install/ne_state.sql | 12 +- build/database/std/install/ne_version.sql | 19 +- build/database/std/install/trace_task.sql | 6 +- build/database/std/install/udm_auth.sql | 10 +- build/database/std/install/udm_extend.sql | 10 +- build/database/std/install/udm_sub.sql | 10 +- build/database/std/install/udm_voip.sql | 10 +- build/database/std/install/udm_volte_ims.sql | 12 +- build/database/std/install/ue_event.sql | 11 +- build/database/std/install/ue_event_amf.sql | 9 +- build/database/std/install/ue_event_mme.sql | 9 +- features/cdr/cdrevent.go | 12 +- features/cm/ne.go | 321 ----------------- features/cm/param.go | 208 ----------- features/event/event.go | 14 +- features/fm/alarm.go | 74 ++-- features/fm/smsforward.go | 5 +- features/mml/mml.go | 16 +- features/pm/performance.go | 39 +- features/ue/ue.go | 14 +- lib/dborm/dborm.go | 8 +- lib/routes/routes.go | 23 -- src/framework/telnet/telnet.go | 2 +- src/framework/utils/machine/launch.go | 33 +- .../backup_export_cdr/backup_export_cdr.go | 52 +-- .../backup_export_table.go | 16 +- .../backup_export_udm/backup_export_udm.go | 32 +- .../delete_ne_config_backup.go | 23 +- .../ne_alarm_state_check.go | 26 +- .../ne_alarm_state_check_cmd.go | 41 ++- .../ne_alarm_state_check_license.go | 26 +- .../ne_config_backup/ne_config_backup.go | 5 +- .../processor/ne_data_udm/ne_data_udm.go | 4 +- .../network_data/controller/all_kpi.go | 11 - .../network_data/controller/all_nb_state.go | 17 +- src/modules/network_data/controller/amf.go | 40 +-- src/modules/network_data/controller/ims.go | 42 +-- src/modules/network_data/controller/mme.go | 40 +-- src/modules/network_data/controller/pcf.go | 50 +-- src/modules/network_data/controller/sgwc.go | 17 +- src/modules/network_data/controller/smf.go | 33 +- src/modules/network_data/controller/smsc.go | 17 +- .../network_data/controller/udm_auth.go | 312 ++++++---------- .../network_data/controller/udm_sub.go | 312 ++++++---------- .../network_data/controller/udm_voip.go | 286 ++++++--------- .../network_data/controller/udm_volte_ims.go | 338 +++++++----------- src/modules/network_data/controller/upf.go | 18 +- src/modules/network_data/model/alarm.go | 13 +- src/modules/network_data/model/alarm_event.go | 6 +- .../network_data/model/alarm_forward_log.go | 8 +- src/modules/network_data/model/alarm_log.go | 8 +- .../network_data/model/cdr_event_ims.go | 18 +- .../network_data/model/cdr_event_sgwc.go | 10 +- .../network_data/model/cdr_event_smf.go | 12 +- .../network_data/model/cdr_event_smsc.go | 18 +- .../network_data/model/kpi_c_report.go | 10 +- src/modules/network_data/model/kpi_report.go | 16 +- src/modules/network_data/model/nb_state.go | 12 +- src/modules/network_data/model/ne_state.go | 10 +- src/modules/network_data/model/udm_auth.go | 4 +- src/modules/network_data/model/udm_extend.go | 12 +- src/modules/network_data/model/udm_sub.go | 10 +- src/modules/network_data/model/udm_voip.go | 6 +- .../network_data/model/udm_volte_ims.go | 10 +- .../network_data/model/ue_event_amf.go | 18 +- .../network_data/model/ue_event_mme.go | 18 +- src/modules/network_data/network_data.go | 76 +--- src/modules/network_data/repository/alarm.go | 26 +- .../network_data/repository/alarm_event.go | 18 +- .../repository/alarm_forward_log.go | 7 +- .../network_data/repository/alarm_log.go | 7 +- .../network_data/repository/cdr_event_ims.go | 7 +- .../network_data/repository/cdr_event_sgwc.go | 7 +- .../network_data/repository/cdr_event_smf.go | 7 +- .../network_data/repository/cdr_event_smsc.go | 7 +- .../network_data/repository/kpi_c_report.go | 10 +- .../network_data/repository/kpi_report.go | 16 +- .../network_data/repository/nb_state.go | 8 +- .../network_data/repository/ne_state.go | 7 +- .../network_data/repository/udm_auth.go | 39 +- .../network_data/repository/udm_extend.go | 37 +- .../network_data/repository/udm_sub.go | 42 ++- .../network_data/repository/udm_voip.go | 41 ++- .../network_data/repository/udm_volte_ims.go | 41 ++- .../network_data/repository/ue_event_amf.go | 7 +- .../network_data/repository/ue_event_mme.go | 7 +- src/modules/network_data/service/alarm.go | 8 +- .../network_data/service/alarm_event.go | 4 +- .../network_data/service/cdr_event_ims.go | 2 +- .../network_data/service/cdr_event_sgwc.go | 4 +- .../network_data/service/cdr_event_smf.go | 4 +- .../network_data/service/cdr_event_smsc.go | 2 +- .../network_data/service/kpi_c_report.go | 4 +- .../network_data/service/kpi_report.go | 18 +- src/modules/network_data/service/udm_auth.go | 51 +-- .../network_data/service/udm_extend.go | 10 +- src/modules/network_data/service/udm_sub.go | 89 ++--- src/modules/network_data/service/udm_voip.go | 49 +-- .../network_data/service/udm_volte_ims.go | 64 ++-- .../network_element/controller/action.go | 74 ++-- .../network_element/controller/ne_config.go | 56 +-- .../controller/ne_config_backup.go | 23 +- .../network_element/controller/ne_info.go | 105 +++--- .../network_element/controller/ne_license.go | 32 +- .../network_element/controller/ne_version.go | 8 +- .../network_element/fetch_link/alarm.go | 2 +- src/modules/network_element/fetch_link/amf.go | 4 +- src/modules/network_element/fetch_link/hlr.go | 4 +- src/modules/network_element/fetch_link/ims.go | 4 +- src/modules/network_element/fetch_link/mme.go | 4 +- .../network_element/fetch_link/ne_config.go | 14 +- .../network_element/fetch_link/ne_state.go | 7 +- .../network_element/fetch_link/ne_trace.go | 4 +- src/modules/network_element/fetch_link/pcf.go | 18 +- src/modules/network_element/fetch_link/smf.go | 4 +- .../network_element/model/core_info.go | 20 ++ .../network_element/model/ne_config_backup.go | 19 +- src/modules/network_element/model/ne_info.go | 10 +- .../network_element/model/ne_license.go | 5 +- .../network_element/model/ne_version.go | 33 +- .../network_element/network_element.go | 18 +- .../network_element/repository/ne_info.go | 40 ++- .../network_element/repository/ne_license.go | 12 +- .../network_element/repository/ne_version.go | 12 +- .../service/ne_config_backup.go | 16 +- .../network_element/service/ne_info.go | 226 ++++++------ .../network_element/service/ne_license.go | 26 +- .../network_element/service/ne_version.go | 47 ++- src/modules/tool/controller/iperf.go | 22 +- src/modules/tool/controller/ping.go | 16 +- src/modules/tool/service/iperf.go | 8 +- src/modules/tool/service/ping.go | 4 +- src/modules/trace/controller/tcpdump.go | 22 +- .../trace/controller/trace_task_hlr.go | 12 +- src/modules/trace/model/trace_task.go | 3 +- src/modules/trace/service/tcpdump.go | 40 +-- src/modules/trace/service/trace_task.go | 42 +-- src/modules/trace/service/trace_task_hlr.go | 25 +- src/modules/ws/controller/ws_view.go | 10 +- src/modules/ws/processor/cdr_connect.go | 22 +- src/modules/ws/processor/ne_state.go | 23 +- src/modules/ws/processor/ue_connect.go | 15 +- src/modules/ws/processor/upf_total_flow.go | 18 +- 189 files changed, 2159 insertions(+), 3195 deletions(-) create mode 100644 build/database/std/install/core_info.sql delete mode 100644 features/cm/param.go create mode 100644 src/modules/network_element/model/core_info.go diff --git a/build/database/std/install/alarm.sql b/build/database/std/install/alarm.sql index cd132c3a..82a94b45 100644 --- a/build/database/std/install/alarm.sql +++ b/build/database/std/install/alarm.sql @@ -1,18 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for alarm -- ---------------------------- - DROP TABLE IF EXISTS `alarm`; CREATE TABLE `alarm` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型', - `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID', - `ne_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元名称', - `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元省份地域', - `pv_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元标识虚拟化标识', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `alarm_seq` int DEFAULT '0' COMMENT '告警序号 同网元类型连续递增', `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '告警ID', `alarm_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '告警标题', @@ -37,10 +31,7 @@ CREATE TABLE `alarm` ( `clear_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '清除用户', `timestamp` bigint DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_uni_aid_ne_aseq` (`ne_type`,`ne_id`,`alarm_id`,`alarm_seq`) USING BTREE, - KEY `idx_status_severity_time` (`alarm_status`,`orig_severity`,`event_time`) USING BTREE + UNIQUE KEY `uk_alarm_aid_aseq_atype` (`ne_uid`, `alarm_id`, `alarm_seq`, `alarm_type`) USING BTREE COMMENT '唯一网元资源产生的ID与序号与状态', + KEY `idx_alarm_status_severity_time` (`alarm_status`,`orig_severity`,`event_time`) USING BTREE COMMENT '索引-告警状态_告警级别_事件时间', + KEY `idx_alarm_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警_记录表'; - -SET FOREIGN_KEY_CHECKS = 1; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/alarm_event.sql b/build/database/std/install/alarm_event.sql index a9175d33..837071ee 100644 --- a/build/database/std/install/alarm_event.sql +++ b/build/database/std/install/alarm_event.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for alarm_event -- ---------------------------- - DROP TABLE IF EXISTS `alarm_event`; CREATE TABLE `alarm_event` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型', - `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `alarm_seq` int DEFAULT '0' COMMENT '告警序号 同网元类型连续递增', `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '告警ID', `alarm_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '告警标题', @@ -28,10 +25,9 @@ CREATE TABLE `alarm_event` ( `clear_user` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '清除用户', `timestamp` bigint DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_ti_aid_aseq` (`ne_type`,`ne_id`,`alarm_id`,`alarm_seq`) USING BTREE, - KEY `idx_astatus_etime` (`alarm_status`,`event_time`) USING BTREE + UNIQUE KEY `uk_aevent_aid_aseq` (`ne_uid`, `alarm_id`, `alarm_seq`) USING BTREE COMMENT '唯一网元资源产生的ID与序号与状态', + KEY `idx_aevent_status_etime` (`alarm_status`,`event_time`) USING BTREE COMMENT '索引-告警状态_事件时间', + KEY `idx_aevent_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警_事件记录表'; -SET FOREIGN_KEY_CHECKS = 1; - -- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/alarm_forward_log.sql b/build/database/std/install/alarm_forward_log.sql index 5fd2fe30..6db3b229 100644 --- a/build/database/std/install/alarm_forward_log.sql +++ b/build/database/std/install/alarm_forward_log.sql @@ -1,6 +1,3 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `alarm_forward_log` -- @@ -8,8 +5,9 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `alarm_forward_log`; CREATE TABLE `alarm_forward_log` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `alarm_seq` int DEFAULT '0' COMMENT '告警序号 同网元类型连续递增', `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '告警ID', `alarm_code` int DEFAULT '0' COMMENT '告警状态码', @@ -22,7 +20,8 @@ CREATE TABLE `alarm_forward_log` ( `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '转发方式 SMS/EMAIL', `target` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '发送目标用户', `result` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '发送结果', - PRIMARY KEY (`id`) USING BTREE + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_aforward_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警_转发日志记录'; SET FOREIGN_KEY_CHECKS=1; diff --git a/build/database/std/install/alarm_log.sql b/build/database/std/install/alarm_log.sql index 2aa760ea..31b71782 100644 --- a/build/database/std/install/alarm_log.sql +++ b/build/database/std/install/alarm_log.sql @@ -1,4 +1,3 @@ --- MariaDB dump 10.19 Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64) -- -- Table structure for table `alarm_log` -- @@ -6,8 +5,9 @@ DROP TABLE IF EXISTS `alarm_log`; CREATE TABLE `alarm_log` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `alarm_seq` int DEFAULT '0' COMMENT '告警序号 同网元类型连续递增', `alarm_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '告警ID', `alarm_code` int DEFAULT '0' COMMENT '告警状态码', @@ -17,7 +17,8 @@ CREATE TABLE `alarm_log` ( `orig_severity` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '3' COMMENT '严重程度 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)', `event_time` bigint DEFAULT '0' COMMENT '事件产生时间 秒级', `created_at` bigint DEFAULT '0' COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_alog_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='告警_日志记录'; -- Dump completed on 2024-02-18 18:26:55 diff --git a/build/database/std/install/cdr_event.sql b/build/database/std/install/cdr_event.sql index 3dc58836..1e807384 100644 --- a/build/database/std/install/cdr_event.sql +++ b/build/database/std/install/cdr_event.sql @@ -7,14 +7,15 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `cdr_event`; CREATE TABLE `cdr_event` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '0' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_uid_t` (`rm_uid`,`timestamp`) USING BTREE + KEY `idx_cdr_uid_t` (`ne_uid`,`timestamp`) USING BTREE, + KEY `idx_cdr_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='CDR事件_基础表结构'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/cdr_event_ims.sql b/build/database/std/install/cdr_event_ims.sql index 61a89b7d..764f255d 100644 --- a/build/database/std/install/cdr_event_ims.sql +++ b/build/database/std/install/cdr_event_ims.sql @@ -7,14 +7,15 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `cdr_event_ims`; CREATE TABLE `cdr_event_ims` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '0' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_ims_uid_t` (`rm_uid`,`timestamp`) USING BTREE + KEY `idx_cdr_ims_uid_t` (`ne_uid`,`timestamp`) USING BTREE, + KEY `idx_cdr_ims_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='CDR事件_IMS'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/cdr_event_sgwc.sql b/build/database/std/install/cdr_event_sgwc.sql index 948db3b1..b3461d24 100644 --- a/build/database/std/install/cdr_event_sgwc.sql +++ b/build/database/std/install/cdr_event_sgwc.sql @@ -7,14 +7,15 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `cdr_event_sgwc`; CREATE TABLE `cdr_event_sgwc` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '0' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_sgwc_uid_t` (`rm_uid`,`timestamp`) USING BTREE + KEY `idx_cdr_sgwc_uid_t` (`ne_uid`,`timestamp`) USING BTREE, + KEY `idx_cdr_sgwc_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='CDR事件_SGWC'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/cdr_event_smf.sql b/build/database/std/install/cdr_event_smf.sql index 9f84c37a..20ebd5e4 100644 --- a/build/database/std/install/cdr_event_smf.sql +++ b/build/database/std/install/cdr_event_smf.sql @@ -7,14 +7,15 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `cdr_event_smf`; CREATE TABLE `cdr_event_smf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '0' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_smf_uid_t` (`rm_uid`,`timestamp`) USING BTREE + KEY `idx_cdr_smf_uid_t` (`ne_uid`,`timestamp`) USING BTREE, + KEY `idx_cdr_smf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='CDR事件_SMF'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/cdr_event_smsc.sql b/build/database/std/install/cdr_event_smsc.sql index cdbd3f3d..7e0fc75b 100644 --- a/build/database/std/install/cdr_event_smsc.sql +++ b/build/database/std/install/cdr_event_smsc.sql @@ -7,14 +7,15 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `cdr_event_smsc`; CREATE TABLE `cdr_event_smsc` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '0' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `cdr_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_smsc_uid_t` (`rm_uid`,`timestamp`) USING BTREE + KEY `idx_cdr_smsc_uid_t` (`ne_uid`,`timestamp`) USING BTREE, + KEY `idx_cdr_smsc_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='CDR事件_SMSC'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/core_info.sql b/build/database/std/install/core_info.sql new file mode 100644 index 00000000..4cdf5f85 --- /dev/null +++ b/build/database/std/install/core_info.sql @@ -0,0 +1,20 @@ +-- +-- Table structure for table `core_info` +-- +DROP TABLE IF EXISTS `core_info`; +CREATE TABLE `core_info` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '核心网ID', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `core_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网名称', + `core_sn` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网序列号', + `omc_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'OMC安装生成的唯一编码', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者', + `create_time` bigint DEFAULT '0' COMMENT '创建时间', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', + `update_time` bigint DEFAULT '0' COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE KEY `uk_core_name_sn` (`core_name`,`core_sn`) USING BTREE COMMENT '唯一名称和序号定义' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='核心网_基础信息表'; + +-- Dump completed on 2025-06-04 15:26:56 diff --git a/build/database/std/install/kpi_c_report.sql b/build/database/std/install/kpi_c_report.sql index 51728a56..92bce9e1 100644 --- a/build/database/std/install/kpi_c_report.sql +++ b/build/database/std/install/kpi_c_report.sql @@ -7,9 +7,9 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `kpi_c_report`; CREATE TABLE `kpi_c_report` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +18,8 @@ CREATE TABLE `kpi_c_report` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_c_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据记录基础表结构'; SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_amf.sql b/build/database/std/install/kpi_c_report_amf.sql index 0372832c..207f4c0d 100644 --- a/build/database/std/install/kpi_c_report_amf.sql +++ b/build/database/std/install/kpi_c_report_amf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_amf -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_amf`; CREATE TABLE `kpi_c_report_amf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_amf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_amf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_amf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_amf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_AMF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_ausf.sql b/build/database/std/install/kpi_c_report_ausf.sql index 9ecf25ee..90977bb5 100644 --- a/build/database/std/install/kpi_c_report_ausf.sql +++ b/build/database/std/install/kpi_c_report_ausf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_ausf -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_ausf`; CREATE TABLE `kpi_c_report_ausf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_ausf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_ausf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_ausf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_ausf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_AUSF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_cbc.sql b/build/database/std/install/kpi_c_report_cbc.sql index cc24a082..82fdc31a 100644 --- a/build/database/std/install/kpi_c_report_cbc.sql +++ b/build/database/std/install/kpi_c_report_cbc.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_cbc -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_cbc`; CREATE TABLE `kpi_c_report_cbc` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_cbc` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_cbc_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_cbc_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_cbc_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_CBC'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_hlr.sql b/build/database/std/install/kpi_c_report_hlr.sql index 4716ae0d..d046d40e 100644 --- a/build/database/std/install/kpi_c_report_hlr.sql +++ b/build/database/std/install/kpi_c_report_hlr.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_hlr -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_hlr`; CREATE TABLE `kpi_c_report_hlr` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_hlr` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_hlr_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_hlr_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_hlr_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_HLR'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_ims.sql b/build/database/std/install/kpi_c_report_ims.sql index 4280d221..937d28b1 100644 --- a/build/database/std/install/kpi_c_report_ims.sql +++ b/build/database/std/install/kpi_c_report_ims.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_ims -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_ims`; CREATE TABLE `kpi_c_report_ims` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_ims` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_ims_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_ims_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_ims_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_IMS'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_mme.sql b/build/database/std/install/kpi_c_report_mme.sql index 0e9fdb68..938f2c99 100644 --- a/build/database/std/install/kpi_c_report_mme.sql +++ b/build/database/std/install/kpi_c_report_mme.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_mme -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_mme`; CREATE TABLE `kpi_c_report_mme` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_mme` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_mme_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_mme_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_mme_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_MME'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_mocngw.sql b/build/database/std/install/kpi_c_report_mocngw.sql index 21635fc3..4bbb43c5 100644 --- a/build/database/std/install/kpi_c_report_mocngw.sql +++ b/build/database/std/install/kpi_c_report_mocngw.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_mocngw -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_mocngw`; CREATE TABLE `kpi_c_report_mocngw` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_mocngw` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_mocngw_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_mocngw_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_mocngw_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_MOCNGW'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_nssf.sql b/build/database/std/install/kpi_c_report_nssf.sql index edb5e694..ea540401 100644 --- a/build/database/std/install/kpi_c_report_nssf.sql +++ b/build/database/std/install/kpi_c_report_nssf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_nssf -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_nssf`; CREATE TABLE `kpi_c_report_nssf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_nssf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_nssf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_nssf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_nssf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_NSSF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_pcf.sql b/build/database/std/install/kpi_c_report_pcf.sql index 8b2632d1..80077a06 100644 --- a/build/database/std/install/kpi_c_report_pcf.sql +++ b/build/database/std/install/kpi_c_report_pcf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_pcf -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_pcf`; CREATE TABLE `kpi_c_report_pcf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_pcf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_pcf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_pcf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_pcf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_PCF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_smf.sql b/build/database/std/install/kpi_c_report_smf.sql index 4d811013..f15fe4a2 100644 --- a/build/database/std/install/kpi_c_report_smf.sql +++ b/build/database/std/install/kpi_c_report_smf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_smf -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_smf`; CREATE TABLE `kpi_c_report_smf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_smf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_smf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_smf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_smf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_SMF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_smsc.sql b/build/database/std/install/kpi_c_report_smsc.sql index a4751294..343b737c 100644 --- a/build/database/std/install/kpi_c_report_smsc.sql +++ b/build/database/std/install/kpi_c_report_smsc.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_smsc -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_smsc`; CREATE TABLE `kpi_c_report_smsc` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_smsc` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_smsc_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_smsc_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_smsc_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_SMSC'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_udm.sql b/build/database/std/install/kpi_c_report_udm.sql index 676ad803..86be08e4 100644 --- a/build/database/std/install/kpi_c_report_udm.sql +++ b/build/database/std/install/kpi_c_report_udm.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_udm -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_udm`; CREATE TABLE `kpi_c_report_udm` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_udm` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_udm_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_udm_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_udm_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_UDM'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_c_report_upf.sql b/build/database/std/install/kpi_c_report_upf.sql index 1a2c4682..0b1791f4 100644 --- a/build/database/std/install/kpi_c_report_upf.sql +++ b/build/database/std/install/kpi_c_report_upf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_c_report_upf -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_report_upf`; CREATE TABLE `kpi_c_report_upf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_c_report_upf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_c_upf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpic_upf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpic_upf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_自定义指标数据_UPF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report.sql b/build/database/std/install/kpi_report.sql index c1e32f3e..cfb8769e 100644 --- a/build/database/std/install/kpi_report.sql +++ b/build/database/std/install/kpi_report.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report -- ---------------------------- DROP TABLE IF EXISTS `kpi_report`; CREATE TABLE `kpi_report` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据记录基础表'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_amf.sql b/build/database/std/install/kpi_report_amf.sql index a73c8804..748c47b0 100644 --- a/build/database/std/install/kpi_report_amf.sql +++ b/build/database/std/install/kpi_report_amf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_amf -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_amf`; CREATE TABLE `kpi_report_amf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_amf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_amf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_amf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_amf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_AMF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_ausf.sql b/build/database/std/install/kpi_report_ausf.sql index 9013115c..e1df127f 100644 --- a/build/database/std/install/kpi_report_ausf.sql +++ b/build/database/std/install/kpi_report_ausf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_ausf -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_ausf`; CREATE TABLE `kpi_report_ausf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_ausf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_ausf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_ausf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_ausf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_AUSF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_cbc.sql b/build/database/std/install/kpi_report_cbc.sql index 5faac6cf..184b442c 100644 --- a/build/database/std/install/kpi_report_cbc.sql +++ b/build/database/std/install/kpi_report_cbc.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_cbc -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_cbc`; CREATE TABLE `kpi_report_cbc` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_cbc` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_cbc_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_cbc_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_cbc_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_CBC'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_hlr.sql b/build/database/std/install/kpi_report_hlr.sql index 48e101e0..395be0e3 100644 --- a/build/database/std/install/kpi_report_hlr.sql +++ b/build/database/std/install/kpi_report_hlr.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_hlr -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_hlr`; CREATE TABLE `kpi_report_hlr` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_hlr` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_hlr_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_hlr_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_hlr_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_HLR'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_ims.sql b/build/database/std/install/kpi_report_ims.sql index 5ee4b15f..f7d2bfd0 100644 --- a/build/database/std/install/kpi_report_ims.sql +++ b/build/database/std/install/kpi_report_ims.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_ims -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_ims`; CREATE TABLE `kpi_report_ims` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_ims` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_ims_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_ims_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_ims_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_IMS'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_mme.sql b/build/database/std/install/kpi_report_mme.sql index 02024561..bbf7c7ec 100644 --- a/build/database/std/install/kpi_report_mme.sql +++ b/build/database/std/install/kpi_report_mme.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_mme -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_mme`; CREATE TABLE `kpi_report_mme` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_mme` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_mme_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_mme_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_mme_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_MME'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_mocngw.sql b/build/database/std/install/kpi_report_mocngw.sql index 8adbbc71..00af672c 100644 --- a/build/database/std/install/kpi_report_mocngw.sql +++ b/build/database/std/install/kpi_report_mocngw.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_mocngw -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_mocngw`; CREATE TABLE `kpi_report_mocngw` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_mocngw` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_mocngw_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_mocngw_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_mocngw_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_MOCNGW'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_nssf.sql b/build/database/std/install/kpi_report_nssf.sql index c0884abd..dbd655f6 100644 --- a/build/database/std/install/kpi_report_nssf.sql +++ b/build/database/std/install/kpi_report_nssf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_nssf -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_nssf`; CREATE TABLE `kpi_report_nssf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_nssf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_nssf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_nssf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_nssf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_NSSF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_pcf.sql b/build/database/std/install/kpi_report_pcf.sql index d67e8c00..88ffc0f8 100644 --- a/build/database/std/install/kpi_report_pcf.sql +++ b/build/database/std/install/kpi_report_pcf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_pcf -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_pcf`; CREATE TABLE `kpi_report_pcf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_pcf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_pcf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_pcf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_pcf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_PCF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_smf.sql b/build/database/std/install/kpi_report_smf.sql index 6f2f3fbe..2b631519 100644 --- a/build/database/std/install/kpi_report_smf.sql +++ b/build/database/std/install/kpi_report_smf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_smf -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_smf`; CREATE TABLE `kpi_report_smf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_smf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_smf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_smf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_smf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_SMF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_smsc.sql b/build/database/std/install/kpi_report_smsc.sql index 8f07e154..227677a5 100644 --- a/build/database/std/install/kpi_report_smsc.sql +++ b/build/database/std/install/kpi_report_smsc.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_smsc -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_smsc`; CREATE TABLE `kpi_report_smsc` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_smsc` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_smsc_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_smsc_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_smsc_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_SMSC'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_udm.sql b/build/database/std/install/kpi_report_udm.sql index 5dbc1cd1..fcc421d3 100644 --- a/build/database/std/install/kpi_report_udm.sql +++ b/build/database/std/install/kpi_report_udm.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_udm -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_udm`; CREATE TABLE `kpi_report_udm` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_udm` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_udm_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_udm_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_udm_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_UDM'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/kpi_report_upf.sql b/build/database/std/install/kpi_report_upf.sql index 28361e26..e895795c 100644 --- a/build/database/std/install/kpi_report_upf.sql +++ b/build/database/std/install/kpi_report_upf.sql @@ -1,15 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- ---------------------------- -- Table structure for kpi_report_upf -- ---------------------------- DROP TABLE IF EXISTS `kpi_report_upf`; CREATE TABLE `kpi_report_upf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `date` varchar(10) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Date of the report yyyy-mm-dd hh:mi:ss', `start_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'Start time of the report hh:mi:ss', `end_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'End time of the report hh:mi:ss', @@ -18,7 +15,6 @@ CREATE TABLE `kpi_report_upf` ( `kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT 'KPI values JSON String', `created_at` bigint DEFAULT '0' COMMENT 'Creation time 接收到的timestamp秒级存储毫秒时间戳', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_upf_uid_at` (`rm_uid`,`created_at`) USING BTREE + KEY `idx_kpi_upf_uid_at` (`ne_uid`,`created_at`) USING BTREE, + KEY `idx_kpi_upf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='KPI_指标数据_UPF'; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/build/database/std/install/mml_log.sql b/build/database/std/install/mml_log.sql index e6a817c9..ec7e1507 100644 --- a/build/database/std/install/mml_log.sql +++ b/build/database/std/install/mml_log.sql @@ -1,27 +1,8 @@ --- MariaDB dump 10.19 Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: 192.168.2.219 Database: omc_db --- ------------------------------------------------------ --- Server version 10.3.38-MariaDB - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -- -- Table structure for table `mml_log` -- DROP TABLE IF EXISTS `mml_log`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `mml_log` ( `id` int(11) NOT NULL AUTO_INCREMENT, `user` varchar(32) DEFAULT NULL, @@ -32,16 +13,6 @@ CREATE TABLE `mml_log` ( `result` varchar(2048) DEFAULT NULL, `log_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; -- Dump completed on 2024-03-06 17:26:56 diff --git a/build/database/std/install/nb_state.sql b/build/database/std/install/nb_state.sql index 981a96a6..79425bd6 100644 --- a/build/database/std/install/nb_state.sql +++ b/build/database/std/install/nb_state.sql @@ -1,13 +1,12 @@ -- -- Table structure for table `nb_state` -- - DROP TABLE IF EXISTS `nb_state`; CREATE TABLE `nb_state` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型 AMF MME', - `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID', - `rm_uid` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '资源唯一标识', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `create_time` bigint DEFAULT '0' COMMENT '创建时间', `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '基站IP地址', `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '基站名称', @@ -16,7 +15,6 @@ CREATE TABLE `nb_state` ( `state` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'OFF' COMMENT '基站状态 OFF ON', `time` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '状态时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_state_type_id_uid_cat` (`ne_type`,`ne_id`,`rm_uid`,`create_time`) USING BTREE COMMENT '唯一网元类型和ID' + KEY `idx_nbst_ne_time` (`ne_uid`,`create_time`) USING BTREE COMMENT '状态时间', + KEY `idx_nbst_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='基站_状态记录表'; - --- Dump completed on 2025-02-08 12:50:13 diff --git a/build/database/std/install/ne_config_backup.sql b/build/database/std/install/ne_config_backup.sql index f185b1d5..5d01d8e8 100644 --- a/build/database/std/install/ne_config_backup.sql +++ b/build/database/std/install/ne_config_backup.sql @@ -1,13 +1,12 @@ --- MariaDB dump 10.19 Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64) -- -- Table structure for table `ne_config_backup` -- - DROP TABLE IF EXISTS `ne_config_backup`; CREATE TABLE `ne_config_backup` ( `id` bigint NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型', - `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '压缩包名称', `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '压缩包位置', `remark` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', @@ -16,7 +15,5 @@ CREATE TABLE `ne_config_backup` ( `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', `update_time` bigint DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_cb_type_id` (`ne_type`,`ne_id`) USING BTREE COMMENT '网元类型_网元ID' + KEY `idx_cfgbak_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元_配置文件备份记录'; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/ne_host.sql b/build/database/std/install/ne_host.sql index 7cc1b93c..ba776cbd 100644 --- a/build/database/std/install/ne_host.sql +++ b/build/database/std/install/ne_host.sql @@ -1,6 +1,3 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `ne_host` -- @@ -26,11 +23,3 @@ CREATE TABLE `ne_host` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `uk_type_group_title` (`host_type`,`group_id`,`title`) USING BTREE COMMENT '同组内名称唯一' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元_主机表'; - --- 初始数据对应网元 -INSERT INTO `ne_host` VALUES (1, 'ssh', '1', 'OMC_001_22', '127.0.0.1', 22, 'omcuser', '2', '', '', '', '', '', 'system', 1729063407329, '', 0); -INSERT INTO `ne_host` VALUES (2, 'telnet', '1', 'OMC_001_4100', '127.0.0.1', 4100, 'admin', '0', 'NUBonCin4GZgl7o12YjeClE8ToQmYp9KWdhMjSNxc2M=', '', '', '', '', 'system', 1729063407329, '', 0); - -SET FOREIGN_KEY_CHECKS=1; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/ne_host_cmd.sql b/build/database/std/install/ne_host_cmd.sql index eab20f43..2d097a5f 100644 --- a/build/database/std/install/ne_host_cmd.sql +++ b/build/database/std/install/ne_host_cmd.sql @@ -1,11 +1,6 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `ne_host_cmd` -- - - DROP TABLE IF EXISTS `ne_host_cmd`; CREATE TABLE `ne_host_cmd` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '命令主键', @@ -21,7 +16,3 @@ CREATE TABLE `ne_host_cmd` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_host_type_group_title`(`cmd_type` ASC, `group_id` ASC, `title` ASC) USING BTREE COMMENT '同组内名称唯一' ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网元主机命令表' ROW_FORMAT = DYNAMIC; - -SET FOREIGN_KEY_CHECKS=1; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/ne_info.sql b/build/database/std/install/ne_info.sql index 5a124cb9..57d98899 100644 --- a/build/database/std/install/ne_info.sql +++ b/build/database/std/install/ne_info.sql @@ -1,23 +1,20 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `ne_info` -- DROP TABLE IF EXISTS `ne_info`; CREATE TABLE `ne_info` ( - `id` bigint NOT NULL AUTO_INCREMENT, + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '网元ID', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', - `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元ID', - `rm_uid` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元资源唯一标识', `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元名称', - `ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元服务IP', + `ip_addr` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元服务IP', `port` int DEFAULT '0' COMMENT '端口', `pv_flag` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'PNF' COMMENT '网元虚拟化标识 物理PNF 虚拟VNF', `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'AreaNet' COMMENT '省份地域', `vendor_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '厂商名称', `dn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '网络标识', - `ne_address` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'MAC地址', + `mac_addr` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'MAC地址', `host_ids` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元主机ID组 数据格式(ssh,telnet) UDM(ssh,telnet,redis) UPF(ssh,telnet,telnet)', `status` int DEFAULT '0' COMMENT '网元状态 0离线 1在线 2配置待下发 3备用模式', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', @@ -26,12 +23,5 @@ CREATE TABLE `ne_info` ( `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', `update_time` bigint DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `ux_netype_neid` (`ne_type`,`ne_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元_基础信息表 关联对应版本、授权、主机'; - --- 初始网元数据 -INSERT INTO `ne_info` VALUES (1, 'OMC', '001', '4400HXOMC001', 'OMC_001', '127.0.0.1', 33030, 'PNF', 'AreaNet', '-', '-', '-', '1,2', 0, '', 'system', 1713928436971, '', 0); - -SET FOREIGN_KEY_CHECKS=1; - --- Dump completed on 2025-02-14 15:26:56 + UNIQUE KEY `uk_core_ne_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '唯一核心网_资源标识_类型' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元_基础信息表 关联创建版本、授权、主机'; diff --git a/build/database/std/install/ne_license.sql b/build/database/std/install/ne_license.sql index b5414da5..300dc4af 100644 --- a/build/database/std/install/ne_license.sql +++ b/build/database/std/install/ne_license.sql @@ -1,19 +1,15 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `ne_license` -- - - DROP TABLE IF EXISTS `ne_license`; CREATE TABLE `ne_license` ( `id` bigint NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型', - `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `activation_request_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '激活申请代码', `license_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '激活授权文件', - `capability` bigint DEFAULT '0' COMMENT '用户容量', + `capability` bigint DEFAULT '0' COMMENT '容量 仅AMF/MME/UDM限制', `serial_num` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '序列号', `expiry_date` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '许可证到期日期', `status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '状态 0无效 1有效', @@ -23,12 +19,5 @@ CREATE TABLE `ne_license` ( `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', `update_time` bigint DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_lic_type_id` (`ne_type`,`ne_id`) USING BTREE COMMENT '唯一网元类型和网元ID' + UNIQUE KEY `uk_lic_core_ne_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '唯一核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元_授权激活信息'; - --- 初始数据对应网元 -INSERT INTO `ne_license` VALUES (1, 'OMC', '001', '', '', 0, '', '', '0', '', 'system', 1713928436971, '', 0); - -SET FOREIGN_KEY_CHECKS=1; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/ne_software.sql b/build/database/std/install/ne_software.sql index eff535d5..5a830893 100644 --- a/build/database/std/install/ne_software.sql +++ b/build/database/std/install/ne_software.sql @@ -1,6 +1,3 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `ne_software` -- @@ -19,7 +16,3 @@ CREATE TABLE `ne_software` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `uk_type_name_version` (`ne_type`,`name`,`version`) USING BTREE COMMENT '唯一网元类型和文件名版本是否唯一' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='网元_软件包'; - -SET FOREIGN_KEY_CHECKS=1; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/ne_state.sql b/build/database/std/install/ne_state.sql index 6d44ed7e..1dcdf568 100644 --- a/build/database/std/install/ne_state.sql +++ b/build/database/std/install/ne_state.sql @@ -1,14 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `ne_state` -- DROP TABLE IF EXISTS `ne_state`; CREATE TABLE `ne_state` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `version` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '版本', `capability` bigint DEFAULT '0' COMMENT '用户容量', `serial_num` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '序列号', @@ -20,7 +18,5 @@ CREATE TABLE `ne_state` ( `nf_mem_used` bigint DEFAULT '0' COMMENT '内存使用KB-nf', `create_time` bigint DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_type_id_time` (`ne_type`,`ne_id`,`create_time`) USING BTREE COMMENT 'idx_state_ne_type_id_at' + KEY `idx_state_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元_状态记录内存/CPU/磁盘'; - -SET FOREIGN_KEY_CHECKS=1; diff --git a/build/database/std/install/ne_version.sql b/build/database/std/install/ne_version.sql index 75d06258..b35d203d 100644 --- a/build/database/std/install/ne_version.sql +++ b/build/database/std/install/ne_version.sql @@ -1,16 +1,12 @@ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -- -- Table structure for table `ne_version` -- - - DROP TABLE IF EXISTS `ne_version`; CREATE TABLE `ne_version` ( `id` bigint NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型', - `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '当前包名', `version` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '-' COMMENT '当前版本', `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '当前软件包', @@ -26,12 +22,5 @@ CREATE TABLE `ne_version` ( `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', `update_time` bigint DEFAULT '0' COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_ver_type_id` (`ne_type`,`ne_id`) USING BTREE COMMENT '唯一网元类型和ID' + UNIQUE KEY `uk_ver_core_ne_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '唯一核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元_版本信息'; - --- 初始数据对应网元 -INSERT INTO `ne_version` VALUES (1, 'OMC', '001', '', '', '', '', '', '', '', '', '', '0', 'system', 1729063407329, '', 0); - -SET FOREIGN_KEY_CHECKS=1; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/trace_task.sql b/build/database/std/install/trace_task.sql index 11083ce0..61802d7d 100644 --- a/build/database/std/install/trace_task.sql +++ b/build/database/std/install/trace_task.sql @@ -1,7 +1,6 @@ -- -- Table structure for table `trace_task` -- - DROP TABLE IF EXISTS `trace_task`; CREATE TABLE `trace_task` ( `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', @@ -18,9 +17,8 @@ CREATE TABLE `trace_task` ( `create_time` bigint DEFAULT '0' COMMENT '创建时间', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '任务标题', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '备注', - `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neUid,neUid', `notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务'; - --- Dump completed on 2025-04-14 14:26:59 diff --git a/build/database/std/install/udm_auth.sql b/build/database/std/install/udm_auth.sql index 1f8c493f..200d04ee 100644 --- a/build/database/std/install/udm_auth.sql +++ b/build/database/std/install/udm_auth.sql @@ -1,19 +1,19 @@ -- -- Table structure for table `udm_auth` -- - DROP TABLE IF EXISTS `udm_auth`; CREATE TABLE `udm_auth` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `imsi` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'SIM卡/USIM卡ID', - `ne_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'UDM网元标识', `amf` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'AMF', `status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '状态', `ki` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'ki', `algo_index` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'algoIndex', `opc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'OPC', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_auth_imsi_ne` (`imsi`,`ne_id`) USING BTREE COMMENT 'imsi_neid唯一主键' + UNIQUE KEY `uk_udm_auth_imsi_ne` (`ne_uid`,`imsi`) USING BTREE COMMENT '唯一主键-IMSI_网元ID', + KEY `idx_udm_auth_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='UDM用户数据_鉴权'; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/udm_extend.sql b/build/database/std/install/udm_extend.sql index 75f1d33b..bc6675ec 100644 --- a/build/database/std/install/udm_extend.sql +++ b/build/database/std/install/udm_extend.sql @@ -1,16 +1,16 @@ -- -- Table structure for table `udm_extend` -- - DROP TABLE IF EXISTS `udm_extend`; CREATE TABLE `udm_extend` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '默认ID', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `imsi` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'SIM卡/USIM卡ID', `msisdn` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户电话号码', - `ne_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'UDM网元标识', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `imsi_ne` (`imsi`,`ne_id`) USING BTREE COMMENT 'imsi_ne唯一索引' + UNIQUE KEY `uk_udm_extend_imsi_ne` (`ne_uid`,`imsi`) USING BTREE COMMENT '唯一索引-IMSI_资源标识', + KEY `idx_udm_extend_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UDM用户数据_IMSI扩展信息'; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/udm_sub.sql b/build/database/std/install/udm_sub.sql index 7e9075ed..b5a4e0df 100644 --- a/build/database/std/install/udm_sub.sql +++ b/build/database/std/install/udm_sub.sql @@ -1,13 +1,14 @@ -- -- Table structure for table `udm_sub` -- - DROP TABLE IF EXISTS `udm_sub`; CREATE TABLE `udm_sub` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `imsi` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'SIM卡/USIM卡ID', `msisdn` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户电话号码', - `ne_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'UDM网元标识', `am_dat` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'AmData', `ambr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'AmData SubUeAMBRTemp', `nssai` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'AmData SubSNSSAITemp', @@ -36,7 +37,6 @@ CREATE TABLE `udm_sub` ( `smf_sel` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'smfSel', `cag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'CAG', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_sub_imsi_ne` (`imsi`,`ne_id`) USING BTREE COMMENT 'imsi_neid唯一主键' + UNIQUE KEY `uk_udm_sub_imsi_ne` (`ne_uid`,`imsi`) USING BTREE COMMENT '唯一索引-SIM卡_网元标识', + KEY `idx_udm_sub_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UDM用户数据_签约'; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/udm_voip.sql b/build/database/std/install/udm_voip.sql index 37837eea..fc97f7ff 100644 --- a/build/database/std/install/udm_voip.sql +++ b/build/database/std/install/udm_voip.sql @@ -1,15 +1,15 @@ -- -- Table structure for table `udm_voip` -- - DROP TABLE IF EXISTS `udm_voip`; CREATE TABLE `udm_voip` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', - `ne_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'UDM网元标识', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `username` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户名', `password` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '密码', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_voip_user_ne` (`username`,`ne_id`) USING BTREE COMMENT 'user_neid唯一主键' + UNIQUE KEY `uk_udm_voip_user_ne` (`username`,`ne_uid`) USING BTREE COMMENT 'user_neid唯一主键', + KEY `idx_udm_voip_smsc_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='UDM用户数据_VOIP'; - --- Dump completed on 2025-04-22 15:26:56 diff --git a/build/database/std/install/udm_volte_ims.sql b/build/database/std/install/udm_volte_ims.sql index b2debc57..d0707621 100644 --- a/build/database/std/install/udm_volte_ims.sql +++ b/build/database/std/install/udm_volte_ims.sql @@ -1,18 +1,18 @@ -- -- Table structure for table `udm_volte_ims` -- - DROP TABLE IF EXISTS `udm_volte_ims`; CREATE TABLE `udm_volte_ims` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '主键', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `imsi` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'SIM卡/USIM卡ID', `msisdn` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '用户电话号码', - `ne_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'UDM网元标识', `tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '0=VoIP, 1=VoLTE', `vni` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT 'VNI', PRIMARY KEY (`id`) USING BTREE, - UNIQUE KEY `uk_volte_imsi_ne` (`imsi`,`msisdn`,`ne_id`) USING BTREE COMMENT 'imsi_msisdn_neid唯一主键', - KEY `idx_volte_tag` (`tag`) USING BTREE COMMENT 'tag索引' + UNIQUE KEY `uk_volte_imsi_ne` (`ne_uid`,`imsi`,`msisdn`) USING BTREE COMMENT 'imsi_msisdn_neid唯一主键', + KEY `idx_udm_volte_tag` (`tag`) USING BTREE COMMENT 'tag索引', + KEY `idx_udm_volte_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UDM用户数据_VolteIMS用户'; - --- Dump completed on 2025-04-22 15:26:56 diff --git a/build/database/std/install/ue_event.sql b/build/database/std/install/ue_event.sql index 5e77c77d..93a7e989 100644 --- a/build/database/std/install/ue_event.sql +++ b/build/database/std/install/ue_event.sql @@ -4,15 +4,14 @@ DROP TABLE IF EXISTS `ue_event`; CREATE TABLE `ue_event` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '可能没有', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '48' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '事件类型 auth-result detach cm-state', `event_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_type_t` (`event_type`,`timestamp`) USING BTREE + KEY `idx_ue_type_t` (`timestamp`,`event_type`) USING BTREE, + KEY `idx_ue_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UE事件_基础表结构'; - --- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/ue_event_amf.sql b/build/database/std/install/ue_event_amf.sql index 78898c86..18efba3c 100644 --- a/build/database/std/install/ue_event_amf.sql +++ b/build/database/std/install/ue_event_amf.sql @@ -4,15 +4,16 @@ DROP TABLE IF EXISTS `ue_event_amf`; CREATE TABLE `ue_event_amf` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '可能没有', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '48' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '事件类型 auth-result detach cm-state', `event_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_amf_type_t` (`event_type`,`timestamp`) USING BTREE + KEY `idx_ue_amf_type_t` (`timestamp`,`event_type`) USING BTREE, + KEY `idx_ue_amf_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UE事件_AMF终端接入'; -- Dump completed on 2025-02-14 15:26:56 diff --git a/build/database/std/install/ue_event_mme.sql b/build/database/std/install/ue_event_mme.sql index 20026bc1..740d8596 100644 --- a/build/database/std/install/ue_event_mme.sql +++ b/build/database/std/install/ue_event_mme.sql @@ -4,15 +4,16 @@ DROP TABLE IF EXISTS `ue_event_mme`; CREATE TABLE `ue_event_mme` ( `id` int NOT NULL AUTO_INCREMENT, - `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '', - `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '可能没有', + `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识', + `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识', + `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网元类型', `timestamp` bigint DEFAULT '48' COMMENT '接收到的timestamp秒级存储毫秒时间戳', `event_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '事件类型 auth-result detach cm-state', `event_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'data JSON String', `created_at` bigint DEFAULT '0' COMMENT '记录创建存储毫秒', PRIMARY KEY (`id`) USING BTREE, - KEY `idx_mme_type_t` (`event_type`,`timestamp`) USING BTREE + KEY `idx_ue_mme_type_t` (`timestamp`,`event_type`) USING BTREE, + KEY `idx_ue_mme_uid_type` (`core_uid`,`ne_uid`,`ne_type`) USING BTREE COMMENT '索引-核心网_资源标识_类型' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='UE事件_MME终端接入'; -- Dump completed on 2025-02-14 15:26:56 diff --git a/features/cdr/cdrevent.go b/features/cdr/cdrevent.go index 47a74f5c..ea2ff365 100644 --- a/features/cdr/cdrevent.go +++ b/features/cdr/cdrevent.go @@ -47,8 +47,8 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) { } // 是否存在网元 - neInfo := neService.NewNeInfo.FindByRmuid(body.RmUID) - if neInfo.NeType != body.NeType || neInfo.RmUID != body.RmUID { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", body.RmUID) + if neInfo.NeType != body.NeType || neInfo.NeUID != body.RmUID { services.ResponseInternalServerError500ProcessError(w, fmt.Errorf("network element does not exist")) return } @@ -88,14 +88,14 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) { switch neInfo.NeType { case "IMS": if v, ok := body.CDR["recordType"]; ok && (v == "MOC" || v == "MTSM") { - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_IMS_CDR, neInfo.NeId), data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_IMS_CDR, neInfo.CoreUID, neInfo.NeUID), data) } case "SMF": - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_SMF_CDR, neInfo.NeId), data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_SMF_CDR, neInfo.CoreUID, neInfo.NeUID), data) case "SMSC": - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_SMSC_CDR, neInfo.NeId), data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_SMSC_CDR, neInfo.CoreUID, neInfo.NeUID), data) case "SGWC": - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_SGWC_CDR, neInfo.NeId), data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_SGWC_CDR, neInfo.CoreUID, neInfo.NeUID), data) } services.ResponseStatusOK204NoContent(w) diff --git a/features/cm/ne.go b/features/cm/ne.go index f9cc9670..28f9431c 100644 --- a/features/cm/ne.go +++ b/features/cm/ne.go @@ -15,9 +15,7 @@ import ( "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/src/framework/constants" "be.ems/src/framework/database/db" - neService "be.ems/src/modules/network_element/service" "github.com/go-resty/resty/v2" "github.com/gorilla/mux" @@ -26,8 +24,6 @@ import ( var ( // NE CM export/import NeCmUri = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm" - // NE info - UriNeInfo = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo" // NE backup file UriNeCmFile = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}" // service action uri, action: start/stop/restart @@ -36,7 +32,6 @@ var ( UriNeInstance = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/instance/{action}" CustomNeCmUri = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm" - CustomUriNeInfo = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo" CustomUriNeCmFile = config.UriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}" // service action uri, action: start/stop/restart CustomUriNeService = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/service/{action}" @@ -68,37 +63,6 @@ func init() { SetTimeout(time.Duration(1 * time.Second)) } -func GetNeInfo(w http.ResponseWriter, r *http.Request) { - log.Debug("GetNeInfo processing... ") - - // _, err := services.CheckFrontValidRequest(w, r) - // if err != nil { - // log.Error("Request error:", err) - // return - // } - - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - neId := services.GetUriParamString(r, "ne_id", ",", false, false) - - // no, _ := strconv.ParseInt(neId, 10, 64) - neInfo, err := dborm.XormGetNeInfo(neType, neId) - if err != nil { - log.Error("dborm.XormGetNeInfo is failed:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - - var response services.DataResponse - response.Data = neInfo - services.ResponseWithJson(w, http.StatusOK, response) -} - type OmcNeConfig struct { NeId string `json:"neId" xorm:"ne_id"` // 网元标识(内部), RmUID string `json:"rmUID" xorm:"rm_uid"` // rmUID 网元唯一标识 @@ -110,291 +74,6 @@ type OmcNeConfig struct { Dn string `json:"dn" xorm:"dn"` // 资源里边的ManagedBy，性能的Dn，网络唯一标识 } -func PostNeInfo(w http.ResponseWriter, r *http.Request) { - log.Debug("PostNeInfo processing... ") - - // _, err := services.CheckFrontValidRequest(w, r) - // if err != nil { - // log.Error("Request error:", err) - // return - // } - - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - neTypeUpper := strings.ToUpper(neType) - syncFlag := services.GetUriParamString(r, "sync2ne", ",", false, false) - body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) - if err != nil { - log.Error("Failed to o.ReadAll:", err) - services.ResponseNotFound404UriNotExist(w, r) - return - } - log.Trace("Body:", string(body)) - - neInfo := new(dborm.NeInfo) - err = json.Unmarshal(body, neInfo) - if err != nil { - log.Error("Failed to json.Unmarshal:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - //neInfo.UpdateTime = time.Now().Format(time.DateTime) - neInfo.UpdateTime = time.Now() - log.Debug("NE info:", neInfo) - - //if !config.GetYamlConfig().OMC.Chk2Ne { - if syncFlag == "false" || neTypeUpper == config.GetYamlConfig().OMC.NeType { - neInfo.Status = NEStatusMaintain - affected, err := dborm.XormInsertNeInfo(neInfo) - if err != nil { - log.Error("Failed to insert Ne info:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - - // 刷新缓存，不存在结构体网元Id空字符串 - neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) - - mapRow := make(map[string]interface{}) - row := map[string]interface{}{"affectedRows": affected} - mapRow["data"] = row - services.ResponseWithJson(w, http.StatusOK, mapRow) - return - } else { - hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port) - //hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port) - apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig?ne_id=%s", config.DefaultUriPrefix, strings.ToLower(neInfo.NeType), neInfo.NeId) - requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri) - log.Debug("requestURI2NF:", requestURI2NF) - - omcNeConfig := &OmcNeConfig{ - NeId: neInfo.NeId, - RmUID: neInfo.RmUID, - NeName: neInfo.NeName, - PvFlag: neInfo.PvFlag, - Province: neInfo.Province, - VendorName: neInfo.VendorName, - Dn: neInfo.Dn, - } - body, _ = json.Marshal(omcNeConfig) - response, err := client.R(). - EnableTrace(). - SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). - SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). - SetBody(body). - Put(requestURI2NF) - if err != nil { - log.Error("Failed to Put:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - log.Info("StatusCode: ", response.StatusCode()) - - respMsg := make(map[string]interface{}) - switch response.StatusCode() { - case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted: - neInfo.Status = NEStatusActive - affected, err := dborm.XormInsertNeInfo(neInfo) - if err != nil { - log.Error("Failed to dborm.XormInsertNeInfo:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } else if affected <= 0 { - log.Infof("Not record affected to insert ne_info") - } - - // 刷新缓存，不存在结构体网元Id空字符串 - neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) - - services.ResponseStatusOK204NoContent(w) - return - default: - log.Info("response body:", string(response.Body())) - body := new(map[string]interface{}) - _ = json.Unmarshal(response.Body(), &body) - respMsg["error"] = body - } - - services.ResponseWithJson(w, response.StatusCode(), respMsg) - return - } -} - -func PutNeInfo(w http.ResponseWriter, r *http.Request) { - log.Debug("PutNeInfo processing... ") - - // _, err := services.CheckFrontValidRequest(w, r) - // if err != nil { - // log.Error("Request error:", err) - // return - // } - - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - neTypeLower := strings.ToLower(neType) - neTypeUpper := strings.ToUpper(neType) - syncFlag := services.GetUriParamString(r, "sync2ne", ",", false, false) - body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) - if err != nil { - log.Error("Failed to io.ReadAll:", err) - services.ResponseNotFound404UriNotExist(w, r) - return - } - - neInfo := new(dborm.NeInfo) - _ = json.Unmarshal(body, neInfo) - neInfo.NeType = strings.ToUpper(neType) - neInfo.UpdateTime = time.Now() - log.Debug("NE info:", neInfo) - - //if !config.GetYamlConfig().OMC.Chk2Ne { - if syncFlag == "false" || neTypeUpper == config.GetYamlConfig().OMC.NeType { - neInfo.Status = NEStatusMaintain - affected, err := dborm.XormUpdateNeInfo(neInfo) - if err != nil { - log.Error("Failed to update Ne info:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - - // 刷新缓存，不存在结构体网元Id空字符串 - neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) - - mapRow := make(map[string]interface{}) - row := map[string]interface{}{"affectedRows": affected} - mapRow["data"] = row - services.ResponseWithJson(w, http.StatusOK, mapRow) - return - } else { - hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port) - //hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port) - apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig?ne_id=%s", config.DefaultUriPrefix, neTypeLower, neInfo.NeId) - requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri) - log.Debug("requestURI2NF:", requestURI2NF) - - omcNeConfig := &OmcNeConfig{ - NeId: neInfo.NeId, - RmUID: neInfo.RmUID, - NeName: neInfo.NeName, - PvFlag: neInfo.PvFlag, - Province: neInfo.Province, - VendorName: neInfo.VendorName, - Dn: neInfo.Dn, - } - body, _ = json.Marshal(omcNeConfig) - response, err := client.R(). - EnableTrace(). - SetHeaders(map[string]string{constants.HEADER_KEY: r.Header.Get(constants.HEADER_KEY)}). - SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). - SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). - SetBody(body). - Put(requestURI2NF) - if err != nil { - log.Error("Failed to Put:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - log.Info("StatusCode: ", response.StatusCode()) - - respMsg := make(map[string]interface{}) - switch response.StatusCode() { - case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted: - neInfo.Status = NEStatusActive - affected, err := dborm.XormUpdateNeInfo(neInfo) - if err != nil { - log.Error("Failed to dborm.XormUpdateNeInfo:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } else if affected <= 0 { - log.Infof("Not record affected to insert ne_info") - } - - // 刷新缓存，不存在结构体网元Id空字符串 - neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) - - services.ResponseStatusOK204NoContent(w) - return - default: - log.Info("response body:", string(response.Body())) - body := new(map[string]interface{}) - _ = json.Unmarshal(response.Body(), &body) - respMsg["error"] = body - } - - services.ResponseWithJson(w, response.StatusCode(), respMsg) - return - } -} - -func DeleteNeInfo(w http.ResponseWriter, r *http.Request) { - log.Debug("DeleteNeInfo processing... ") - - // _, err := services.CheckFrontValidRequest(w, r) - // if err != nil { - // log.Error("Request error:", err) - // return - // } - - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - - body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) - if err != nil { - log.Error("io.ReadAll is failed:", err) - services.ResponseNotFound404UriNotExist(w, r) - return - } - - neInfo := new(dborm.NeInfo) - _ = json.Unmarshal(body, neInfo) - neInfo.NeType = strings.ToUpper(neType) - neInfo.NeId = services.GetUriParamString(r, "ne_id", ",", false, false) - neInfo, err = dborm.XormGetNeInfo(neInfo.NeType, neInfo.NeId) - if err != nil || neInfo == nil { - log.Error("Failed to delete Ne info:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - log.Debug("NE info:", neInfo) - - // if NE in active status, can't delete NE - if !IsActiveNF(neInfo) { - affected, err := dborm.XormDeleteNeInfo(neInfo) - if err != nil { - log.Error("Failed to delete Ne info:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - - // 刷新缓存，不存在结构体网元Id空字符串 - neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) - - mapRow := make(map[string]interface{}) - row := map[string]interface{}{"affectedRows": affected} - mapRow["data"] = row - services.ResponseWithJson(w, http.StatusOK, mapRow) - return - } - err = global.ErrCMCannotDeleteActiveNE - log.Error(err) - services.ResponseInternalServerError500ProcessError(w, err) -} - func IsActiveNF(neInfo *dborm.NeInfo) bool { log.Debug("IsActiveNF processing... ") diff --git a/features/cm/param.go b/features/cm/param.go deleted file mode 100644 index 1b1266d0..00000000 --- a/features/cm/param.go +++ /dev/null @@ -1,208 +0,0 @@ -package cm - -import ( - "strings" - - "be.ems/lib/config" - "be.ems/lib/core/ctx" - "be.ems/lib/global" - "be.ems/lib/log" - "be.ems/lib/services" - - "encoding/json" - "fmt" - "io" - "net/http" - - neService "be.ems/src/modules/network_element/service" - - "github.com/go-resty/resty/v2" - "github.com/gorilla/mux" -) - -var ( - // parameter config management - ParamConfigUri = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/config/{paraName}" - - CustomParamConfigUri = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/config/{paraName}" -) - -func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) { - log.Debug("GetParamConfigFromNF processing... ") - - neId := ctx.GetQuery(r, "ne_id") - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" || neId == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId) - - var response services.DataResponse - if neInfo.NeId == neId && neInfo.NeId != "" { - requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI) - log.Debug("requestURI2NF:", requestURI2NF) - - resp, err := client.R(). - EnableTrace(). - SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). - SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). - Get(requestURI2NF) - if err != nil { - log.Error("Failed to Get from NF:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } else { - _ = json.Unmarshal(resp.Body(), &response) - } - log.Debug("response:", response) - } - - services.ResponseWithJson(w, http.StatusOK, response) -} - -func PostParamConfigToNF(w http.ResponseWriter, r *http.Request) { - log.Debug("PostParamConfigToNF processing... ") - - neId := ctx.GetQuery(r, "ne_id") - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" || neId == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId) - - if neInfo.NeId != neId || neInfo.NeId == "" { - log.Error("neId is empty") - services.ResponseInternalServerError500DatabaseOperationFailed(w) - return - } - - requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI) - log.Debug("requestURI2NF: POST ", requestURI2NF) - - body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) //io.LimitReader限制大小 - if err != nil { - log.Error("io.ReadAll is failed:", err) - services.ResponseNotFound404UriNotExist(w, r) - return - } - - client := resty.New() - response, err := client.R(). - EnableTrace(). - SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). - SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). - SetBody(body). - Post(requestURI2NF) - if err != nil { - log.Error("Failed to POST to NF:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - - services.ResponseWithJson(w, http.StatusNoContent, response) -} - -func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) { - log.Debug("PutParamConfigToNF processing... ") - - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - - // OMC配置接口 /api/rest/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig - if v, ok := vars["paraName"]; ok && v == "omcNeConfig" && strings.ToLower(neType) == "omc" { - PutOMCNeConfig(w, r) - return - } - - neId := ctx.GetQuery(r, "ne_id") - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId) - - if neInfo.NeId != neId || neInfo.NeId == "" { - log.Error("neId is empty") - services.ResponseInternalServerError500DatabaseOperationFailed(w) - return - } - - requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI) - log.Debug("requestURI2NF: PUT ", requestURI2NF) - - body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) //io.LimitReader限制大小 - if err != nil { - log.Error("io.ReadAll is failed:", err) - services.ResponseNotFound404UriNotExist(w, r) - return - } - - client := resty.New() - response, err := client.R(). - EnableTrace(). - SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). - SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). - SetBody(body). - Put(requestURI2NF) - if err != nil { - log.Error("Failed to Put to NF:", err) - services.ResponseInternalServerError500ProcessError(w, err) - return - } - - services.ResponseWithJson(w, http.StatusNoContent, response) -} - -// PutOMCNeConfig 网元OMC配置 -// -// 目前没配置，返回204 -func PutOMCNeConfig(w http.ResponseWriter, r *http.Request) { - services.ResponseStatusOK204NoContent(w) -} - -func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) { - log.Debug("DeleteParamConfigToNF processing... ") - - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - - neId := ctx.GetQuery(r, "ne_id") - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId) - - if neInfo.NeId != neId || neInfo.NeId == "" { - log.Error("neId is empty") - services.ResponseInternalServerError500DatabaseOperationFailed(w) - return - } - - requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI) - log.Debug("requestURI2NF: DELETE ", requestURI2NF) - - client := resty.New() - response, err := client.R(). - EnableTrace(). - SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). - SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). - Delete(requestURI2NF) - if err != nil { - log.Error("Failed to delete parameter:", err) - services.ResponseInternalServerError500NFConnectRefused(w) - return - } - - services.ResponseWithJson(w, http.StatusNoContent, response) -} diff --git a/features/event/event.go b/features/event/event.go index 5e3853f1..91cf09af 100644 --- a/features/event/event.go +++ b/features/event/event.go @@ -80,8 +80,8 @@ func PostUEEventFromAMF(c *gin.Context) { } // 是否存在网元 - neInfo := neService.NewNeInfo.FindByRmuid(data.RmUID) - if neInfo.NeType != "AMF" || neInfo.RmUID != data.RmUID { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", data.RmUID) + if neInfo.NeType != "AMF" || neInfo.NeUID != data.RmUID { services.ResponseInternalServerError500ProcessError(c.Writer, fmt.Errorf("network element does not exist")) return } @@ -165,7 +165,7 @@ func PostUEEventFromAMF(c *gin.Context) { // 推送到ws订阅组 if data.NeType == "AMF" { wsService.NewWSSend.ByGroupID(wsService.GROUP_AMF_UE, data) - wsService.NewWSSend.ByGroupID(wsService.GROUP_AMF_UE+"_"+neInfo.NeId, data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_AMF_UE, neInfo.CoreUID, neInfo.NeUID), data) } services.ResponseStatusOK204NoContent(c.Writer) @@ -195,8 +195,8 @@ func PostUEEvent(w http.ResponseWriter, r *http.Request) { } // 是否存在网元 - neInfo := neService.NewNeInfo.FindByRmuid(body.RmUID) - if neInfo.NeType != body.NeType || neInfo.RmUID != body.RmUID { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", body.RmUID) + if neInfo.NeType != body.NeType || neInfo.NeUID != body.RmUID { services.ResponseInternalServerError500ProcessError(w, fmt.Errorf("network element does not exist")) return } @@ -237,11 +237,11 @@ func PostUEEvent(w http.ResponseWriter, r *http.Request) { // 推送到ws订阅组 if body.NeType == "MME" { wsService.NewWSSend.ByGroupID(wsService.GROUP_MME_UE, data) - wsService.NewWSSend.ByGroupID(wsService.GROUP_MME_UE+"_"+neInfo.NeId, data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_MME_UE, neInfo.CoreUID, neInfo.NeUID), data) } if body.NeType == "AMF" { wsService.NewWSSend.ByGroupID(wsService.GROUP_AMF_UE, data) - wsService.NewWSSend.ByGroupID(wsService.GROUP_AMF_UE+"_"+neInfo.NeId, data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_AMF_UE, neInfo.CoreUID, neInfo.NeUID), data) } services.ResponseStatusOK204NoContent(w) diff --git a/features/fm/alarm.go b/features/fm/alarm.go index e5f624fe..9afab828 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -125,7 +125,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { log.Debug("alarmData:", v) // 是否存在网元 neId实际是rmUID - neInfo := neService.FindByRmuid(v.NeId) + neInfo := neService.FindByCoreUidAndNeUid("*", v.NeId) if neInfo.NeType != v.NeType { msg := fmt.Sprintf("network element does not exist %s", v.NeId) services.ResponseWithJson(w, 400, resp.ErrMsg(msg)) @@ -143,7 +143,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { v.AddInfo = fmt.Sprintf("NeInfo:%s", v.NeType) } if v.ObjectUid == "" { - v.ObjectUid = neInfo.RmUID + v.ObjectUid = neInfo.NeUID } if v.ObjectName == "" { v.ObjectName = neInfo.NeName @@ -161,7 +161,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { services.ResponseWithJson(w, 400, resp.ErrMsg(err.Error())) return } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM_EVENT, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM_EVENT, neInfo.CoreUID, neInfo.NeUID) wsService.NewWSSend.ByGroupID(groupID, clearAlarmEvent) } if v.AlarmStatus == AlarmStatusActive { @@ -171,7 +171,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { services.ResponseWithJson(w, 400, resp.ErrMsg(err.Error())) return } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM_EVENT, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM_EVENT, neInfo.CoreUID, neInfo.NeUID) wsService.NewWSSend.ByGroupID(groupID, newAlarmEvent) } continue @@ -184,7 +184,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { services.ResponseWithJson(w, 400, resp.ErrMsg(err.Error())) return } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.CoreUID, neInfo.NeUID) wsService.NewWSSend.ByGroupID(groupID, clearAlarm) } if v.AlarmStatus == AlarmStatusActive { @@ -194,7 +194,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) { services.ResponseWithJson(w, 400, resp.ErrMsg(err.Error())) return } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.CoreUID, neInfo.NeUID) wsService.NewWSSend.ByGroupID(groupID, newAlarm) } @@ -232,12 +232,13 @@ func alarmClear(neInfo neModel.NeInfo, v Alarm) (neDataModel.Alarm, error) { alarmService := neDataService.NewAlarm // 检查网元告警ID是否唯一 alarmIdArr := alarmService.Find(neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmId: v.AlarmId, }) if len(alarmIdArr) != 1 { - return neDataModel.Alarm{}, fmt.Errorf("[%s %s] clear alarm not exists alarmId:%s", neInfo.NeType, neInfo.NeId, v.AlarmId) + return neDataModel.Alarm{}, fmt.Errorf("[%s %s] clear alarm not exists alarmId:%s", neInfo.CoreUID, neInfo.NeUID, v.AlarmId) } // 产生时间 @@ -245,11 +246,9 @@ func alarmClear(neInfo neModel.NeInfo, v Alarm) (neDataModel.Alarm, error) { alarm := neDataModel.Alarm{ ID: alarmIdArr[0].ID, + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, - NeName: neInfo.NeName, - Province: neInfo.Province, - PvFlag: neInfo.PvFlag, AlarmSeq: alarmIdArr[0].AlarmSeq, // seq 告警序号 AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -276,7 +275,7 @@ func alarmClear(neInfo neModel.NeInfo, v Alarm) (neDataModel.Alarm, error) { if rows > 0 { return alarm, nil } - return neDataModel.Alarm{}, fmt.Errorf("[%s %s] clear alarm fail", neInfo.NeType, neInfo.NeId) + return neDataModel.Alarm{}, fmt.Errorf("[%s %s] clear alarm fail", neInfo.CoreUID, neInfo.NeUID) } // alarmNew 新增告警 @@ -284,24 +283,23 @@ func alarmNew(neInfo neModel.NeInfo, v Alarm) (neDataModel.Alarm, error) { alarmService := neDataService.NewAlarm // 检查网元告警ID是否唯一 alarmIdArr := alarmService.Find(neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmId: v.AlarmId, }) if len(alarmIdArr) > 0 { - return neDataModel.Alarm{}, fmt.Errorf("[%s %s] new alarm already exists alarmId:%s", neInfo.NeType, neInfo.NeId, v.AlarmId) + return neDataModel.Alarm{}, fmt.Errorf("[%s %s] new alarm already exists alarmId:%s", neInfo.CoreUID, neInfo.NeUID, v.AlarmId) } // seq 告警序号 - lastSeq := alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.NeId) + lastSeq := alarmService.FindAlarmSeqLast(neInfo.CoreUID, neInfo.NeUID) // 产生时间 eventTime := date.ParseStrToDate(v.EventTime, date.YYYY_MM_DDTHH_MM_SSZ) alarm := neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, - NeName: neInfo.NeName, - Province: neInfo.Province, - PvFlag: neInfo.PvFlag, AlarmSeq: lastSeq + 1, AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -324,7 +322,7 @@ func alarmNew(neInfo neModel.NeInfo, v Alarm) (neDataModel.Alarm, error) { alarm.ID = insertId return alarm, nil } - return neDataModel.Alarm{}, fmt.Errorf("[%s %s] new alarm fail", neInfo.NeType, neInfo.NeId) + return neDataModel.Alarm{}, fmt.Errorf("[%s %s] new alarm fail", neInfo.CoreUID, neInfo.NeUID) } // alarmSaveLog 保存告警日志 @@ -332,8 +330,9 @@ func alarmSaveLog(neInfo neModel.NeInfo, v Alarm) int64 { alarmLogService := neDataService.NewAlarmLog eventTime := date.ParseStrToDate(v.EventTime, date.YYYY_MM_DDTHH_MM_SSZ) alarmLog := neDataModel.AlarmLog{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmSeq: int64(v.AlarmSeq), AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -365,12 +364,13 @@ func alarmEventClear(neInfo neModel.NeInfo, v Alarm) (neDataModel.AlarmEvent, er alarmEventService := neDataService.NewAlarmEvent // 检查网元告警ID是否唯一 alarmIdArr := alarmEventService.Find(neDataModel.AlarmEvent{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmId: v.AlarmId, }) if len(alarmIdArr) != 1 { - return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] clear alarm event not exists alarmId:%s", neInfo.NeType, neInfo.NeId, v.AlarmId) + return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] clear alarm event not exists alarmId:%s", neInfo.CoreUID, neInfo.NeUID, v.AlarmId) } // 产生时间 @@ -378,8 +378,9 @@ func alarmEventClear(neInfo neModel.NeInfo, v Alarm) (neDataModel.AlarmEvent, er alarmEvent := neDataModel.AlarmEvent{ ID: alarmIdArr[0].ID, + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmSeq: alarmIdArr[0].AlarmSeq, // seq 告警序号 AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -403,7 +404,7 @@ func alarmEventClear(neInfo neModel.NeInfo, v Alarm) (neDataModel.AlarmEvent, er if rows > 0 { return alarmEvent, nil } - return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] clear alarm event fail", neInfo.NeType, neInfo.NeId) + return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] clear alarm event fail", neInfo.CoreUID, neInfo.NeUID) } // alarmEventNew 新增告警事件 @@ -411,21 +412,23 @@ func alarmEventNew(neInfo neModel.NeInfo, v Alarm) (neDataModel.AlarmEvent, erro alarmEventService := neDataService.NewAlarmEvent // 检查网元告警ID是否唯一 alarmIdArr := alarmEventService.Find(neDataModel.AlarmEvent{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmId: v.AlarmId, }) if len(alarmIdArr) > 0 { - return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] new alarm event already exists alarmId:%s", neInfo.NeType, neInfo.NeId, v.AlarmId) + return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] new alarm event already exists alarmId:%s", neInfo.CoreUID, neInfo.NeUID, v.AlarmId) } // seq 告警序号 - lastSeq := alarmEventService.FindAlarmEventSeqLast(neInfo.NeType, neInfo.NeId) + lastSeq := alarmEventService.FindAlarmEventSeqLast(neInfo.CoreUID, neInfo.NeUID) // 产生时间 eventTime := date.ParseStrToDate(v.EventTime, date.YYYY_MM_DDTHH_MM_SSZ) alarmEvent := neDataModel.AlarmEvent{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmSeq: lastSeq + 1, AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -447,8 +450,9 @@ func alarmEventNew(neInfo neModel.NeInfo, v Alarm) (neDataModel.AlarmEvent, erro if v.AlarmCode == constants.ALARM_EVENT_REBOOT { alarmService := neDataService.NewAlarm rows := alarmService.Find(neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmStatus: "1", }) for _, v := range rows { @@ -457,11 +461,11 @@ func alarmEventNew(neInfo neModel.NeInfo, v Alarm) (neDataModel.AlarmEvent, erro } // 网元重启后，有跟踪任务的需要重新补发启动任务 if v.AlarmCode == constants.ALARM_EVENT_REBOOT { - traceService.NewTraceTask.RunUnstopped(neInfo.NeType, neInfo.NeId) + traceService.NewTraceTask.RunUnstopped(neInfo.CoreUID, neInfo.NeUID) } return alarmEvent, nil } - return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] new alarm event fail", neInfo.NeType, neInfo.NeId) + return neDataModel.AlarmEvent{}, fmt.Errorf("[%s %s] new alarm event fail", neInfo.CoreUID, neInfo.NeUID) } // mapToAlarm 将 []map[string]any 转换为 []Alarm @@ -505,7 +509,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) { continue } if len(data) == 0 { - log.Infof("Not found sync alarms, neType=%s, neId=%s", neInfo.NeType, neInfo.NeId) + log.Infof("Not found sync alarms, neType=%s, neId=%s", neInfo.CoreUID, neInfo.NeUID) continue } @@ -519,7 +523,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) { v.AddInfo = fmt.Sprintf("NeInfo:%s", v.NeType) } if v.ObjectUid == "" { - v.ObjectUid = neInfo.RmUID + v.ObjectUid = neInfo.NeUID } if v.ObjectName == "" { v.ObjectName = neInfo.NeName diff --git a/features/fm/smsforward.go b/features/fm/smsforward.go index 642e0ed3..548bfd99 100644 --- a/features/fm/smsforward.go +++ b/features/fm/smsforward.go @@ -188,11 +188,12 @@ func writeLog(alarmData *Alarm, toUser, forwardBy string, err error) error { if err != nil { result = err.Error() } - neInfo := neService.NewNeInfo.FindByRmuid(alarmData.NeId) + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", alarmData.NeId) eventTime := date.ParseStrToDate(alarmData.EventTime, date.YYYY_MM_DDTHH_MM_SSZ) alarmForwardLog := neDataModel.AlarmForwardLog{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmSeq: int64(alarmData.AlarmSeq), AlarmId: alarmData.AlarmId, AlarmTitle: alarmData.AlarmTitle, diff --git a/features/mml/mml.go b/features/mml/mml.go index 867c41e6..81568583 100644 --- a/features/mml/mml.go +++ b/features/mml/mml.go @@ -83,13 +83,13 @@ func PostMML2ToNF(w http.ResponseWriter, r *http.Request) { } log.Debug("neType:", neType, "neId", neId) - neInfoArr := neService.NewNeInfo.Find(neModel.NeInfo{NeType: neType, NeId: neId}, false, true) + neInfoArr := neService.NewNeInfo.Find(neModel.NeInfo{NeType: neType, NeUID: neId}, false, true) if len(neInfoArr) < 1 { services.ResponseInternalServerError500DatabaseOperationFailed(w) return } neInfo := neInfoArr[0] - if neInfo.NeId != neId || neInfo.IP == "" || len(neInfo.Hosts) < 2 { + if neInfo.NeUID != neId || neInfo.IPAddr == "" || len(neInfo.Hosts) < 2 { services.ResponseWithJson(w, 200, map[string]any{ "code": 0, "msg": "neInfo not found", @@ -235,13 +235,13 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) { return } - neInfoArr := neService.NewNeInfo.Find(neModel.NeInfo{NeType: neType, NeId: neId}, false, true) + neInfoArr := neService.NewNeInfo.Find(neModel.NeInfo{NeType: neType, NeUID: neId}, false, true) if len(neInfoArr) < 1 { services.ResponseInternalServerError500DatabaseOperationFailed(w) return } neInfo := neInfoArr[0] - if neInfo.NeId != neId || neInfo.IP == "" || len(neInfo.Hosts) < 2 { + if neInfo.NeUID != neId || neInfo.IPAddr == "" || len(neInfo.Hosts) < 2 { services.ResponseWithJson(w, 200, map[string]any{ "code": 0, "msg": "neInfo not found", @@ -619,7 +619,7 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) { // UDM 特殊命令处理 if neType == "UDM" && mml == "dec key" { - output, err := neService.NewNeInfo.NeRunSSHCmd(neInfo.NeType, neInfo.NeId, "cat /usr/local/etc/udm/ueKeyProfile.tmp") + output, err := neService.NewNeInfo.NeRunSSHCmd(neInfo.CoreUID, neInfo.NeUID, "cat /usr/local/etc/udm/ueKeyProfile.tmp") if err != nil { mmlResult = append(mmlResult, err.Error()) } else { @@ -645,13 +645,13 @@ func PostMMLToOMC(w http.ResponseWriter, r *http.Request) { } log.Debug("neType:", neType, "neId", neId) - neInfoArr := neService.NewNeInfo.Find(neModel.NeInfo{NeType: neType, NeId: neId}, false, false) + neInfoArr := neService.NewNeInfo.Find(neModel.NeInfo{NeType: neType, NeUID: neId}, false, false) if len(neInfoArr) < 1 { services.ResponseInternalServerError500DatabaseOperationFailed(w) return } neInfo := neInfoArr[0] - if neInfo.NeId != neId || neInfo.IP == "" { + if neInfo.NeUID != neId || neInfo.IPAddr == "" { services.ResponseWithJson(w, 200, map[string]any{ "code": 0, "msg": "neInfo not found", @@ -667,7 +667,7 @@ func PostMMLToOMC(w http.ResponseWriter, r *http.Request) { } log.Trace("Body:", string(body)) - hostUri := fmt.Sprintf("http://%s:%d", neInfo.IP, neInfo.Port) + hostUri := fmt.Sprintf("http://%s:%d", neInfo.IPAddr, neInfo.Port) omcMmlVar := &mmlp.MmlVar{ Version: global.Version, Output: mmlp.DefaultFormatType, diff --git a/features/pm/performance.go b/features/pm/performance.go index 42351e7b..48a835e0 100644 --- a/features/pm/performance.go +++ b/features/pm/performance.go @@ -168,8 +168,7 @@ func saveKPIData(kpiReport KpiReport, index int64) int64 { KpiValuesByte, _ := json.Marshal(KpiValues) kpiData := neDataModel.KpiReport{ NeType: taskNe.NeType, - NeName: taskNe.NEName, - RmUid: taskNe.RmUID, + NeUID: taskNe.RmUID, Date: date.ParseDateToStr(receiverTime, "2006-01-02"), StartTime: date.ParseDateToStr(startTime, "15:04:05"), EndTime: date.ParseDateToStr(endTime, "15:04:05"), @@ -183,8 +182,8 @@ func saveKPIData(kpiReport KpiReport, index int64) int64 { // 指标事件对象 kpiEvent := map[string]any{ "neType": kpiData.NeType, - "neName": kpiData.NeName, - "rmUID": kpiData.RmUid, + "coreUid": kpiData.CoreUID, + "neUid": kpiData.NeUID, "startIndex": kpiData.Index, "timeGroup": kpiData.CreatedAt, // kip_id ... @@ -194,15 +193,15 @@ func saveKPIData(kpiReport KpiReport, index int64) int64 { } // 发送到匹配的网元 - neInfo := neService.NewNeInfo.FindByRmuid(kpiData.RmUid) - if neInfo.RmUID == kpiData.RmUid { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.NeUID) + if neInfo.NeUID == kpiData.NeUID { // 推送到ws订阅组 - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.CoreUID, neInfo.NeUID), kpiEvent) if neInfo.NeType == "UPF" { // 更新UPF总流量 upValue := parse.Number(kpiEvent["UPF.03"]) downValue := parse.Number(kpiEvent["UPF.06"]) - neDataService.NewKpiReport.UPFTodayFlowUpdate(neInfo.RmUID, upValue, downValue) + neDataService.NewKpiReport.UPFTodayFlowUpdate(neInfo.NeUID, upValue, downValue) } } } @@ -248,8 +247,8 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 { KpiValuesByte, _ := json.Marshal(KpiValues) kpiData := neDataModel.KpiCReport{ NeType: taskNe.NeType, - NeName: taskNe.NEName, - RmUid: taskNe.RmUID, + CoreUID: taskNe.NEName, + NeUID: taskNe.RmUID, Date: date.ParseDateToStr(receiverTime, "2006-01-02"), StartTime: date.ParseDateToStr(startTime, "15:04:05"), EndTime: date.ParseDateToStr(endTime, "15:04:05"), @@ -263,8 +262,8 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 { // 指标事件对象 kpiEvent := map[string]any{ "neType": kpiData.NeType, - "neName": kpiData.NeName, - "rmUID": kpiData.RmUid, + "neName": kpiData.NeUID, + "rmUID": kpiData.NeUID, "startIndex": kpiData.Index, "timeGroup": kpiData.CreatedAt, // kip_id ... @@ -274,10 +273,10 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 { } // 发送到匹配的网元 - neInfo := neService.NewNeInfo.FindByRmuid(kpiData.RmUid) - if neInfo.RmUID == kpiData.RmUid { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.NeUID) + if neInfo.NeUID == kpiData.NeUID { // 推送自定义KPI到ws订阅组 - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiEvent) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.CoreUID, neInfo.NeUID), kpiEvent) } } return insertId @@ -379,12 +378,12 @@ func PostKPIReportFromNFOld(w http.ResponseWriter, r *http.Request) { } // 发送到匹配的网元 - neInfo := neService.NewNeInfo.FindByRmuid(kpiData.RmUid) + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.RmUid) // custom kpi report to FE kpiCEvent := map[string]any{ // kip_id ... "neType": kpiData.NEType, - "neId": neInfo.NeId, + "neId": neInfo.NeUID, "neName": kpiData.NEName, "rmUID": kpiData.RmUid, "startIndex": kpiData.Index, @@ -413,11 +412,11 @@ func PostKPIReportFromNFOld(w http.ResponseWriter, r *http.Request) { // KPI自定义指标入库 kpi_c_report.InsertKpiCReport(kpiData.NEType, report) - if neInfo.RmUID == kpiData.RmUid { + if neInfo.NeUID == kpiData.RmUid { // 推送到ws订阅组 - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI, neInfo.CoreUID, neInfo.NeUID), kpiEvent) // 推送自定义KPI到ws订阅组 - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s_%s", wsService.GROUP_KPI_C, neInfo.CoreUID, neInfo.NeUID), kpiCEvent) } services.ResponseStatusOK204NoContent(w) diff --git a/features/ue/ue.go b/features/ue/ue.go index 4c4ebb9a..fe924f5d 100644 --- a/features/ue/ue.go +++ b/features/ue/ue.go @@ -258,11 +258,11 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) { return } - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId) + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(neType, neId) var response services.MapResponse - if neInfo.NeId == neId && neInfo.NeId != "" { - requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI) + if neInfo.NeUID == neId && neInfo.NeUID != "" { + requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IPAddr, neInfo.Port, r.RequestURI) log.Debug("requestURI2NF:", requestURI2NF) resp, err := client.R(). EnableTrace(). @@ -652,8 +652,8 @@ func PostNBInfoFromNF(w http.ResponseWriter, r *http.Request) { return } - neInfo := neService.NewNeInfo.FindByRmuid(body.RmUID) - if neInfo.RmUID != body.RmUID { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", body.RmUID) + if neInfo.NeUID != body.RmUID { services.ResponseInternalServerError500ProcessError(w, fmt.Errorf("inconsistent network element rmUID")) return } @@ -674,8 +674,8 @@ func PostNBInfoFromNF(w http.ResponseWriter, r *http.Request) { } nbStateService.Insert(neDataModel.NBState{ NeType: neInfo.NeType, - NeId: neInfo.NeId, - RmUid: neInfo.RmUID, + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, Address: v.Address, Name: v.Name, Position: v.Position, diff --git a/lib/dborm/dborm.go b/lib/dborm/dborm.go index cfe12f29..1308aea3 100644 --- a/lib/dborm/dborm.go +++ b/lib/dborm/dborm.go @@ -208,17 +208,17 @@ type NeInfo struct { func XormGetNeInfo(neType string, neId string) (*NeInfo, error) { log.Debug("XormGetNeInfo processing... ") - neInfox := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId) + neInfox := neService.NewNeInfo.FindByCoreUidAndNeUid(neType, neId) neInfo := new(NeInfo) neInfo.NeType = neType neInfo.NeId = neId - neInfo.RmUID = neInfox.RmUID + neInfo.RmUID = neInfox.NeType neInfo.NeName = neInfox.NeName - neInfo.Ip = neInfox.IP + neInfo.Ip = neInfox.IPAddr neInfo.Port = fmt.Sprint(neInfox.Port) neInfo.PvFlag = neInfox.PvFlag - neInfo.NeAddress = neInfox.NeAddress + neInfo.NeAddress = neInfox.MacAddr neInfo.Province = neInfox.Province neInfo.VendorName = neInfox.VendorName neInfo.Dn = neInfox.Dn diff --git a/lib/routes/routes.go b/lib/routes/routes.go index e276ef18..9c142ebc 100644 --- a/lib/routes/routes.go +++ b/lib/routes/routes.go @@ -133,29 +133,6 @@ func init() { Register("POST", pm.CustomMeasurementUri, pm.PostMeasurementFromNF, nil) Register("GET", pm.CustomMeasurementUri, pm.GetMeasurementFromNF, nil) - // parameter config management - Register("GET", cm.ParamConfigUri, cm.GetParamConfigFromNF, nil) - Register("POST", cm.ParamConfigUri, cm.PostParamConfigToNF, midware.LogOperate(collectlogs.OptionNew("log.operate.title.neConfig", collectlogs.BUSINESS_TYPE_INSERT))) - Register("PUT", cm.ParamConfigUri, cm.PutParamConfigToNF, midware.LogOperate(collectlogs.OptionNew("log.operate.title.neConfig", collectlogs.BUSINESS_TYPE_UPDATE))) - Register("DELETE", cm.ParamConfigUri, cm.DeleteParamConfigToNF, midware.LogOperate(collectlogs.OptionNew("log.operate.title.neConfig", collectlogs.BUSINESS_TYPE_INSERT))) - - Register("GET", cm.CustomParamConfigUri, cm.GetParamConfigFromNF, nil) - Register("POST", cm.CustomParamConfigUri, cm.PostParamConfigToNF, nil) - Register("PUT", cm.CustomParamConfigUri, cm.PutParamConfigToNF, nil) - Register("DELETE", cm.CustomParamConfigUri, cm.DeleteParamConfigToNF, nil) - - // Get/Create/Modify/Delete NE info - Register("GET", cm.UriNeInfo, cm.GetNeInfo, nil) - Register("POST", cm.UriNeInfo, cm.PostNeInfo, midware.LogOperate(collectlogs.OptionNew("NE Info", collectlogs.BUSINESS_TYPE_INSERT))) - Register("PUT", cm.UriNeInfo, cm.PutNeInfo, midware.LogOperate(collectlogs.OptionNew("NE Info", collectlogs.BUSINESS_TYPE_UPDATE))) - Register("DELETE", cm.UriNeInfo, cm.DeleteNeInfo, midware.LogOperate(collectlogs.OptionNew("NE Info", collectlogs.BUSINESS_TYPE_DELETE))) - - // Get/Create/Modify/Delete NE info - Register("GET", cm.CustomUriNeInfo, cm.GetNeInfo, nil) - Register("POST", cm.CustomUriNeInfo, cm.PostNeInfo, nil) - Register("PUT", cm.CustomUriNeInfo, cm.PutNeInfo, nil) - Register("DELETE", cm.CustomUriNeInfo, cm.DeleteNeInfo, nil) - //ne service action handle Register("POST", cm.UriNeService, cm.PostNeServiceAction, nil) //ne service action handle diff --git a/src/framework/telnet/telnet.go b/src/framework/telnet/telnet.go index 8b2c2ec4..f4633896 100644 --- a/src/framework/telnet/telnet.go +++ b/src/framework/telnet/telnet.go @@ -29,7 +29,7 @@ func (c *ConnTelnet) NewClient() (*ConnTelnet, error) { proto = "tcp6" c.Addr = fmt.Sprintf("[%s]", c.Addr) } - addr := fmt.Sprintf("%s:%d", c.Addr, c.Port) + addr := net.JoinHostPort(c.Addr, fmt.Sprint(c.Port)) // 默认等待5s if c.DialTimeOut == 0 { diff --git a/src/framework/utils/machine/launch.go b/src/framework/utils/machine/launch.go index f1edaa8c..23e75545 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)) } // 网管本地路径 @@ -69,8 +74,8 @@ func codeFileRead() (map[string]any, error) { } content := string(bytes) // 解密 - hostKey := config.Get("aes.hostKey").(string) - contentDe, err := crypto.AESDecryptBase64(content, hostKey) + appKey := config.Get("aes.appKey").(string) + contentDe, err := crypto.AESDecryptBase64(content, appKey) if err != nil { logger.Errorf("CodeFileRead decrypt: %v", err.Error()) return mapData, fmt.Errorf("decrypt fail") @@ -88,8 +93,8 @@ func codeFileRead() (map[string]any, error) { func codeFileWrite(data map[string]any) error { jsonByte, _ := json.Marshal(data) // 加密 - hostKey := config.Get("aes.hostKey").(string) - contentEn, err := crypto.AESEncryptBase64(string(jsonByte), hostKey) + appKey := config.Get("aes.appKey").(string) + contentEn, err := crypto.AESEncryptBase64(string(jsonByte), appKey) if err != nil { logger.Errorf("insert encrypt: %v", err.Error()) return fmt.Errorf("encrypt fail") 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 c04b6781..a1cb43fd 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 @@ -72,22 +72,22 @@ func (s *BackupExportCDRProcessor) Execute(data any) (any, error) { case "ims": neList := s.neInfoService.Find(neModel.NeInfo{NeType: "IMS"}, false, false) for _, ne := range neList { - result[ne.NeName] = s.exportIMS(params.Hour, ne.RmUID, params.FileType) + result[ne.NeName] = s.exportIMS(ne.CoreUID, ne.NeUID, params.Hour, params.FileType) } case "smsc": neList := s.neInfoService.Find(neModel.NeInfo{NeType: "SMSC"}, false, false) for _, ne := range neList { - result[ne.NeName] = s.exportSMSC(params.Hour, ne.RmUID, params.FileType) + result[ne.NeName] = s.exportSMSC(ne.CoreUID, ne.NeUID, params.Hour, params.FileType) } case "smf": neList := s.neInfoService.Find(neModel.NeInfo{NeType: "SMF"}, false, false) for _, ne := range neList { - result[ne.NeName] = s.exportSMF(params.Hour, ne.RmUID, params.FileType) + result[ne.NeName] = s.exportSMF(ne.CoreUID, ne.NeUID, params.Hour, params.FileType) } case "sgwc": neList := s.neInfoService.Find(neModel.NeInfo{NeType: "SGWC"}, false, false) for _, ne := range neList { - result[ne.NeName] = s.exportSGWC(params.Hour, ne.RmUID, params.FileType) + result[ne.NeName] = s.exportSGWC(ne.CoreUID, ne.NeUID, params.Hour, params.FileType) } } } @@ -97,7 +97,7 @@ func (s *BackupExportCDRProcessor) Execute(data any) (any, error) { } // exportIMS 导出IMS-CDR会话事件数据 -func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) string { +func (s BackupExportCDRProcessor) exportIMS(coreUid, neUid string, hour int, fileType string) string { // 前 hour 小时 now := time.Now() end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location()) @@ -107,7 +107,8 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st query := neDataModel.CDREventIMSQuery{ SortField: "timestamp", SortOrder: "asc", - RmUID: rmUID, + CoreUID: coreUid, + NeUID: neUid, BeginTime: start.UnixMilli(), EndTime: end.UnixMilli(), PageNum: 1, @@ -232,7 +233,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st data = append(data, []string{ fmt.Sprint(row.ID), - row.NeName, + row.NeUID, recordType, callTypeLable, caller, @@ -359,7 +360,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, - "B" + idx: row.NeName, + "B" + idx: row.NeUID, "C" + idx: recordType, "D" + idx: callTypeLable, "E" + idx: caller, @@ -386,7 +387,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st } // exportSMSC 导出SMSC-CDR会话事件数据 -func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) string { +func (s BackupExportCDRProcessor) exportSMSC(coreUid, neUid string, hour int, fileType string) string { // 前 hour 小时 now := time.Now() end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location()) @@ -396,7 +397,8 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s query := neDataModel.CDREventSMSCQuery{ SortField: "timestamp", SortOrder: "asc", - RmUID: rmUID, + CoreUID: coreUid, + NeUID: neUid, BeginTime: start.UnixMilli(), EndTime: end.UnixMilli(), PageNum: 1, @@ -488,7 +490,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s data = append(data, []string{ fmt.Sprint(row.ID), - row.NeName, + row.NeUID, recordType, serviceType, caller, @@ -579,7 +581,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, - "B" + idx: row.NeName, + "B" + idx: row.NeUID, "C" + idx: recordType, "D" + idx: serviceType, "E" + idx: caller, @@ -603,7 +605,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s } // exportSMF 导出SMF-CDR会话事件数据 -func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) string { +func (s BackupExportCDRProcessor) exportSMF(coreUid, neUid string, hour int, fileType string) string { // 前 hour 小时 now := time.Now() end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location()) @@ -612,7 +614,8 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st query := neDataModel.CDREventSMFQuery{ SortField: "timestamp", SortOrder: "asc", - RmUID: rmUID, + CoreUID: coreUid, + NeUID: neUid, BeginTime: start.UnixMilli(), EndTime: end.UnixMilli(), PageNum: 1, @@ -787,8 +790,8 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st data = append(data, []string{ fmt.Sprint(row.ID), chargingID, - row.NeName, - row.RmUid, + row.NeType, + row.NeUID, subscriptionIDData, subscriptionIDType, fmt.Sprint(dataVolumeUplink), @@ -974,8 +977,8 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, "B" + idx: chargingID, - "C" + idx: row.NeName, - "D" + idx: row.RmUid, + "C" + idx: row.NeType, + "D" + idx: row.NeUID, "E" + idx: subscriptionIDData, "F" + idx: subscriptionIDType, "G" + idx: dataVolumeUplink, @@ -1011,7 +1014,7 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st } // exportSGWC 导出SGWC-CDR会话事件数据 -func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) string { +func (s BackupExportCDRProcessor) exportSGWC(coreUid, neUid string, hour int, fileType string) string { // 前 hour 小时 now := time.Now() end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location()) @@ -1020,7 +1023,8 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s query := neDataModel.CDREventSGWCQuery{ SortField: "timestamp", SortOrder: "asc", - RmUID: rmUID, + CoreUID: coreUid, + NeUID: neUid, BeginTime: start.UnixMilli(), EndTime: end.UnixMilli(), PageNum: 1, @@ -1197,8 +1201,8 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s data = append(data, []string{ fmt.Sprint(row.ID), - row.NeName, - row.RmUid, + row.NeType, + row.NeUID, chargingID, servedIMSI, servedMSISDN, @@ -1388,8 +1392,8 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, - "B" + idx: row.NeName, - "C" + idx: row.RmUid, + "B" + idx: row.NeType, + "C" + idx: row.NeUID, "D" + idx: chargingID, "E" + idx: servedIMSI, "F" + idx: servedMSISDN, 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 554eb4dd..7f1efb59 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 @@ -342,8 +342,8 @@ func (s BackupExportTableProcessor) exportSMF(hour int, columns []string, filePa if col == "id" { arr[i] = fmt.Sprintf("%d", row.ID) } - if col == "neName" || col == "ne_name" { - arr[i] = fmt.Sprintf("%v", row.NeName) + if col == "neType" || col == "ne_type" { + arr[i] = fmt.Sprintf("%v", row.NeType) } // 单层json if strings.HasPrefix("json", col) { @@ -461,8 +461,8 @@ func (s BackupExportTableProcessor) exportIMS(hour int, columns []string, filePa if col == "id" { arr[i] = fmt.Sprintf("%d", row.ID) } - if col == "neName" || col == "ne_name" { - arr[i] = fmt.Sprintf("%v", row.NeName) + if col == "neType" || col == "ne_type" { + arr[i] = fmt.Sprintf("%v", row.NeType) } // 单层json if strings.HasPrefix("json", col) { @@ -651,8 +651,8 @@ func (s BackupExportTableProcessor) exportSMSC(hour int, columns []string, fileP if v == "id" { arr[i] = fmt.Sprintf("%d", row.ID) } - if v == "neName" || v == "ne_name" { - arr[i] = fmt.Sprintf("%v", row.NeName) + if v == "neType" || v == "ne_type" { + arr[i] = fmt.Sprintf("%v", row.NeType) } // 单层json if strings.HasPrefix("json", v) { @@ -840,8 +840,8 @@ func (s BackupExportTableProcessor) exportSGWC(hour int, columns []string, fileP if v == "id" { arr[i] = fmt.Sprintf("%d", row.ID) } - if v == "neName" || v == "ne_name" { - arr[i] = fmt.Sprintf("%v", row.NeName) + if v == "neType" || v == "ne_type" { + arr[i] = fmt.Sprintf("%v", row.NeType) } // 单层json if strings.HasPrefix("json", v) { 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 e0625a6e..ffb05a70 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 @@ -63,13 +63,13 @@ func (s *BackupExportUDMProcessor) Execute(data any) (any, error) { for _, v := range params.DataType { switch v { case "auth": - result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportAuth(neInfo.NeId, params.FileType) + result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportAuth(neInfo.CoreUID, neInfo.NeUID, params.FileType) case "sub": - result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportSub(neInfo.NeId, params.FileType) + result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportSub(neInfo.CoreUID, neInfo.NeUID, params.FileType) case "voip": - result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportVOIP(neInfo.NeId, params.FileType) + result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportVOIP(neInfo.CoreUID, neInfo.NeUID, params.FileType) case "volte": - result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportVolte(neInfo.NeId, params.FileType) + result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportVolte(neInfo.CoreUID, neInfo.NeUID, params.FileType) } } } @@ -79,14 +79,14 @@ func (s *BackupExportUDMProcessor) Execute(data any) (any, error) { } // exportAuth 导出鉴权用户数据 -func (s BackupExportUDMProcessor) exportAuth(neId, fileType string) string { - rows := s.udmAuthService.Find(neDataModel.UDMAuthUser{NeId: neId}) +func (s BackupExportUDMProcessor) exportAuth(coreUid, neUid, fileType string) string { + rows := s.udmAuthService.Find(neDataModel.UDMAuthUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } // 文件名 - fileName := fmt.Sprintf("auth_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType) + fileName := fmt.Sprintf("auth_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType) filePath := filepath.Join("/usr/local/omc/backup/udm_data/auth", fileName) if runtime.GOOS == "windows" { filePath = fmt.Sprintf("C:%s", filePath) @@ -133,14 +133,14 @@ func (s BackupExportUDMProcessor) exportAuth(neId, fileType string) string { } // exportSub 导出签约用户数据 -func (s BackupExportUDMProcessor) exportSub(neId, fileType string) string { - rows := s.udmSubService.Find(neDataModel.UDMSubUser{NeId: neId}) +func (s BackupExportUDMProcessor) exportSub(coreUid, neUid, fileType string) string { + rows := s.udmSubService.Find(neDataModel.UDMSubUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } // 文件名 - fileName := fmt.Sprintf("sub_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType) + fileName := fmt.Sprintf("sub_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType) filePath := filepath.Join("/usr/local/omc/backup/udm_data/sub", fileName) if runtime.GOOS == "windows" { filePath = fmt.Sprintf("C:%s", filePath) @@ -181,14 +181,14 @@ func (s BackupExportUDMProcessor) exportSub(neId, fileType string) string { } // exportVOIP 导出VOIP用户数据 -func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string { - rows := s.udmVOIPService.Find(neDataModel.UDMVOIPUser{NeId: neId}) +func (s BackupExportUDMProcessor) exportVOIP(coreUid, neUid, fileType string) string { + rows := s.udmVOIPService.Find(neDataModel.UDMVOIPUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } // 文件名 - fileName := fmt.Sprintf("voip_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType) + fileName := fmt.Sprintf("voip_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType) filePath := filepath.Join("/usr/local/omc/backup/udm_data/voip", fileName) if runtime.GOOS == "windows" { filePath = fmt.Sprintf("C:%s", filePath) @@ -227,14 +227,14 @@ func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string { } // exportVolte 导出Volte用户数据 -func (s BackupExportUDMProcessor) exportVolte(neId, fileType string) string { - rows := s.udmVolteIMSService.Find(neDataModel.UDMVolteIMSUser{NeId: neId}) +func (s BackupExportUDMProcessor) exportVolte(coreUid, neUid, fileType string) string { + rows := s.udmVolteIMSService.Find(neDataModel.UDMVolteIMSUser{CoreUID: coreUid, NeUID: neUid}) if len(rows) <= 0 { return "no data" } // 文件名 - fileName := fmt.Sprintf("volte_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType) + fileName := fmt.Sprintf("volte_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType) filePath := filepath.Join("/usr/local/omc/backup/udm_data/volte", fileName) if runtime.GOOS == "windows" { filePath = fmt.Sprintf("C:%s", filePath) diff --git a/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go b/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go index 982b7323..fe589c81 100644 --- a/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go +++ b/src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go @@ -55,18 +55,17 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) { neList := s.neInfoService.Find(neModel.NeInfo{}, false, false) for _, neInfo := range neList { - neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId) tx := db.DB("").Model(&neModel.NeConfigBackup{}) - tx = tx.Where("ne_type = ? and ne_id = ?", neInfo.NeType, neInfo.NeId) + tx = tx.Where("core_uid = ? and ne_uid = ?", neInfo.CoreUID, neInfo.NeUID) // 查询数量为0直接返回 var total int64 = 0 if err := tx.Count(&total).Error; err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } if total <= int64(params.StoreNum) { - result[neTypeAndId] = "less than storeNum" + result[neInfo.NeUID] = "less than storeNum" continue } @@ -74,11 +73,11 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) { var lastCreateTime int64 = 0 lastTx := tx.Select("create_time").Order("create_time DESC").Limit(1) if err := lastTx.Find(&lastCreateTime).Error; err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } if lastCreateTime <= 1e12 { - result[neTypeAndId] = "no data" + result[neInfo.NeUID] = "no data" continue } @@ -89,22 +88,22 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) { // 删除小于最后时间的数据 delTx := tx.Delete("create_time < ?", ltTime.UnixMilli()) if err := delTx.Error; err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } - result[neTypeAndId] = tx.RowsAffected + result[neInfo.NeUID] = tx.RowsAffected // 删除本地文件 - s.deleteFile(neInfo.NeType, neInfo.NeId, ltTime) + s.deleteFile(neInfo.CoreUID, neInfo.NeUID, ltTime) } return result, nil } // deleteFile 删除本地文件 -func (s DeleteNeConfigBackupProcessor) deleteFile(neType, neId string, oldFileDate time.Time) { +func (s DeleteNeConfigBackupProcessor) deleteFile(neType, neUid string, oldFileDate time.Time) { neTypeLower := strings.ToLower(neType) - localPath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s ", neTypeLower, neId) + localPath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s ", neTypeLower, neUid) files, err := os.ReadDir(localPath) if err != nil { logger.Errorf("logger Remove ne_config File ReadDir err: %v", err.Error()) @@ -113,7 +112,7 @@ func (s DeleteNeConfigBackupProcessor) deleteFile(neType, neId string, oldFileDa for _, file := range files { // 跳过非指定文件名 // zipFileName := fmt.Sprintf("%s-%s-etc-%s.zip", neTypeLower, neInfo.NeId, date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS)) - fileName := fmt.Sprintf("%s-%s-etc-", neTypeLower, neId) + fileName := fmt.Sprintf("%s-%s-etc-", neTypeLower, neUid) if !strings.HasPrefix(file.Name(), fileName) { continue } diff --git a/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go b/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go index f2d6e9a7..0a713016 100644 --- a/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go +++ b/src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go @@ -69,15 +69,15 @@ func (s *NeAlarmStateCheckProcessor) Execute(data any) (any, error) { if neInfo.CreateTime == 0 { continue } - neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId) // 网元在线状态 isOnline := parse.Boolean(neInfo.ServerState["online"]) // 告警ID params.AlarmId = fmt.Sprintf("%d%d", constants.ALARM_STATE_CHECK, neInfo.CreateTime) // 检查网元告警ID是否唯一 alarmIdArr := s.alarmService.Find(neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmId: params.AlarmId, }) // 告警状态 @@ -90,12 +90,12 @@ func (s *NeAlarmStateCheckProcessor) Execute(data any) (any, error) { // 进行清除 clearAlarm, err := s.alarmClear(neInfo, alarmIdArr[0]) if err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeUID) s.wsSendService.ByGroupID(groupID, clearAlarm) - result[neTypeAndId] = "alarm clear" + result[neInfo.NeUID] = "alarm clear" } // 不在线 @@ -103,12 +103,12 @@ func (s *NeAlarmStateCheckProcessor) Execute(data any) (any, error) { // 进行新增 newAlarm, err := s.alarmNew(neInfo, params) if err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.CoreUID, neInfo.NeUID) s.wsSendService.ByGroupID(groupID, newAlarm) - result[neTypeAndId] = "alarm new" + result[neInfo.NeUID] = "alarm new" } } @@ -135,17 +135,15 @@ func (s NeAlarmStateCheckProcessor) alarmClear(neInfo neModel.NeInfo, v neDataMo // alarmNew 新增告警 func (s NeAlarmStateCheckProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParams) (neDataModel.Alarm, error) { // seq 告警序号 - lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.NeId) + lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.CoreUID, neInfo.NeUID) lastTime := neInfo.UpdateTime // 网元最后更新时间 if lastTime < neInfo.CreateTime { lastTime = time.Now().UnixMilli() } alarm := neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, - NeName: neInfo.NeName, - Province: neInfo.Province, - PvFlag: neInfo.PvFlag, AlarmSeq: lastSeq + 1, AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -154,7 +152,7 @@ func (s NeAlarmStateCheckProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParam AlarmType: v.AlarmType, OrigSeverity: v.OrigSeverity, PerceivedSeverity: v.OrigSeverity, - ObjectUid: neInfo.RmUID, + ObjectUid: neInfo.NeUID, ObjectName: "NE State", ObjectType: "state", LocationInfo: "NE State: Heartbeat", diff --git a/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go b/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go index 6a622081..21dfcbe5 100644 --- a/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go +++ b/src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go @@ -103,18 +103,20 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) { } // 检查状态 + neInfo.ServerState["coreUid"] = neInfo.CoreUID + neInfo.ServerState["neUid"] = neInfo.NeUID err := s.serverState(neInfo.ServerState, params.CPUUseGt, params.MemUseGt, params.DiskUseGt) if err == nil { continue } - neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId) // 告警ID params.AlarmId = fmt.Sprintf("%d%d", constants.ALARM_CMD_CHECK, neInfo.CreateTime) // 检查网元告警ID是否唯一 alarmIdArr := s.alarmService.Find(neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmId: params.AlarmId, }) // 告警状态, 存在的需要手动清除 @@ -126,12 +128,12 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) { if alarmStatus == "1" { clearAlarm, err := s.alarmClear(neInfo, alarmIdArr[0]) if err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.CoreUID, neInfo.NeUID) s.wsSendService.ByGroupID(groupID, clearAlarm) - result[neTypeAndId] = "alarm clear" + result[neInfo.NeUID] = "alarm clear" alarmStatus = "" // 标记为未记录再次发起新告警 } // 未记录 @@ -147,12 +149,12 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) { params.AddInfo = addInfo // 恢复附加信息 triggerCount.Clear() // 重置连续触发次数 if err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.CoreUID, neInfo.NeUID) s.wsSendService.ByGroupID(groupID, newAlarm) - result[neTypeAndId] = "alarm new" + result[neInfo.NeUID] = "alarm new" } } @@ -204,8 +206,8 @@ func (s NeAlarmStateCheckCMDProcessor) serverState(state map[string]any, cpuUseG // 插入网元状态记录 neState := neDataModel.NEState{ - NeType: fmt.Sprint(state["neType"]), - NeId: fmt.Sprint(state["neId"]), + CoreUID: fmt.Sprint(state["coreUid"]), + NeUID: fmt.Sprint(state["neUid"]), Version: fmt.Sprint(state["version"]), Capability: parse.Number(state["capability"]), SerialNum: fmt.Sprint(state["sn"]), @@ -221,7 +223,7 @@ func (s NeAlarmStateCheckCMDProcessor) serverState(state map[string]any, cpuUseG // 删除网元状态记录7天前 s.neStateService.DeleteByTime(time.Now().UnixMilli() - 7*24*60*60*1000) // 推送ws消息 - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_NE_STATE, neState.NeType, neState.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_NE_STATE, neState.CoreUID, neState.NeUID) s.wsSendService.ByGroupID(groupID, neState) // 检查CPU/Menory/Disk使用率 @@ -237,9 +239,8 @@ func (s NeAlarmStateCheckCMDProcessor) serverState(state map[string]any, cpuUseG } if len(warnMsg) > 0 { currentTime := time.Now() - neTypeAndId := fmt.Sprintf("%s_%s", neState.NeType, neState.NeId) validTimes := []time.Time{} - if v, ok := triggerCount.Load(neTypeAndId); ok { + if v, ok := triggerCount.Load(neState.NeUID); ok { times := v.([]time.Time) // 清理过期的记录：10秒前的触发记录不再计入 for _, t := range times { @@ -248,11 +249,11 @@ func (s NeAlarmStateCheckCMDProcessor) serverState(state map[string]any, cpuUseG } } validTimes = append(validTimes, currentTime) - triggerCount.Store(neTypeAndId, validTimes) + triggerCount.Store(neState.NeUID, validTimes) } else { // 事件第一次触发，初始化记录 validTimes = append(validTimes, currentTime) - triggerCount.Store(neTypeAndId, validTimes) + triggerCount.Store(neState.NeUID, validTimes) } if int64(len(validTimes)) >= triggerMax { return fmt.Errorf("greater than %s", strings.Join(warnMsg, ", ")) @@ -280,17 +281,15 @@ func (s NeAlarmStateCheckCMDProcessor) alarmClear(neInfo neModel.NeInfo, v neDat // alarmNew 新增告警 func (s NeAlarmStateCheckCMDProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParams) (neDataModel.Alarm, error) { // seq 告警序号 - lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.NeId) + lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.CoreUID, neInfo.NeUID) lastTime := neInfo.UpdateTime // 网元最后更新时间 if lastTime < neInfo.CreateTime { lastTime = time.Now().UnixMilli() } alarm := neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, - NeName: neInfo.NeName, - Province: neInfo.Province, - PvFlag: neInfo.PvFlag, AlarmSeq: lastSeq + 1, AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -299,7 +298,7 @@ func (s NeAlarmStateCheckCMDProcessor) alarmNew(neInfo neModel.NeInfo, v alarmPa AlarmType: v.AlarmType, OrigSeverity: v.OrigSeverity, PerceivedSeverity: v.OrigSeverity, - ObjectUid: neInfo.RmUID, + ObjectUid: neInfo.NeUID, ObjectName: "NE CPU/Menory/Disk", ObjectType: "cmd", LocationInfo: "NE CPU/Menory/Disk: Heartbeat", diff --git a/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go b/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go index d3d777d9..0a03bfab 100644 --- a/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go +++ b/src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go @@ -92,13 +92,13 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) { params.AddInfo = err.Error() } - neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId) // 告警ID params.AlarmId = fmt.Sprintf("%d%d", constants.ALARM_LICENSE_CHECK, neInfo.CreateTime) // 检查网元告警ID是否唯一 alarmIdArr := s.alarmService.Find(neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, AlarmId: params.AlarmId, }) // 告警状态, 存在的需要手动清除 @@ -110,12 +110,12 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) { if alarmStatus == "1" { clearAlarm, err := s.alarmClear(neInfo, alarmIdArr[0]) if err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.CoreUID, neInfo.NeUID) s.wsSendService.ByGroupID(groupID, clearAlarm) - result[neTypeAndId] = "alarm clear" + result[neInfo.NeUID] = "alarm clear" alarmStatus = "" // 标记为未记录再次发起新告警 } // 未记录 @@ -130,12 +130,12 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) { newAlarm, err := s.alarmNew(neInfo, params) params.AddInfo = addInfo // 恢复附加信息 if err != nil { - result[neTypeAndId] = err.Error() + result[neInfo.NeUID] = err.Error() continue } - groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.NeType, neInfo.NeId) + groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_ALARM, neInfo.CoreUID, neInfo.NeUID) s.wsSendService.ByGroupID(groupID, newAlarm) - result[neTypeAndId] = "alarm new" + result[neInfo.NeUID] = "alarm new" } } @@ -183,17 +183,15 @@ func (s NeAlarmStateCheckLicenseProcessor) alarmClear(neInfo neModel.NeInfo, v n // alarmNew 新增告警 func (s NeAlarmStateCheckLicenseProcessor) alarmNew(neInfo neModel.NeInfo, v alarmParams) (neDataModel.Alarm, error) { // seq 告警序号 - lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.NeType, neInfo.NeId) + lastSeq := s.alarmService.FindAlarmSeqLast(neInfo.CoreUID, neInfo.NeUID) lastTime := neInfo.UpdateTime // 网元最后更新时间 if lastTime < neInfo.CreateTime { lastTime = time.Now().UnixMilli() } alarm := neDataModel.Alarm{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, - NeName: neInfo.NeName, - Province: neInfo.Province, - PvFlag: neInfo.PvFlag, AlarmSeq: lastSeq + 1, AlarmId: v.AlarmId, AlarmTitle: v.AlarmTitle, @@ -202,7 +200,7 @@ func (s NeAlarmStateCheckLicenseProcessor) alarmNew(neInfo neModel.NeInfo, v ala AlarmType: v.AlarmType, OrigSeverity: v.OrigSeverity, PerceivedSeverity: v.OrigSeverity, - ObjectUid: neInfo.RmUID, + ObjectUid: neInfo.NeUID, ObjectName: "NE License", ObjectType: "license", LocationInfo: "NE License: Heartbeat", diff --git a/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go b/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go index 215c5aac..85de65d5 100644 --- a/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go +++ b/src/modules/crontask/processor/ne_config_backup/ne_config_backup.go @@ -38,7 +38,7 @@ func (s *NeConfigBackupProcessor) Execute(data any) (any, error) { neList := s.neInfoService.Find(neModel.NeInfo{}, false, false) for _, neInfo := range neList { - neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId) + neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.ID) // 将网元文件备份到本地 zipFilePath, err := s.neConfigBackupService.FileNeToLocal(neInfo) if err != nil { @@ -48,8 +48,9 @@ func (s *NeConfigBackupProcessor) Execute(data any) (any, error) { // 新增备份记录 item := neModel.NeConfigBackup{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, Name: filepath.Base(zipFilePath), Path: zipFilePath, CreateBy: "system", 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 ad16557a..47bc44af 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 @@ -37,8 +37,8 @@ func (s *NeDataUDM) Execute(data any) (any, error) { neList := s.neInfoService.Find(neModel.NeInfo{NeType: "UDM"}, false, false) for _, neInfo := range neList { - result[fmt.Sprintf("AuthNumber_%s", neInfo.NeId)] = s.udmAuthService.ResetData(neInfo.NeId) - result[fmt.Sprintf("SubNumber_%s", neInfo.NeId)] = s.udmSubService.ResetData(neInfo.NeId) + result[fmt.Sprintf("AuthNumber_%s", neInfo.NeUID)] = s.udmAuthService.ResetData(neInfo.CoreUID, neInfo.NeUID) + result[fmt.Sprintf("SubNumber_%s", neInfo.NeUID)] = s.udmSubService.ResetData(neInfo.CoreUID, neInfo.NeUID) } return result, nil diff --git a/src/modules/network_data/controller/all_kpi.go b/src/modules/network_data/controller/all_kpi.go index 6ba91898..128eee37 100644 --- a/src/modules/network_data/controller/all_kpi.go +++ b/src/modules/network_data/controller/all_kpi.go @@ -3,8 +3,6 @@ package controller import ( "fmt" - "be.ems/src/framework/i18n" - "be.ems/src/framework/reqctx" "be.ems/src/framework/resp" "be.ems/src/modules/network_data/model" neDataService "be.ems/src/modules/network_data/service" @@ -45,7 +43,6 @@ type KPIController struct { // @Description Access to statistical data // @Router /neData/kpi/data [get] func (s KPIController) KPIData(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var querys model.KPIQuery if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -53,14 +50,6 @@ func (s KPIController) KPIData(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID - // 查询数据 kpiData := s.kpiReportService.FindData(querys) c.JSON(200, resp.OkData(kpiData)) diff --git a/src/modules/network_data/controller/all_nb_state.go b/src/modules/network_data/controller/all_nb_state.go index 2813d405..9e0937cb 100644 --- a/src/modules/network_data/controller/all_nb_state.go +++ b/src/modules/network_data/controller/all_nb_state.go @@ -49,7 +49,6 @@ type NBStateController struct { // @Description Base Station Status List // @Router /nb-state/list [get] func (s NBStateController) List(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var query model.NBStateQuery if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -57,14 +56,6 @@ func (s NBStateController) List(c *gin.Context) { return } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(query.NeType, query.NeID) - if neInfo.NeId != query.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - query.RmUID = neInfo.RmUID - // 查询数据 rows, total := s.nbStateService.FindByPage(query) c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total})) @@ -96,13 +87,7 @@ func (s NBStateController) Export(c *gin.Context) { if querys.PageSize > 10000 { querys.PageSize = 10000 } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID + rows, total := s.nbStateService.FindByPage(querys) if total == 0 { // 导出数据记录为空 diff --git a/src/modules/network_data/controller/amf.go b/src/modules/network_data/controller/amf.go index 51cc8fbb..7ba2cab2 100644 --- a/src/modules/network_data/controller/amf.go +++ b/src/modules/network_data/controller/amf.go @@ -48,7 +48,6 @@ type AMFController struct { // @Description UE Session List // @Router /neData/amf/ue/list [get] func (s *AMFController) UEList(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var querys model.UEEventAMFQuery if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -56,14 +55,6 @@ func (s *AMFController) UEList(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID - // 查询数据 rows, total := s.ueEventService.FindByPage(querys) c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total})) @@ -133,13 +124,7 @@ func (s *AMFController) UEExport(c *gin.Context) { if querys.PageSize > 10000 { querys.PageSize = 10000 } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID + rows, total := s.ueEventService.FindByPage(querys) if total == 0 { // 导出数据记录为空 @@ -176,8 +161,9 @@ func (s *AMFController) UEExport(c *gin.Context) { func (s *AMFController) NbInfoList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` - NbId string `form:"id"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + NbId string `form:"id"` } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -186,8 +172,8 @@ func (s *AMFController) NbInfoList(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -219,15 +205,19 @@ func (s *AMFController) NbInfoList(c *gin.Context) { // @Router /neData/amf/nb/list-cfg [get] func (s *AMFController) NbStateList(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Query("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } diff --git a/src/modules/network_data/controller/ims.go b/src/modules/network_data/controller/ims.go index 08861dd2..a4fee949 100644 --- a/src/modules/network_data/controller/ims.go +++ b/src/modules/network_data/controller/ims.go @@ -49,7 +49,6 @@ type IMSController struct { // @Description CDR Session List // @Router /neData/ims/cdr/list [get] func (s *IMSController) CDRList(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var querys model.CDREventIMSQuery if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -57,14 +56,6 @@ func (s *IMSController) CDRList(c *gin.Context) { return } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID - // 查询数据 rows, total := s.cdrEventService.FindByPage(querys) c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total})) @@ -134,13 +125,7 @@ func (s *IMSController) CDRExport(c *gin.Context) { if querys.PageSize > 10000 { querys.PageSize = 10000 } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID + rows, total := s.cdrEventService.FindByPage(querys) if total == 0 { // 导出数据记录为空 @@ -175,15 +160,19 @@ func (s *IMSController) CDRExport(c *gin.Context) { // @Router /neData/ims/session/num [get] func (s *IMSController) UeSessionNum(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Query("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("IMS", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -216,9 +205,10 @@ func (s *IMSController) UeSessionNum(c *gin.Context) { func (s *IMSController) UeSessionList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` - IMSI string `form:"imsi"` - MSISDN string `form:"msisdn"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi"` + MSISDN string `form:"msisdn"` } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -227,8 +217,8 @@ func (s *IMSController) UeSessionList(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("IMS", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } diff --git a/src/modules/network_data/controller/mme.go b/src/modules/network_data/controller/mme.go index a64e15da..c051e008 100644 --- a/src/modules/network_data/controller/mme.go +++ b/src/modules/network_data/controller/mme.go @@ -48,7 +48,6 @@ type MMEController struct { // @Description UE Session List // @Router /neData/mme/ue/list [get] func (s *MMEController) UEList(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var querys model.UEEventMMEQuery if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -56,14 +55,6 @@ func (s *MMEController) UEList(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID - // 查询数据 rows, total := s.ueEventService.FindByPage(querys) c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total})) @@ -133,13 +124,7 @@ func (s *MMEController) UEExport(c *gin.Context) { if querys.PageSize > 10000 { querys.PageSize = 10000 } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID + rows, total := s.ueEventService.FindByPage(querys) if total == 0 { // 导出数据记录为空 @@ -176,8 +161,9 @@ func (s *MMEController) UEExport(c *gin.Context) { func (s *MMEController) NbInfoList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` - NbId string `form:"id"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + NbId string `form:"id"` } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -186,8 +172,8 @@ func (s *MMEController) NbInfoList(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -219,15 +205,19 @@ func (s *MMEController) NbInfoList(c *gin.Context) { // @Router /neData/mme/nb/list-cfg [get] func (s *MMEController) NbStateList(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Query("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } diff --git a/src/modules/network_data/controller/pcf.go b/src/modules/network_data/controller/pcf.go index ffdaa745..037fb988 100644 --- a/src/modules/network_data/controller/pcf.go +++ b/src/modules/network_data/controller/pcf.go @@ -42,9 +42,10 @@ type PCFController struct { func (s PCFController) RuleInfoList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` - IMSI string `form:"imsi"` - MSISDN string `form:"msisdn"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi"` + MSISDN string `form:"msisdn"` } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -53,8 +54,8 @@ func (s PCFController) RuleInfoList(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -88,7 +89,8 @@ func (s PCFController) RuleInfoList(c *gin.Context) { func (s PCFController) RuleInfoAdd(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 Num int64 `json:"num"` // 批量添加，默认0单条，大于1时imsi/msisdn会累加数值 ParamData map[string]any `json:"paramData" binding:"required"` // 参数数据 // Imsi string `json:"imsi" binding:"required"` @@ -109,8 +111,8 @@ func (s PCFController) RuleInfoAdd(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -145,7 +147,8 @@ func (s PCFController) RuleInfoAdd(c *gin.Context) { func (s PCFController) RuleInfoEdit(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 Num int64 `json:"num"` // 更新数量 ParamData map[string]any `json:"paramData" binding:"required"` // 参数数据 // Imsi string `json:"imsi" binding:"required"` @@ -166,8 +169,8 @@ func (s PCFController) RuleInfoEdit(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -204,9 +207,10 @@ func (s PCFController) RuleInfoEdit(c *gin.Context) { func (s PCFController) RuleInfoRemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` // 网元ID - IMSI string `form:"imsi" binding:"required"` // IMSi, 带数量时为批量删除 - Num int64 `form:"num"` // 删除数量 + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi" binding:"required"` // IMSi, 带数量时为批量删除 + Num int64 `form:"num"` // 删除数量 } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -215,8 +219,8 @@ func (s PCFController) RuleInfoRemove(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -252,7 +256,8 @@ func (s PCFController) RuleInfoRemove(c *gin.Context) { func (s PCFController) RuleInfoExport(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 FileType string `form:"fileType" binding:"required,oneof=txt"` // 文件类型 } if err := c.ShouldBindQuery(&query); err != nil { @@ -262,8 +267,8 @@ func (s PCFController) RuleInfoExport(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -298,7 +303,8 @@ func (s PCFController) RuleInfoExport(c *gin.Context) { func (s PCFController) RuleInfoImport(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeId string `json:"neId" binding:"required"` + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 FileType string `json:"fileType" binding:"required,oneof=txt"` // 文件类型 FilePath string `json:"filePath" binding:"required"` // 网元端文件所在绝对路径 } @@ -309,8 +315,8 @@ func (s PCFController) RuleInfoImport(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } diff --git a/src/modules/network_data/controller/sgwc.go b/src/modules/network_data/controller/sgwc.go index 8c72f621..1482d7cf 100644 --- a/src/modules/network_data/controller/sgwc.go +++ b/src/modules/network_data/controller/sgwc.go @@ -49,7 +49,6 @@ type SGWCController struct { // @Description CDR Session List // @Router /neData/sgwc/cdr/list [get] func (s *SGWCController) CDRList(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var querys model.CDREventSGWCQuery if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -57,14 +56,6 @@ func (s *SGWCController) CDRList(c *gin.Context) { return } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID - // 查询数据 rows, total := s.cdrEventService.FindByPage(querys) c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total})) @@ -134,13 +125,7 @@ func (s *SGWCController) CDRExport(c *gin.Context) { if querys.PageSize > 10000 { querys.PageSize = 10000 } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID + rows, total := s.cdrEventService.FindByPage(querys) if total == 0 { // 导出数据记录为空 diff --git a/src/modules/network_data/controller/smf.go b/src/modules/network_data/controller/smf.go index 9e382bff..042daad0 100644 --- a/src/modules/network_data/controller/smf.go +++ b/src/modules/network_data/controller/smf.go @@ -51,7 +51,6 @@ type SMFController struct { // @Description CDR Session List // @Router /neData/smf/cdr/list [get] func (s *SMFController) CDRList(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var querys model.CDREventSMFQuery if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -59,14 +58,6 @@ func (s *SMFController) CDRList(c *gin.Context) { return } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID - // 查询数据 rows, total := s.cdrEventService.FindByPage(querys) c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total})) @@ -136,13 +127,7 @@ func (s *SMFController) CDRExport(c *gin.Context) { if querys.PageSize > 10000 { querys.PageSize = 10000 } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID + rows, total := s.cdrEventService.FindByPage(querys) if total == 0 { // 导出数据记录为空 @@ -178,7 +163,8 @@ func (s *SMFController) CDRExport(c *gin.Context) { func (s *SMFController) SubUserNum(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -187,8 +173,8 @@ func (s *SMFController) SubUserNum(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("SMF", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -223,7 +209,8 @@ func (s *SMFController) SubUserNum(c *gin.Context) { func (s *SMFController) SubUserList(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeId string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 IMSI string `form:"imsi"` MSISDN string `form:"msisdn"` Upstate string `form:"upstate"` @@ -236,8 +223,8 @@ func (s *SMFController) SubUserList(c *gin.Context) { } // 查询网元信息 - neInfo := s.neInfoService.FindByNeTypeAndNeID("SMF", query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -265,7 +252,7 @@ func (s *SMFController) SubUserList(c *gin.Context) { imsiStr = strings.TrimPrefix(imsiStr, "imsi-") item["imsi"] = imsiStr // 查UDM拓展信息 - info := s.UDMExtendService.FindByIMSIAndNeID(imsiStr, "%") + info := s.UDMExtendService.FindByIMSIAndNeID(query.CoreUID, query.NeUID, imsiStr) item["remark"] = info.Remark } if v, ok := item["msisdn"]; ok && v != nil { diff --git a/src/modules/network_data/controller/smsc.go b/src/modules/network_data/controller/smsc.go index fc9420e0..0d00333c 100644 --- a/src/modules/network_data/controller/smsc.go +++ b/src/modules/network_data/controller/smsc.go @@ -48,7 +48,6 @@ type SMSCController struct { // @Description CDR Session List // @Router /neData/smsc/cdr/list [get] func (s *SMSCController) CDRList(c *gin.Context) { - language := reqctx.AcceptLanguage(c) var querys model.CDREventSMSCQuery if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -56,14 +55,6 @@ func (s *SMSCController) CDRList(c *gin.Context) { return } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID - // 查询数据 rows, total := s.cdrEventService.FindByPage(querys) c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total})) @@ -133,13 +124,7 @@ func (s *SMSCController) CDRExport(c *gin.Context) { if querys.PageSize > 10000 { querys.PageSize = 10000 } - // 查询网元信息 rmUID - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - querys.RmUID = neInfo.RmUID + rows, total := s.cdrEventService.FindByPage(querys) if total == 0 { // 导出数据记录为空 diff --git a/src/modules/network_data/controller/udm_auth.go b/src/modules/network_data/controller/udm_auth.go index f2e62e98..e8525259 100644 --- a/src/modules/network_data/controller/udm_auth.go +++ b/src/modules/network_data/controller/udm_auth.go @@ -37,7 +37,7 @@ type UDMAuthController struct { // UDM鉴权用户重载数据 // -// PUT /resetData/:neId +// PUT /reset // // @Tags network_data/udm/auth // @Accept json @@ -47,15 +47,19 @@ type UDMAuthController struct { // @Security TokenAuth // @Summary UDM Authentication User Data Refresh // @Description UDM Authenticated User Data List Refresh Synchronization Latest -// @Router /neData/udm/auth/resetData/{neId} [put] +// @Router /neData/udm/auth/reset [put] func (s *UDMAuthController) ResetData(c *gin.Context) { - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - data := s.udmAuthService.ResetData(neId) + data := s.udmAuthService.ResetData(query.CoreUID, query.NeUID) c.JSON(200, resp.OkData(data)) } @@ -88,30 +92,35 @@ func (s *UDMAuthController) List(c *gin.Context) { // @Tags network_data/udm/auth // @Accept json // @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param value path string true "IMSI" +// @Param coreUid query string true "NE ID" default(001) +// @Param neUid query string true "NE ID" default(001) +// @Param imsi query string true "IMSI" // @Success 200 {object} object "Response Results" // @Security TokenAuth // @Summary UDM Authentication User Information // @Description UDM Authentication User Information -// @Router /neData/udm/auth/{neId}/{value} [get] +// @Router /neData/udm/auth [get] func (s *UDMAuthController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - if neId == "" || imsi == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -119,7 +128,7 @@ func (s *UDMAuthController) Info(c *gin.Context) { defer telnetClient.Close() // 发送MML - cmd := fmt.Sprintf("dsp authdat:imsi=%s", imsi) + cmd := fmt.Sprintf("dsp authdat:imsi=%s", query.IMSI) data, err := telnet.ConvertToMap(telnetClient, cmd) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) @@ -132,14 +141,14 @@ func (s *UDMAuthController) Info(c *gin.Context) { } // 解析返回的数据 - u := s.udmAuthService.ParseInfo(imsi, neId, data) - s.udmAuthService.Insert(neId, u) + u := s.udmAuthService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, query.IMSI, data) + s.udmAuthService.Insert(neInfo.CoreUID, neInfo.NeUID, u) c.JSON(200, resp.OkData(u)) } // UDM鉴权用户新增 // -// POST /:neId +// POST / // // @Tags network_data/udm/auth // @Accept json @@ -150,12 +159,13 @@ func (s *UDMAuthController) Info(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authentication User Added // @Description UDM Authentication User Added -// @Router /neData/udm/auth/{neId} [post] +// @Router /neData/udm/auth [post] func (s *UDMAuthController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + // 传入数量大于0时，为批量新增 + num := parse.Number(c.Query("num")) + if num < 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: num is empty")) return } @@ -171,19 +181,38 @@ func (s *UDMAuthController) Add(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return } defer telnetClient.Close() + // 批量新增 + if num > 1 { + // 发送MML + cmd := fmt.Sprintf("baa authdat:start_imsi=%s,sub_num=%d,", body.IMSI, num) + cmd += s.udmAuthService.ParseCommandParams(body) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) + return + } + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmAuthService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.IMSI, num) + } + c.JSON(200, resp.OkData(data)) + return + } + // 发送MML cmd := fmt.Sprintf("add authdat:imsi=%s,", body.IMSI) cmd += s.udmAuthService.ParseCommandParams(body) @@ -195,79 +224,14 @@ func (s *UDMAuthController) Add(c *gin.Context) { // 命令ok时 if strings.Contains(data, "ok") { - s.udmAuthService.Insert(neId, body) - } - c.JSON(200, resp.OkData(data)) -} - -// UDM鉴权用户批量新增 -// -// POST /:neId/:num -// -// @Tags network_data/udm/auth -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param value path number true "Number of releases, value includes start imsi" -// @Param data body object true "Request Param" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM Authentication User Batch Add -// @Description UDM Authentication User Batch Add -// @Router /neData/udm/auth/{neId}/{value} [post] -func (s *UDMAuthController) Adds(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - num := c.Param("num") - if neId == "" || num == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/num is empty")) - return - } - - var body model.UDMAuthUser - if err := c.ShouldBindBodyWithJSON(&body); err != nil { - errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) - return - } - if body.IMSI == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: imsi is empty")) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("baa authdat:start_imsi=%s,sub_num=%s,", body.IMSI, num) - cmd += s.udmAuthService.ParseCommandParams(body) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmAuthService.LoadData(neId, body.IMSI, num) + s.udmAuthService.Insert(neInfo.CoreUID, neInfo.NeUID, body) } c.JSON(200, resp.OkData(data)) } // UDM鉴权用户修改 // -// PUT /:neId +// PUT / // // @Tags network_data/udm/auth // @Accept json @@ -278,15 +242,9 @@ func (s *UDMAuthController) Adds(c *gin.Context) { // @Security TokenAuth // @Summary UDM Authenticated User Modification // @Description UDM Authenticated User Modification -// @Router /neData/udm/auth/{neId} [put] +// @Router /neData/udm/auth [put] func (s *UDMAuthController) Edit(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) - return - } - var body model.UDMAuthUser if err := c.ShouldBindBodyWithJSON(&body); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -299,13 +257,13 @@ func (s *UDMAuthController) Edit(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -323,7 +281,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) { // 命令ok时 if strings.Contains(data, "ok") { - s.udmAuthService.Insert(neId, body) + s.udmAuthService.Insert(neInfo.CoreUID, neInfo.NeUID, body) } c.JSON(200, resp.OkData(data)) } @@ -344,35 +302,56 @@ func (s *UDMAuthController) Edit(c *gin.Context) { // @Router /neData/udm/auth/{neId}/{value} [delete] func (s *UDMAuthController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - if neId == "" || imsi == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi" binding:"required"` // IMSi + Num int64 `form:"num"` // 批量数量 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - // 处理字符转id数组后去重 - imsiArr := strings.Split(imsi, ",") - uniqueIDs := parse.RemoveDuplicates(imsiArr) - if len(uniqueIDs) <= 0 { - c.JSON(200, resp.Err(nil)) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return } defer telnetClient.Close() + if query.Num > 0 { + // 发送MML + cmd := fmt.Sprintf("bde authdat:start_imsi=%s,sub_num=%d", query.IMSI, query.Num) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) + return + } + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmAuthService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.IMSI, query.Num) + } + c.JSON(200, resp.OkData(data)) + return + } + + // 处理字符转id数组后去重 + imsiArr := strings.Split(query.IMSI, ",") + uniqueIDs := parse.RemoveDuplicates(imsiArr) + if len(uniqueIDs) <= 0 { + c.JSON(200, resp.Err(nil)) + return + } resultData := map[string]string{} for _, imsi := range uniqueIDs { // 发送MML @@ -384,7 +363,7 @@ func (s *UDMAuthController) Remove(c *gin.Context) { } // 命令ok时 if strings.Contains(data, "ok") { - s.udmAuthService.Delete(imsi, neId) + s.udmAuthService.Delete(neInfo.CoreUID, neInfo.NeUID, imsi) } resultData[imsi] = data } @@ -392,60 +371,6 @@ func (s *UDMAuthController) Remove(c *gin.Context) { c.JSON(200, resp.OkData(resultData)) } -// UDM鉴权用户批量删除 -// -// DELETE /:neId/:imsi/:num -// -// @Tags network_data/udm/auth -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param imsi path string true "IMSI" -// @Param num path number true "Number of releases, value includes start imsi" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM Authentication User Batch Deletion -// @Description UDM Authentication User Batch Deletion -// @Router /neData/udm/auth/{neId}/{imsi}/{num} [delete] -func (s *UDMAuthController) Removes(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - num := c.Param("num") - if neId == "" || imsi == "" || num == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi/num is empty")) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("bde authdat:start_imsi=%s,sub_num=%s", imsi, num) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmAuthService.LoadData(neId, imsi, num) - } - c.JSON(200, resp.OkData(data)) -} - // UDM鉴权用户导出 // // GET /export @@ -465,13 +390,12 @@ func (s *UDMAuthController) Removes(c *gin.Context) { // @Router /neData/udm/auth/export [get] func (s *UDMAuthController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) - // 查询结果，根据查询条件结果，单页最大值限制 - neId := c.Query("neId") - fileType := c.Query("type") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + neUid := c.Query("neUid") + if c.Query("coreUid") == "" || neUid == "" { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid or neUid is empty")) return } + fileType := c.Query("type") if !(fileType == "csv" || fileType == "txt") { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat"))) return @@ -484,8 +408,6 @@ func (s *UDMAuthController) Export(c *gin.Context) { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty"))) return } - - // rows := s.udmAuthService.SelectList(model.UDMAuthUser{NeId: neId}) if len(rows) <= 0 { // 导出数据记录为空 c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty"))) @@ -493,7 +415,7 @@ func (s *UDMAuthController) Export(c *gin.Context) { } // 文件名 - fileName := fmt.Sprintf("udm_auth_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType) + fileName := fmt.Sprintf("udm_auth_user_export_%s_%d.%s", neUid, time.Now().UnixMilli(), fileType) filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName) if fileType == "csv" { @@ -550,7 +472,8 @@ func (s *UDMAuthController) Export(c *gin.Context) { func (s *UDMAuthController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 UploadPath string `json:"uploadPath" binding:"required"` // 上传文件路径 TypeVal string `json:"typeVal" binding:"required,oneof=default k4"` // default: 默认导入方式, k4: k4类型导入方式 TypeData any `json:"typeData"` // k4类型的数据密钥 @@ -567,15 +490,14 @@ func (s *UDMAuthController) Import(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -599,7 +521,7 @@ func (s *UDMAuthController) Import(c *gin.Context) { } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -618,7 +540,7 @@ func (s *UDMAuthController) Import(c *gin.Context) { // K4类型发特定请求 if body.TypeVal == "k4" { - resultMsg, resultErr = neFetchlink.UDMImportAuth(neInfo.IP, map[string]any{ + resultMsg, resultErr = neFetchlink.UDMImportAuth(neInfo.IPAddr, map[string]any{ "path": neFilePath, "k4": body.TypeData, }) } @@ -632,11 +554,11 @@ func (s *UDMAuthController) Import(c *gin.Context) { if strings.Contains(resultMsg, "ok") { if strings.HasSuffix(body.UploadPath, ".csv") { data := file.ReadFileCSV(localFilePath) - go s.udmAuthService.InsertData(neInfo.NeId, "csv", data) + go s.udmAuthService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data) } if strings.HasSuffix(body.UploadPath, ".txt") { data := file.ReadFileTXTLine(",", localFilePath) - go s.udmAuthService.InsertData(neInfo.NeId, "txt", data) + go s.udmAuthService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data) } } c.JSON(200, resp.OkMsg(resultMsg)) diff --git a/src/modules/network_data/controller/udm_sub.go b/src/modules/network_data/controller/udm_sub.go index 6a1d40a1..569bdaeb 100644 --- a/src/modules/network_data/controller/udm_sub.go +++ b/src/modules/network_data/controller/udm_sub.go @@ -36,7 +36,7 @@ type UDMSubController struct { // UDM签约用户重载数据 // -// PUT /resetData/:neId +// PUT /reset // // @Tags network_data/udm/sub // @Accept json @@ -46,15 +46,19 @@ type UDMSubController struct { // @Security TokenAuth // @Summary UDM Subscriber User Reload Data // @Description UDM Subscriber User Reload Data -// @Router /neData/udm/sub/resetData/{neId} [put] +// @Router /neData/udm/sub/reset [put] func (s *UDMSubController) ResetData(c *gin.Context) { - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - data := s.udmSubService.ResetData(neId) + data := s.udmSubService.ResetData(query.CoreUID, query.NeUID) c.JSON(200, resp.OkData(data)) } @@ -83,7 +87,7 @@ func (s *UDMSubController) List(c *gin.Context) { // UDM签约用户信息 // -// GET /:neId/:imsi +// GET / // // @Tags network_data/udm/sub // @Accept json @@ -94,24 +98,28 @@ func (s *UDMSubController) List(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Information // @Description UDM Subscriber User Information -// @Router /neData/udm/sub/{neId}/{value} [get] +// @Router /neData/udm/sub [get] func (s *UDMSubController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - if neId == "" || imsi == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or imsi is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -119,7 +127,7 @@ func (s *UDMSubController) Info(c *gin.Context) { defer telnetClient.Close() // 发送MML - cmd := fmt.Sprintf("dsp udmuser:imsi=%s", imsi) + cmd := fmt.Sprintf("dsp udmuser:imsi=%s", query.IMSI) data, err := telnet.ConvertToMap(telnetClient, cmd) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) @@ -132,14 +140,14 @@ func (s *UDMSubController) Info(c *gin.Context) { } // 解析返回的数据 - u := s.udmSubService.ParseInfo(imsi, neId, data) - s.udmSubService.Insert(neId, u) + u := s.udmSubService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, query.IMSI, data) + s.udmSubService.Insert(neInfo.CoreUID, neInfo.NeUID, u) c.JSON(200, resp.OkData(u)) } // UDM签约用户新增 // -// POST /:neId +// POST / // // @Tags network_data/udm/sub // @Accept json @@ -150,12 +158,13 @@ func (s *UDMSubController) Info(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Added // @Description UDM Subscriber User Added -// @Router /neData/udm/sub/{neId} [post] +// @Router /neData/udm/sub [post] func (s *UDMSubController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + // 传入数量大于0时，为批量新增 + num := parse.Number(c.Query("num")) + if num < 0 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: num is empty")) return } @@ -171,19 +180,41 @@ func (s *UDMSubController) Add(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return } defer telnetClient.Close() + // 批量新增 + if num > 1 { + // 发送MML + cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%d,", body.IMSI, body.MSISDN, num) + cmd += s.udmSubService.ParseCommandParams(body) + // 去除msisdn参数，避免重复 + omemsisdn := fmt.Sprintf(",msisdn=%s,", body.MSISDN) + cmd = strings.Replace(cmd, omemsisdn, ",", 1) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) + return + } + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmSubService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.IMSI, num, body.Remark) + } + c.JSON(200, resp.OkData(data)) + return + } + // 发送MML cmd := fmt.Sprintf("add udmuser:imsi=%s,", body.IMSI) cmd += s.udmSubService.ParseCommandParams(body) @@ -195,83 +226,14 @@ func (s *UDMSubController) Add(c *gin.Context) { // 命令ok时 if strings.Contains(data, "ok") { - body.NeId = neId - s.udmSubService.Insert(neId, body) - } - c.JSON(200, resp.OkData(data)) -} - -// UDM签约用户批量新增 -// -// POST /:neId/:num -// -// @Tags network_data/udm/sub -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param value path number true "Number of releases, value includes start imsi" default(1) -// @Param data body object true "Request Param" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM Subscriber User Batch Add -// @Description UDM Subscriber User Batch Add -// @Router /neData/udm/sub/{neId}/{value} [post] -func (s *UDMSubController) Adds(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - num := c.Param("num") - if neId == "" || num == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/num is empty")) - return - } - - var body model.UDMSubUser - if err := c.ShouldBindBodyWithJSON(&body); err != nil { - errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) - return - } - if len(body.IMSI) != 15 { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: IMSI length is not 15 bits")) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,", body.IMSI, body.MSISDN, num) - cmd += s.udmSubService.ParseCommandParams(body) - // 去除msisdn参数，避免重复 - omemsisdn := fmt.Sprintf(",msisdn=%s,", body.MSISDN) - cmd = strings.Replace(cmd, omemsisdn, ",", 1) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmSubService.LoadData(neId, body.IMSI, num, body.Remark) + s.udmSubService.Insert(neInfo.CoreUID, neInfo.NeUID, body) } c.JSON(200, resp.OkData(data)) } // UDM签约用户修改 // -// PUT /:neId +// PUT / // // @Tags network_data/udm/sub // @Accept json @@ -282,7 +244,7 @@ func (s *UDMSubController) Adds(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Modification // @Description UDM Subscriber User Modification -// @Router /neData/udm/sub/{neId} [put] +// @Router /neData/udm/sub [put] func (s *UDMSubController) Edit(c *gin.Context) { language := reqctx.AcceptLanguage(c) neId := c.Param("neId") @@ -303,13 +265,13 @@ func (s *UDMSubController) Edit(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -327,15 +289,14 @@ func (s *UDMSubController) Edit(c *gin.Context) { // 命令ok时 if strings.Contains(data, "ok") { - body.NeId = neId - s.udmSubService.Insert(neId, body) + s.udmSubService.Insert(neInfo.CoreUID, neInfo.NeUID, body) } c.JSON(200, resp.OkData(data)) } // UDM签约用户删除 // -// DELETE /:neId/:imsi +// DELETE / // // @Tags network_data/udm/sub // @Accept json @@ -346,38 +307,58 @@ func (s *UDMSubController) Edit(c *gin.Context) { // @Security TokenAuth // @Summary UDM Subscriber User Deletion // @Description UDM Subscriber User Deletion -// @Router /neData/udm/sub/{neId}/{value} [delete] +// @Router /neData/udm/sub [delete] func (s *UDMSubController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - if neId == "" || len(imsi) < 15 { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi" binding:"required"` // IMSi + Num int64 `form:"num"` // 批量数量 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - // 处理字符转id数组后去重 - imsiArr := strings.Split(imsi, ",") - uniqueIDs := parse.RemoveDuplicates(imsiArr) - if len(uniqueIDs) <= 0 { - c.JSON(200, resp.Err(nil)) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return } defer telnetClient.Close() + if query.Num > 0 { + // 发送MML + cmd := fmt.Sprintf("bde udmuser:start_imsi=%s,sub_num=%d", query.IMSI, query.Num) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) + return + } + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmSubService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.IMSI, query.Num, "-(Deleted)-") + } + c.JSON(200, resp.OkData(data)) + } + + // 处理字符转id数组后去重 + imsiArr := strings.Split(query.IMSI, ",") + uniqueIDs := parse.RemoveDuplicates(imsiArr) + if len(uniqueIDs) <= 0 { + c.JSON(200, resp.Err(nil)) + return + } resultData := map[string]string{} for _, imsi := range uniqueIDs { // 发送MML @@ -389,7 +370,7 @@ func (s *UDMSubController) Remove(c *gin.Context) { } // 命令ok时 if strings.Contains(data, "ok") { - s.udmSubService.Delete(neId, imsi) + s.udmSubService.Delete(neInfo.CoreUID, neInfo.NeUID, imsi) } resultData[imsi] = data } @@ -397,60 +378,6 @@ func (s *UDMSubController) Remove(c *gin.Context) { c.JSON(200, resp.OkData(resultData)) } -// UDM签约用户批量删除 -// -// DELETE /:neId/:imsi/:num -// -// @Tags network_data/udm/sub -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param imsi path string true "IMSI" -// @Param num path number true "Number of releases, value includes start imsi" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM Subscriber User Batch Deletion -// @Description UDM Subscriber User Batch Deletion -// @Router /neData/udm/sub/{neId}/{imsi}/{num} [delete] -func (s *UDMSubController) Removes(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - num := c.Param("num") - if neId == "" || len(imsi) < 15 || num == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi/num is empty")) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("bde udmuser:start_imsi=%s,sub_num=%s", imsi, num) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmSubService.LoadData(neId, imsi, num, "-(Deleted)-") - } - c.JSON(200, resp.OkData(data)) -} - // UDM签约用户导出 // // GET /export @@ -471,13 +398,12 @@ func (s *UDMSubController) Removes(c *gin.Context) { // @Router /neData/udm/sub/export [post] func (s *UDMSubController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) - // 查询结果，根据查询条件结果，单页最大值限制 - neId := c.Query("neId") - fileType := c.Query("type") - if neId == "" || fileType == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or type is empty")) + neUid := c.Query("neUid") + if c.Query("coreUid") == "" || neUid == "" { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid or neUid is empty")) return } + fileType := c.Query("type") if !(fileType == "csv" || fileType == "txt") { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat"))) return @@ -490,8 +416,6 @@ func (s *UDMSubController) Export(c *gin.Context) { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty"))) return } - - // rows := s.udmSubService.SelectList(model.UDMSubUser{NeId: neId}) if len(rows) <= 0 { // 导出数据记录为空 c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty"))) @@ -499,7 +423,7 @@ func (s *UDMSubController) Export(c *gin.Context) { } // 文件名 - fileName := fmt.Sprintf("udm_sub_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType) + fileName := fmt.Sprintf("udm_sub_user_export_%s_%d.%s", neUid, time.Now().UnixMilli(), fileType) filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName) if fileType == "csv" { @@ -550,7 +474,8 @@ func (s *UDMSubController) Export(c *gin.Context) { func (s *UDMSubController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeId string `json:"neId" binding:"required"` + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 UploadPath string `json:"uploadPath" binding:"required"` } if err := c.ShouldBindBodyWithJSON(&body); err != nil { @@ -565,15 +490,14 @@ func (s *UDMSubController) Import(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -597,7 +521,7 @@ func (s *UDMSubController) Import(c *gin.Context) { } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -616,11 +540,11 @@ func (s *UDMSubController) Import(c *gin.Context) { if strings.Contains(data, "ok") { if strings.HasSuffix(body.UploadPath, ".csv") { data := file.ReadFileCSV(localFilePath) - go s.udmSubService.InsertData(neInfo.NeId, "csv", data) + go s.udmSubService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data) } if strings.HasSuffix(body.UploadPath, ".txt") { data := file.ReadFileTXTLine(",", localFilePath) - go s.udmSubService.InsertData(neInfo.NeId, "txt", data) + go s.udmSubService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data) } } c.JSON(200, resp.OkMsg(data)) diff --git a/src/modules/network_data/controller/udm_voip.go b/src/modules/network_data/controller/udm_voip.go index 933092fb..623e53b4 100644 --- a/src/modules/network_data/controller/udm_voip.go +++ b/src/modules/network_data/controller/udm_voip.go @@ -36,25 +36,30 @@ type UDMVOIPController struct { // UDMVOIP用户重载数据 // -// PUT /resetData/:neId +// PUT /reset // // @Tags network_data/udm/voip // @Accept json // @Produce json -// @Param neId path string true "NE ID" default(001) +// @Param coreUid query string true "CoreUID" default(001) +// @Param neUid query string true "NeUID" default(001) // @Success 200 {object} object "Response Results" // @Security TokenAuth // @Summary UDM VOIP User Data Refresh // @Description UDM VOIP User Data List Refresh Synchronization Latest -// @Router /neData/udm/voip/resetData/{neId} [put] +// @Router /neData/udm/voip/reset [put] func (s *UDMVOIPController) ResetData(c *gin.Context) { - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - data := s.udmVOIPService.ResetData(neId) + data := s.udmVOIPService.ResetData(query.CoreUID, query.NeUID) c.JSON(200, resp.OkData(data)) } @@ -65,7 +70,8 @@ func (s *UDMVOIPController) ResetData(c *gin.Context) { // @Tags network_data/udm/voip // @Accept json // @Produce json -// @Param neId query string true "NE ID" default(001) +// @Param coreUid query string true "CoreUID" default(001) +// @Param neUid query string true "NeUID" default(001) // @Param username query string false "User Name" // @Param pageNum query number true "pageNum" default(1) // @Param pageSize query number true "pageSize" default(10) @@ -82,7 +88,7 @@ func (s *UDMVOIPController) List(c *gin.Context) { // UDMVOIP用户信息 // -// GET /:neId/:username +// GET / // // @Tags network_data/udm/voip // @Accept json @@ -93,24 +99,28 @@ func (s *UDMVOIPController) List(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Information // @Description UDM VOIP User Information -// @Router /neData/udm/voip/{neId}/{value} [get] +// @Router /neData/udm/voip [get] func (s *UDMVOIPController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - username := c.Param("username") - if neId == "" || username == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or username is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + UserName string `form:"username" binding:"required"` // 用户名 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -118,7 +128,7 @@ func (s *UDMVOIPController) Info(c *gin.Context) { defer telnetClient.Close() // 发送MML - cmd := fmt.Sprintf("dsp voip:username=%s", username) + cmd := fmt.Sprintf("dsp voip:username=%s", query.UserName) data, err := telnet.ConvertToMap(telnetClient, cmd) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) @@ -131,9 +141,9 @@ func (s *UDMVOIPController) Info(c *gin.Context) { } // 解析返回的数据 - u := s.udmVOIPService.ParseInfo(neId, data) + u := s.udmVOIPService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, data) if u.ID != "" { - s.udmVOIPService.Insert(neId, u.UserName) + s.udmVOIPService.Insert(neInfo.CoreUID, neInfo.NeUID, u.UserName) c.JSON(200, resp.OkData(u)) return } @@ -142,7 +152,7 @@ func (s *UDMVOIPController) Info(c *gin.Context) { // UDMVOIP用户新增 // -// POST /:neId +// POST / // // @Tags network_data/udm/voip // @Accept json @@ -153,12 +163,13 @@ func (s *UDMVOIPController) Info(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Added // @Description UDM VOIP User Added -// @Router /neData/udm/voip/{neId} [post] +// @Router /neData/udm/voip [post] func (s *UDMVOIPController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + // 传入数量大于0时，为批量新增 + num := parse.Number(c.Query("num")) + if num < 1 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: num is empty")) return } @@ -173,20 +184,38 @@ func (s *UDMVOIPController) Add(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return } defer telnetClient.Close() + // 批量新增 + if num > 1 { + // 发送MML + cmd := fmt.Sprintf("baa voip:sub_num=%d,start_username=%s,password=%s", num, body.UserName, body.Password) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) + return + } + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmVOIPService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.UserName, num) + } + c.JSON(200, resp.OkData(data)) + return + } + // 发送MML cmd := fmt.Sprintf("add voip:username=%s,password=%s", body.UserName, body.Password) data, err := telnet.ConvertToStr(telnetClient, cmd) @@ -197,78 +226,14 @@ func (s *UDMVOIPController) Add(c *gin.Context) { // 命令ok时 if strings.Contains(data, "ok") { - s.udmVOIPService.Insert(neId, body.UserName) - } - c.JSON(200, resp.OkData(data)) -} - -// UDMVOIP用户批量新增 -// -// POST /:neId/:num -// -// @Tags network_data/udm/voip -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param value path number true "Number of releases, value includes start username" -// @Param data body object true "Request Param" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM VOIP User Batch Add -// @Description UDM VOIP User Batch Add -// @Router /neData/udm/voip/{neId}/{value} [post] -func (s *UDMVOIPController) Adds(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - num := c.Param("num") - if neId == "" || num == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or num is empty")) - return - } - - var body model.UDMVOIPUser - if err := c.ShouldBindBodyWithJSON(&body); err != nil { - errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) - return - } - if body.UserName == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: username is empty")) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("baa voip:sub_num=%s,start_username=%s,password=%s", num, body.UserName, body.Password) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmVOIPService.LoadData(neId, body.UserName, num) + s.udmVOIPService.Insert(neInfo.CoreUID, neInfo.NeUID, body.UserName) } c.JSON(200, resp.OkData(data)) } // UDMVOIP用户删除 // -// DELETE /:neId/:username +// DELETE / // // @Tags network_data/udm/voip // @Accept json @@ -279,38 +244,59 @@ func (s *UDMVOIPController) Adds(c *gin.Context) { // @Security TokenAuth // @Summary UDM VOIP User Deletion // @Description UDM VOIP User Deletion -// @Router /neData/udm/voip/{neId}/{value} [delete] +// @Router /neData/udm/voip [delete] func (s *UDMVOIPController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - username := c.Param("username") - if neId == "" || username == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or username is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + UserName string `form:"username" binding:"required"` // 用户名 + Num int64 `form:"num"` // 批量数量 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - // 处理字符转id数组后去重 - usernameArr := strings.Split(username, ",") - uniqueIDs := parse.RemoveDuplicates(usernameArr) - if len(uniqueIDs) <= 0 { - c.JSON(200, resp.Err(nil)) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return } defer telnetClient.Close() + if query.Num > 1 { + // 发送MML + cmd := fmt.Sprintf("bde voip:start_username=%s,sub_num=%d", query.UserName, query.Num) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) + return + } + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmVOIPService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.UserName, query.Num) + } + c.JSON(200, resp.OkData(data)) + return + } + + // 处理字符转id数组后去重 + imsiArr := strings.Split(query.UserName, ",") + uniqueIDs := parse.RemoveDuplicates(imsiArr) + if len(uniqueIDs) <= 0 { + c.JSON(200, resp.Err(nil)) + return + } resultData := map[string]string{} for _, v := range uniqueIDs { // 发送MML @@ -322,7 +308,7 @@ func (s *UDMVOIPController) Remove(c *gin.Context) { } // 命令ok时 if strings.Contains(data, "ok") { - s.udmVOIPService.Delete(v, neId) + s.udmVOIPService.Delete(neInfo.CoreUID, neInfo.NeUID, v) } resultData[v] = data } @@ -330,60 +316,6 @@ func (s *UDMVOIPController) Remove(c *gin.Context) { c.JSON(200, resp.OkData(resultData)) } -// UDMVOIP用户批量删除 -// -// DELETE /:neId/:username/:num -// -// @Tags network_data/udm/voip -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param username path string true "User Name" -// @Param num path number true "Number of releases, value includes start username" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM VOIP User Batch Deletion -// @Description UDM VOIP User Batch Deletion -// @Router /neData/udm/voip/{neId}/{username}/{num} [delete] -func (s *UDMVOIPController) Removes(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - username := c.Param("username") - num := c.Param("num") - if neId == "" || username == "" || num == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/username/num is empty")) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("bde voip:start_username=%s,sub_num=%s", username, num) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmVOIPService.LoadData(neId, username, num) - } - c.JSON(200, resp.OkData(data)) -} - // UDMVOIP用户导出 // // GET /export @@ -480,7 +412,8 @@ func (s *UDMVOIPController) Export(c *gin.Context) { func (s *UDMVOIPController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 UploadPath string `json:"uploadPath" binding:"required"` // 上传文件路径 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { @@ -495,15 +428,14 @@ func (s *UDMVOIPController) Import(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -527,7 +459,7 @@ func (s *UDMVOIPController) Import(c *gin.Context) { } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -550,11 +482,11 @@ func (s *UDMVOIPController) Import(c *gin.Context) { if strings.Contains(resultMsg, "ok") { if strings.HasSuffix(body.UploadPath, ".csv") { data := file.ReadFileCSV(localFilePath) - go s.udmVOIPService.InsertData(neInfo.NeId, "csv", data) + go s.udmVOIPService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data) } if strings.HasSuffix(body.UploadPath, ".txt") { data := file.ReadFileTXTLine(",", localFilePath) - go s.udmVOIPService.InsertData(neInfo.NeId, "txt", data) + go s.udmVOIPService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data) } } c.JSON(200, resp.OkMsg(resultMsg)) diff --git a/src/modules/network_data/controller/udm_volte_ims.go b/src/modules/network_data/controller/udm_volte_ims.go index 878059dc..cab53099 100644 --- a/src/modules/network_data/controller/udm_volte_ims.go +++ b/src/modules/network_data/controller/udm_volte_ims.go @@ -36,25 +36,30 @@ type UDMVolteIMSController struct { // UDMVolteIMS用户重载数据 // -// PUT /resetData/:neId +// PUT /reset // // @Tags network_data/udm/volte-ims // @Accept json // @Produce json -// @Param neId path string true "NE ID" default(001) +// @Param coreUid query string true "CoreUID" default(001) +// @Param neUid query string true "NeUID" default(001) // @Success 200 {object} object "Response Results" // @Security TokenAuth // @Summary UDM VolteIMS User Data Refresh // @Description UDM Authenticated User Data List Refresh Synchronization Latest -// @Router /neData/udm/volte-ims/resetData/{neId} [put] +// @Router /neData/udm/volte-ims/reset [put] func (s *UDMVolteIMSController) ResetData(c *gin.Context) { - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - data := s.udmVolteIMSService.ResetData(neId) + data := s.udmVolteIMSService.ResetData(query.CoreUID, query.NeUID) c.JSON(200, resp.OkData(data)) } @@ -82,7 +87,7 @@ func (s *UDMVolteIMSController) List(c *gin.Context) { // UDMVolteIMS用户信息 // -// GET /:neId/:imsi +// GET / // // @Tags network_data/udm/volte-ims // @Accept json @@ -94,29 +99,29 @@ func (s *UDMVolteIMSController) List(c *gin.Context) { // @Security TokenAuth // @Summary UDM VolteIMS User Information // @Description UDM VolteIMS User Information -// @Router /neData/udm/volte-ims/{neId}/{value} [get] +// @Router /neData/udm/volte-ims [get] func (s *UDMVolteIMSController) Info(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - msisdn := c.Query("msisdn") - if neId == "" || imsi == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or imsi is empty")) - return + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi" binding:"required"` // IMSi + MSISDN string `form:"msisdn" binding:"required"` // MSISDN } - if msisdn == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: msisdn is required")) + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -124,7 +129,7 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) { defer telnetClient.Close() // 发送MML - cmd := fmt.Sprintf("dsp imsuser:imsi=%s,msisdn=%s", imsi, msisdn) + cmd := fmt.Sprintf("dsp imsuser:imsi=%s,msisdn=%s", query.IMSI, query.MSISDN) data, err := telnet.ConvertToMap(telnetClient, cmd) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) @@ -137,9 +142,9 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) { } // 解析返回的数据 - u := s.udmVolteIMSService.ParseInfo(neId, data) + u := s.udmVolteIMSService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, data) if u.ID != "" { - s.udmVolteIMSService.InsertByIMSI(imsi, neId) + s.udmVolteIMSService.InsertByIMSI(neInfo.CoreUID, neInfo.NeUID, query.IMSI) c.JSON(200, resp.OkData(u)) return } @@ -148,7 +153,7 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) { // UDMVolteIMS用户新增 // -// POST /:neId +// POST / // // @Tags network_data/udm/volte-ims // @Accept json @@ -159,12 +164,13 @@ 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 /neData/udm/volte-ims/{neId} [post] +// @Router /neData/udm/volte-ims [post] func (s *UDMVolteIMSController) Add(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + // 传入数量大于0时，为批量新增 + num := parse.Number(c.Query("num")) + if num < 0 { + c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } @@ -179,22 +185,40 @@ func (s *UDMVolteIMSController) Add(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return } defer telnetClient.Close() + // 批量新增 + if num > 1 { + // 发送MML + cmd := fmt.Sprintf("baa imsuser:sub_num=%d,start_imsi=%s,start_msisdn=%s,volte=%s,vni=%s", num, body.IMSI, body.MSISDN, body.Tag, body.VNI) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) + return + } + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmVolteIMSService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.IMSI, num) + } + c.JSON(200, resp.OkData(data)) + return + } + // 检查同IMSI下msisdn是否存在 - hasMsisdns := s.udmVolteIMSService.Find(model.UDMVolteIMSUser{IMSI: body.IMSI, MSISDN: body.MSISDN, NeId: neId}) + hasMsisdns := s.udmVolteIMSService.Find(model.UDMVolteIMSUser{IMSI: body.IMSI, MSISDN: body.MSISDN, NeUID: neInfo.NeUID}) if len(hasMsisdns) > 0 { c.JSON(200, resp.ErrMsg("IMSI and MSISDN already exist")) return @@ -210,109 +234,51 @@ func (s *UDMVolteIMSController) Add(c *gin.Context) { // 命令ok时 if strings.Contains(data, "ok") { - s.udmVolteIMSService.InsertByIMSI(body.IMSI, neId) - } - c.JSON(200, resp.OkData(data)) -} - -// UDMVolteIMS用户批量新增 -// -// POST /:neId/:num -// -// @Tags network_data/udm/volte-ims -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param value path number true "Number of releases, value includes start imsi" -// @Param data body object true "Request Param" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM VolteIMS User Batch Add -// @Description UDM VolteIMS User Batch Add -// @Router /neData/udm/volte-ims/{neId}/{value} [post] -func (s *UDMVolteIMSController) Adds(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - num := c.Param("num") - if neId == "" || num == "" { - c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) - return - } - - var body model.UDMVolteIMSUser - if err := c.ShouldBindBodyWithJSON(&body); err != nil { - errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) - return - } - if body.IMSI == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: imsi is empty")) - return - } - - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("baa imsuser:sub_num=%s,start_imsi=%s,start_msisdn=%s,volte=%s,vni=%s", num, body.IMSI, body.MSISDN, body.Tag, body.VNI) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmVolteIMSService.LoadData(neId, body.IMSI, num) + s.udmVolteIMSService.InsertByIMSI(neInfo.CoreUID, neInfo.NeUID, body.IMSI) } c.JSON(200, resp.OkData(data)) } // UDMVolteIMS用户删除 // -// DELETE /:neId/:imsi +// DELETE / // // @Tags network_data/udm/volte-ims // @Accept json // @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param value path string true "IMSI, multiple separated by a , sign" +// @Param coreUid query string true "CoreUID" default(001) +// @Param neUid query string true "NeUID" default(001) +// @Param imsi query string true "IMSI" +// @Param num query number true "Number of releases, value includes start imsi" // @Param msisdn query string false "MSISDN" // @Success 200 {object} object "Response Results" // @Security TokenAuth -// @Summary UDM Authenticated User Deletion -// @Description UDM Authenticated User Deletion -// @Router /neData/udm/volte-ims/{neId}/{value} [delete] +// @Summary UDM VolteIMS User Batch Deletion +// @Description UDM VolteIMS User Batch Deletion +// @Router /neData/udm/volte-ims [delete] func (s *UDMVolteIMSController) Remove(c *gin.Context) { language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - msisdn := c.Query("msisdn") - if neId == "" || imsi == "" { - c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + IMSI string `form:"imsi" binding:"required"` // IMSi, 带数量时为批量 + MSISDN string `form:"msisdn"` // MSISDN, 精确msisdn删除 + Num int64 `form:"num"` // 批量数量 + } + if err := c.ShouldBindQuery(&query); err != nil { + errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - imsiArr := strings.Split(imsi, ",") - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -320,9 +286,9 @@ func (s *UDMVolteIMSController) Remove(c *gin.Context) { defer telnetClient.Close() // 精确msisdn删除 - if msisdn != "" { + if query.MSISDN != "" { // 发送MML - cmd := fmt.Sprintf("del imsuser:imsi=%s,msisdn=%s", imsiArr[0], msisdn) + cmd := fmt.Sprintf("del imsuser:imsi=%s,msisdn=%s", query.IMSI, query.MSISDN) data, err := telnet.ConvertToStr(telnetClient, cmd) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) @@ -330,89 +296,53 @@ func (s *UDMVolteIMSController) Remove(c *gin.Context) { } // 命令ok时 if strings.Contains(data, "ok") { - s.udmVolteIMSService.Delete(imsi, neId) + s.udmVolteIMSService.Delete(neInfo.CoreUID, neInfo.NeUID, query.IMSI) } c.JSON(200, resp.OkData(data)) return - } else { - // 处理字符转id数组后去重 - uniqueIDs := parse.RemoveDuplicates(imsiArr) - if len(uniqueIDs) <= 0 { - c.JSON(200, resp.Err(nil)) + } + + // 批量更新 + if query.Num > 0 { + // 发送MML + cmd := fmt.Sprintf("bde imsuser:start_imsi=%s,sub_num=%d", query.IMSI, query.Num) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + c.JSON(200, resp.ErrMsg(err.Error())) return } - resultData := map[string]string{} - for _, imsi := range uniqueIDs { - // 发送MML - cmd := fmt.Sprintf("del imsuser:imsi=%s", imsi) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - resultData[imsi] = err.Error() - continue - } - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmVolteIMSService.Delete(imsi, neId) - } - resultData[imsi] = data + + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmVolteIMSService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.IMSI, query.Num) } - c.JSON(200, resp.OkData(resultData)) - return - } -} - -// UDMVolteIMS用户批量删除 -// -// DELETE /:neId/:imsi/:num -// -// @Tags network_data/udm/volte-ims -// @Accept json -// @Produce json -// @Param neId path string true "NE ID" default(001) -// @Param imsi path string true "IMSI" -// @Param num path number true "Number of releases, value includes start imsi" -// @Success 200 {object} object "Response Results" -// @Security TokenAuth -// @Summary UDM VolteIMS User Batch Deletion -// @Description UDM VolteIMS User Batch Deletion -// @Router /neData/udm/volte-ims/{neId}/{imsi}/{num} [delete] -func (s *UDMVolteIMSController) Removes(c *gin.Context) { - language := reqctx.AcceptLanguage(c) - neId := c.Param("neId") - imsi := c.Param("imsi") - num := c.Param("num") - if neId == "" || imsi == "" || num == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi/num is empty")) + c.JSON(200, resp.OkData(data)) return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId) - if neInfo.NeId != neId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) + // 处理字符转id数组后去重 + imsiArr := strings.Split(query.IMSI, ",") + uniqueIDs := parse.RemoveDuplicates(imsiArr) + if len(uniqueIDs) <= 0 { + c.JSON(200, resp.Err(nil)) return } - // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return + resultData := map[string]string{} + for _, imsi := range uniqueIDs { + // 发送MML + cmd := fmt.Sprintf("del imsuser:imsi=%s", imsi) + data, err := telnet.ConvertToStr(telnetClient, cmd) + if err != nil { + resultData[imsi] = err.Error() + continue + } + // 命令ok时 + if strings.Contains(data, "ok") { + s.udmVolteIMSService.Delete(neInfo.CoreUID, neInfo.NeUID, imsi) + } + resultData[imsi] = data } - defer telnetClient.Close() - - // 发送MML - cmd := fmt.Sprintf("bde imsuser:start_imsi=%s,sub_num=%s", imsi, num) - data, err := telnet.ConvertToStr(telnetClient, cmd) - if err != nil { - c.JSON(200, resp.ErrMsg(err.Error())) - return - } - - // 命令ok时 - if strings.Contains(data, "ok") { - s.udmVolteIMSService.LoadData(neId, imsi, num) - } - c.JSON(200, resp.OkData(data)) + c.JSON(200, resp.OkData(resultData)) } // UDMVolteIMS用户导出 @@ -422,7 +352,8 @@ func (s *UDMVolteIMSController) Removes(c *gin.Context) { // @Tags network_data/udm/volte-ims // @Accept json // @Produce json -// @Param neId query string true "NE ID" default(001) +// @Param coreUid query string true "CoreUID" default(001) +// @Param neUid query string true "NeUID" default(001) // @Param type query string true "File Type" Enums(csv,txt) default(txt) // @Param imsi query string false "IMSI" // @Param pageNum query number true "pageNum" default(1) @@ -434,13 +365,12 @@ func (s *UDMVolteIMSController) Removes(c *gin.Context) { // @Router /neData/udm/volte-ims/export [get] func (s *UDMVolteIMSController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) - // 查询结果，根据查询条件结果，单页最大值限制 - neId := c.Query("neId") - fileType := c.Query("type") - if neId == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty")) + neUid := c.Query("neUid") + if c.Query("coreUid") == "" || neUid == "" { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid or neUid is empty")) return } + fileType := c.Query("type") if !(fileType == "csv" || fileType == "txt") { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat"))) return @@ -460,7 +390,7 @@ func (s *UDMVolteIMSController) Export(c *gin.Context) { } // 文件名 - fileName := fmt.Sprintf("udm_volte_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType) + fileName := fmt.Sprintf("udm_volte_user_export_%s_%d.%s", neUid, time.Now().UnixMilli(), fileType) filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName) if fileType == "csv" { @@ -509,7 +439,8 @@ func (s *UDMVolteIMSController) Export(c *gin.Context) { func (s *UDMVolteIMSController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 UploadPath string `json:"uploadPath" binding:"required"` // 上传文件路径 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { @@ -524,15 +455,14 @@ func (s *UDMVolteIMSController) Import(c *gin.Context) { return } - // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + // 查询网元信息 + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -556,7 +486,7 @@ func (s *UDMVolteIMSController) Import(c *gin.Context) { } // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1) + telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -579,11 +509,11 @@ func (s *UDMVolteIMSController) Import(c *gin.Context) { if strings.Contains(resultMsg, "ok") { if strings.HasSuffix(body.UploadPath, ".csv") { data := file.ReadFileCSV(localFilePath) - go s.udmVolteIMSService.InsertData(neInfo.NeId, "csv", data) + go s.udmVolteIMSService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data) } if strings.HasSuffix(body.UploadPath, ".txt") { data := file.ReadFileTXTLine(",", localFilePath) - go s.udmVolteIMSService.InsertData(neInfo.NeId, "txt", data) + go s.udmVolteIMSService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data) } } c.JSON(200, resp.OkMsg(resultMsg)) diff --git a/src/modules/network_data/controller/upf.go b/src/modules/network_data/controller/upf.go index 9f2b2065..50148435 100644 --- a/src/modules/network_data/controller/upf.go +++ b/src/modules/network_data/controller/upf.go @@ -44,22 +44,28 @@ type UPFController struct { func (s UPFController) FlowTotal(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeID string `form:"neId" binding:"required"` - Day int `form:"day"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 + Day int `form:"day"` } - if err := c.ShouldBindQuery(&querys); querys.Day < 0 || err != nil { + if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } + if querys.Day < 0 || querys.Day > 30 { + c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "day must be between 0 and 30")) + return + } + // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID("UPF", querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID) + if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - up, down := s.kpiReportService.UPFTodayFlowFind(neInfo.RmUID, querys.Day) + up, down := s.kpiReportService.UPFTodayFlowFind(neInfo.NeUID, querys.Day) c.JSON(200, resp.OkData(map[string]int64{"up": up, "down": down})) } diff --git a/src/modules/network_data/model/alarm.go b/src/modules/network_data/model/alarm.go index 61abd550..844d79c2 100644 --- a/src/modules/network_data/model/alarm.go +++ b/src/modules/network_data/model/alarm.go @@ -3,11 +3,9 @@ package model // Alarm 告警记录 type Alarm struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 - NeId string `json:"neId" gorm:"column:ne_id"` // 网元ID - NeName string `json:"neName" gorm:"column:ne_name"` // 网元名称 - Province string `json:"province" gorm:"column:province"` // 网元省份地域 - PvFlag string `json:"pvFlag" gorm:"column:pv_flag"` // 网元标识虚拟化标识 AlarmSeq int64 `json:"alarmSeq" gorm:"column:alarm_seq"` // 告警序号 同网元类型连续递增 AlarmId string `json:"alarmId" gorm:"column:alarm_id"` // 告警ID AlarmTitle string `json:"alarmTitle" gorm:"column:alarm_title"` // 告警标题 @@ -40,10 +38,9 @@ func (*Alarm) TableName() string { // AlarmQuery 告警数据查询参数结构体 type AlarmQuery struct { - NeType string `json:"neType" form:"neType"` // 网元类型 - NeID string `json:"neId" form:"neId"` // 网元ID - NeName string `json:"neName" form:"neName"` - PvFlag string `json:"pvFlag" form:"pvFlag"` + CoreUID string `json:"coreUid" form:"coreUid"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid"` // 网元唯一标识 + NeType string `json:"neType" form:"neType"` // 网元类型 AlarmCode string `json:"alarmCode" form:"alarmCode"` AlarmType string `json:"alarmType" form:"alarmType"` AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=0 1"` // 告警状态 0:clear, 1:active diff --git a/src/modules/network_data/model/alarm_event.go b/src/modules/network_data/model/alarm_event.go index e1190720..ca93db1c 100644 --- a/src/modules/network_data/model/alarm_event.go +++ b/src/modules/network_data/model/alarm_event.go @@ -3,8 +3,9 @@ package model // AlarmEvent 告警_事件记录表 type AlarmEvent struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 - NeId string `json:"neId" gorm:"column:ne_id"` // 网元ID AlarmSeq int64 `json:"alarmSeq" gorm:"column:alarm_seq"` // 告警序号 同网元类型连续递增 AlarmId string `json:"alarmId" gorm:"column:alarm_id"` // 告警ID AlarmTitle string `json:"alarmTitle" gorm:"column:alarm_title"` // 告警标题 @@ -31,8 +32,9 @@ func (*AlarmEvent) TableName() string { // AlarmEventQuery 告警事件数据查询参数结构体 type AlarmEventQuery struct { + CoreUID string `json:"coreId" form:"coreId"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid"` // 网元唯一标识 NeType string `json:"neType" form:"neType"` // 网元类型 - NeID string `json:"neId" form:"neId"` // 网元ID AlarmCode string `json:"alarmCode" form:"alarmCode"` AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=0 1"` // 告警状态 0:clear, 1:active BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查event_time diff --git a/src/modules/network_data/model/alarm_forward_log.go b/src/modules/network_data/model/alarm_forward_log.go index a79c6d1b..fdc855a1 100644 --- a/src/modules/network_data/model/alarm_forward_log.go +++ b/src/modules/network_data/model/alarm_forward_log.go @@ -3,8 +3,9 @@ package model // AlarmForwardLog 告警_转发日志记录 type AlarmForwardLog struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeId string `json:"neId" gorm:"column:ne_id"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 AlarmSeq int64 `json:"alarmSeq" gorm:"column:alarm_seq"` // 告警序号 同网元类型连续递增 AlarmId string `json:"alarmId" gorm:"column:alarm_id"` // 告警ID AlarmCode int64 `json:"alarmCode" gorm:"column:alarm_code"` // 告警状态码 @@ -26,8 +27,9 @@ func (*AlarmForwardLog) TableName() string { // AlarmForwardLogQuery 告警转发日志数据查询参数结构体 type AlarmForwardLogQuery struct { + CoreUID string `json:"coreUid" form:"coreUid"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid"` // 网元唯一标识 NeType string `json:"neType" form:"neType"` // 网元类型 - NeID string `json:"neId" form:"neId"` // 网元ID BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查event_time EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=event_time id"` // 排序字段，填写结果字段 diff --git a/src/modules/network_data/model/alarm_log.go b/src/modules/network_data/model/alarm_log.go index 8931daf4..92cad5ba 100644 --- a/src/modules/network_data/model/alarm_log.go +++ b/src/modules/network_data/model/alarm_log.go @@ -3,8 +3,9 @@ package model // AlarmLog 告警_日志记录 type AlarmLog struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeId string `json:"neId" gorm:"column:ne_id"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 AlarmSeq int64 `json:"alarmSeq" gorm:"column:alarm_seq"` // 告警序号 同网元类型连续递增 AlarmId string `json:"alarmId" gorm:"column:alarm_id"` // 告警ID AlarmCode int64 `json:"alarmCode" gorm:"column:alarm_code"` // 告警状态码 @@ -23,8 +24,9 @@ func (*AlarmLog) TableName() string { // AlarmLogQuery 告警日志数据查询参数结构体 type AlarmLogQuery struct { + CoreUID string `json:"coreUid" form:"coreUid"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid"` // 网元唯一标识 NeType string `json:"neType" form:"neType"` // 网元类型 - NeID string `json:"neId" form:"neId"` // 网元ID AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=0 1"` // 告警状态 0:clear, 1:active OrigSeverity string `json:"origSeverity" form:"origSeverity"` // 告警类型 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF) BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查event_time diff --git a/src/modules/network_data/model/cdr_event_ims.go b/src/modules/network_data/model/cdr_event_ims.go index 8c383ad2..c366579e 100644 --- a/src/modules/network_data/model/cdr_event_ims.go +++ b/src/modules/network_data/model/cdr_event_ims.go @@ -3,9 +3,9 @@ package model // CDREventIMS CDR会话对象IMS cdr_event_ims type CDREventIMS struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUid string `json:"rmUid" gorm:"column:rm_uid"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` // 接收到的timestamp秒级存储毫秒时间戳 CdrJson string `json:"cdrJSON" gorm:"column:cdr_json"` // data JSON String CreatedAt int64 `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒 @@ -18,13 +18,13 @@ func (*CDREventIMS) TableName() string { // CDREventIMSQuery CDR会话对象IMS查询参数结构体 type CDREventIMSQuery struct { + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 NeType string `json:"neType" form:"neType" binding:"required,oneof=IMS"` // 网元类型IMS - NeID string `json:"neId" form:"neId" binding:"required"` - RmUID string `json:"rmUID" form:"rmUID"` - RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOC MTC - CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 - CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 - BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp + RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOC MTC + CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 + CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 + BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc diff --git a/src/modules/network_data/model/cdr_event_sgwc.go b/src/modules/network_data/model/cdr_event_sgwc.go index 26562065..ba3fdbe4 100644 --- a/src/modules/network_data/model/cdr_event_sgwc.go +++ b/src/modules/network_data/model/cdr_event_sgwc.go @@ -3,9 +3,9 @@ package model // CDREventSGWC CDR会话对象SGWC cdr_event_sgwc type CDREventSGWC struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUid string `json:"rmUid" gorm:"column:rm_uid"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` // 接收到的timestamp秒级存储毫秒时间戳 CdrJson string `json:"cdrJSON" gorm:"column:cdr_json"` // data JSON String CreatedAt int64 `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒 @@ -18,9 +18,9 @@ func (*CDREventSGWC) TableName() string { // CDREventSGWCQuery CDR会话对象SGWC查询参数结构体 type CDREventSGWCQuery struct { + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 NeType string `json:"neType" form:"neType" binding:"required,oneof=SGWC"` // SGWC - NeID string `json:"neId" form:"neId" binding:"required"` - RmUID string `json:"rmUID" form:"rmUID"` IMSI string `json:"imsi" form:"imsi"` MSISDN string `json:"msisdn" form:"msisdn"` BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp diff --git a/src/modules/network_data/model/cdr_event_smf.go b/src/modules/network_data/model/cdr_event_smf.go index a6df3ced..3222f90c 100644 --- a/src/modules/network_data/model/cdr_event_smf.go +++ b/src/modules/network_data/model/cdr_event_smf.go @@ -3,9 +3,9 @@ package model // CDREventSMF CDR会话对象SMF cdr_event_smf type CDREventSMF struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUid string `json:"rmUid" gorm:"column:rm_uid"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` // 接收到的timestamp秒级存储毫秒时间戳 CdrJson string `json:"cdrJSON" gorm:"column:cdr_json"` // data JSON String CreatedAt int64 `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒 @@ -18,10 +18,10 @@ func (*CDREventSMF) TableName() string { // CDREventSMFQuery CDR会话对象SMF查询参数结构体 type CDREventSMFQuery struct { + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 NeType string `json:"neType" form:"neType" binding:"required,oneof=SMF"` // 网元类型, 暂时支持SMF - NeID string `json:"neId" form:"neId" binding:"required"` - RmUID string `json:"rmUID" form:"rmUID"` - RecordType string `json:"recordType" form:"recordType"` // 暂时没用到 + RecordType string `json:"recordType" form:"recordType"` // 暂时没用到 SubscriberID string `json:"subscriberID" form:"subscriberID"` DNN string `json:"dnn" form:"dnn"` BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp diff --git a/src/modules/network_data/model/cdr_event_smsc.go b/src/modules/network_data/model/cdr_event_smsc.go index 753e694a..d869c44e 100644 --- a/src/modules/network_data/model/cdr_event_smsc.go +++ b/src/modules/network_data/model/cdr_event_smsc.go @@ -3,9 +3,9 @@ package model // CDREventSMSC CDR会话对象SMSC cdr_event_smsc type CDREventSMSC struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUid string `json:"rmUid" gorm:"column:rm_uid"` // 可能没有 + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` // 接收到的timestamp秒级存储毫秒时间戳 CdrJson string `json:"cdrJSON" gorm:"column:cdr_json"` // data JSON String CreatedAt int64 `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒 @@ -18,13 +18,13 @@ func (*CDREventSMSC) TableName() string { // CDREventSMSCQuery CDR会话对象SMSC查询参数结构体 type CDREventSMSCQuery struct { + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 NeType string `json:"neType" form:"neType" binding:"required,oneof=SMSC"` // 网元类型, 暂时支持SMSC - NeID string `json:"neId" form:"neId" binding:"required"` - RmUID string `json:"rmUID" form:"rmUID"` - RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOSM MTSM - CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 - CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 - BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp + RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOSM MTSM + CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 + CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 + BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc diff --git a/src/modules/network_data/model/kpi_c_report.go b/src/modules/network_data/model/kpi_c_report.go index 9cd6aedf..2e81e880 100644 --- a/src/modules/network_data/model/kpi_c_report.go +++ b/src/modules/network_data/model/kpi_c_report.go @@ -22,9 +22,9 @@ func (*KpiCTitle) TableName() string { // KpiCReport 自定义指标报表信息对象 type KpiCReport struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUid string `json:"rmUid" gorm:"column:rm_uid"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Date string `json:"date" gorm:"column:date"` // Date of the report yyyy-mm-dd hh:mi:ss StartTime string `json:"startTime" gorm:"column:start_time"` // Start time of the report hh:mi:ss EndTime string `json:"endTime" gorm:"column:end_time"` // End time of the report hh:mi:ss @@ -41,8 +41,8 @@ func (*KpiCReport) TableName() string { // KPICQuery 指标查询参数结构体 type KPICQuery struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` + NeUID string `form:"neUid" binding:"required"` BeginTime int64 `form:"beginTime" binding:"required"` // 开始时间戳（毫秒）1739361200999 EndTime int64 `form:"endTime" binding:"required"` // 结束时间戳（毫秒）1739361210088 Interval int64 `form:"interval" binding:"required,oneof=5 60 300 900 1800 3600"` diff --git a/src/modules/network_data/model/kpi_report.go b/src/modules/network_data/model/kpi_report.go index 7b71b65d..ac8863aa 100644 --- a/src/modules/network_data/model/kpi_report.go +++ b/src/modules/network_data/model/kpi_report.go @@ -18,9 +18,9 @@ func (*KpiTitle) TableName() string { // KpiReport 指标报表信息对象 type KpiReport struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUid string `json:"rmUid" gorm:"column:rm_uid"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Date string `json:"date" gorm:"column:date"` // Date of the report yyyy-mm-dd hh:mi:ss StartTime string `json:"startTime" gorm:"column:start_time"` // Start time of the report hh:mi:ss EndTime string `json:"endTime" gorm:"column:end_time"` // End time of the report hh:mi:ss @@ -37,12 +37,12 @@ func (*KpiReport) TableName() string { // KPIQuery 指标查询参数结构体 type KPIQuery struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` - BeginTime int64 `form:"beginTime" binding:"required"` // 开始时间戳（毫秒）1739361200999 - EndTime int64 `form:"endTime" binding:"required"` // 结束时间戳（毫秒）1739361210088 + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 + NeType string `json:"neType" form:"neType"` // 网元类型 + BeginTime int64 `form:"beginTime" binding:"required"` // 开始时间戳（毫秒）1739361200999 + EndTime int64 `form:"endTime" binding:"required"` // 结束时间戳（毫秒）1739361210088 Interval int64 `form:"interval" binding:"required,oneof=5 60 300 900 1800 3600"` - RmUID string `form:"rmUID"` SortField string `form:"sortField" binding:"omitempty,oneof=timeGroup"` SortOrder string `form:"sortOrder" binding:"omitempty,oneof=asc desc"` } diff --git a/src/modules/network_data/model/nb_state.go b/src/modules/network_data/model/nb_state.go index 6f422a42..7a76f545 100644 --- a/src/modules/network_data/model/nb_state.go +++ b/src/modules/network_data/model/nb_state.go @@ -3,9 +3,9 @@ package model // NBState 基站状态记录表 nb_state type NBState struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 AMF MME - NeId string `json:"neId" gorm:"column:ne_id"` // 网元ID - RmUid string `json:"rmUid" gorm:"column:rm_uid"` // 资源唯一标识 + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 Address string `json:"address" gorm:"column:address"` // 基站IP地址 NbName string `json:"nbName" gorm:"column:nb_name"` // 基站设备名称 @@ -22,8 +22,9 @@ func (*NBState) TableName() string { // NBStateQuery 查询参数结构体 type NBStateQuery struct { - NeType string `json:"neType" form:"neType" binding:"required"` - NeID string `json:"neId" form:"neId" binding:"required"` + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 + NeType string `json:"neType" form:"neType"` // 网元类型 PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageSize int64 `json:"pageSize" form:"pageSize" binding:"required"` Status string `json:"status" form:"status"` @@ -31,5 +32,4 @@ type NBStateQuery struct { EndTime string `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=id create_time"` // 排序字段，填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc - RmUID string `json:"rmUID" form:"rmUID"` } diff --git a/src/modules/network_data/model/ne_state.go b/src/modules/network_data/model/ne_state.go index b875f58f..ea8c56b9 100644 --- a/src/modules/network_data/model/ne_state.go +++ b/src/modules/network_data/model/ne_state.go @@ -3,8 +3,9 @@ package model // NEState 网元状态记录表 ne_state type NEState struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeId string `json:"neId" gorm:"column:ne_id"` + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Version string `json:"version" gorm:"column:version"` // 版本 Capability int64 `json:"capability" gorm:"column:capability"` // 用户容量 SerialNum string `json:"serialNum" gorm:"column:serial_num"` // 序列号 @@ -24,8 +25,9 @@ func (*NEState) TableName() string { // NEStateQuery 查询参数结构体 type NEStateQuery struct { - NeType string `json:"neType" form:"neType" binding:"required"` - NeID string `json:"neId" form:"neId" binding:"required"` + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 + NeType string `json:"neType" form:"neType"` // 网元类型 PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageSize int64 `json:"pageSize" form:"pageSize" binding:"required"` BeginTime string `json:"beginTime" form:"beginTime"` diff --git a/src/modules/network_data/model/udm_auth.go b/src/modules/network_data/model/udm_auth.go index fed24077..b0d37cff 100644 --- a/src/modules/network_data/model/udm_auth.go +++ b/src/modules/network_data/model/udm_auth.go @@ -3,8 +3,10 @@ package model // UDMAuthUser UDM鉴权用户 udm_auth type UDMAuthUser struct { ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 IMSI string `json:"imsi" gorm:"column:imsi"` // SIM卡/USIM卡ID - NeId string `json:"neId" gorm:"column:ne_id"` // UDM网元标识 Amf string `json:"amf" gorm:"column:amf"` // AMF Ki string `json:"ki" gorm:"column:ki"` // ki AlgoIndex string `json:"algoIndex" gorm:"column:algo_index"` // algoIndex diff --git a/src/modules/network_data/model/udm_extend.go b/src/modules/network_data/model/udm_extend.go index f4aac39b..703a0b09 100644 --- a/src/modules/network_data/model/udm_extend.go +++ b/src/modules/network_data/model/udm_extend.go @@ -2,11 +2,13 @@ package model // UDMExtend UDM用户IMSI扩展信息 udm_extend type UDMExtend struct { - ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID - IMSI string `json:"imsi" gorm:"column:imsi"` // SIM卡/USIM卡ID - MSISDN string `json:"msisdn" gorm:"column:msisdn"` // 用户电话号码 - NeId string `json:"neId" gorm:"column:ne_id"` // UDM网元标识-子系统 - Remark string `json:"remark" gorm:"column:remark"` // 备注 + ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 + IMSI string `json:"imsi" gorm:"column:imsi"` // SIM卡/USIM卡ID + MSISDN string `json:"msisdn" gorm:"column:msisdn"` // 用户电话号码 + Remark string `json:"remark" gorm:"column:remark"` // 备注 } // TableName 表名称 diff --git a/src/modules/network_data/model/udm_sub.go b/src/modules/network_data/model/udm_sub.go index 9ff03c5f..c83d93d7 100644 --- a/src/modules/network_data/model/udm_sub.go +++ b/src/modules/network_data/model/udm_sub.go @@ -2,10 +2,12 @@ package model // UDMSubUser UDM签约用户 udm_sub type UDMSubUser struct { - ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键 - IMSI string `json:"imsi" gorm:"column:imsi"` // SIM卡/USIM卡ID - MSISDN string `json:"msisdn" gorm:"column:msisdn"` // 用户电话号码 - NeId string `json:"neId" gorm:"column:ne_id"` // UDM网元标识 + ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键 + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 + IMSI string `json:"imsi" gorm:"column:imsi"` // SIM卡/USIM卡ID + MSISDN string `json:"msisdn" gorm:"column:msisdn"` // 用户电话号码 AmDat string `json:"amDat" gorm:"column:am_dat"` // AmData UeAmbrTpl string `json:"ambr" gorm:"column:ambr"` // AmData SubUeAMBRTemp diff --git a/src/modules/network_data/model/udm_voip.go b/src/modules/network_data/model/udm_voip.go index 2fbd1ae9..4e1854e4 100644 --- a/src/modules/network_data/model/udm_voip.go +++ b/src/modules/network_data/model/udm_voip.go @@ -2,8 +2,10 @@ package model // UDMVOIPUser UDMVOIP用户 udm_voip type UDMVOIPUser struct { - ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键 - NeId string `json:"neId" gorm:"column:ne_id"` // UDM网元标识 + ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键 + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 UserName string `json:"username" gorm:"column:username"` // 用户名 Password string `json:"password" gorm:"column:password"` // 密码 diff --git a/src/modules/network_data/model/udm_volte_ims.go b/src/modules/network_data/model/udm_volte_ims.go index 0dd4277b..1c25c915 100644 --- a/src/modules/network_data/model/udm_volte_ims.go +++ b/src/modules/network_data/model/udm_volte_ims.go @@ -2,10 +2,12 @@ package model // UDMVolteIMSUser UDMVolteIMS用户 udm_volte_ims type UDMVolteIMSUser struct { - ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键 - IMSI string `json:"imsi" gorm:"column:imsi"` // SIM卡/USIM卡ID - MSISDN string `json:"msisdn" gorm:"column:msisdn"` // 用户电话号码 - NeId string `json:"neId" gorm:"column:ne_id"` // UDM网元标识 + ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键 + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 + IMSI string `json:"imsi" gorm:"column:imsi"` // SIM卡/USIM卡ID + MSISDN string `json:"msisdn" gorm:"column:msisdn"` // 用户电话号码 Tag string `json:"tag" gorm:"column:tag"` // 0=VoIP, 1=VoLTE VNI string `json:"vni" gorm:"column:vni"` // VNI diff --git a/src/modules/network_data/model/ue_event_amf.go b/src/modules/network_data/model/ue_event_amf.go index 23340324..0690ea36 100644 --- a/src/modules/network_data/model/ue_event_amf.go +++ b/src/modules/network_data/model/ue_event_amf.go @@ -3,9 +3,9 @@ package model // UEEventAMF UE会话对象AMF ue_event_amf type UEEventAMF struct { ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` // 接收到的timestamp秒级存储毫秒时间戳 EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` // data JSON String @@ -19,12 +19,12 @@ func (*UEEventAMF) TableName() string { // UEEventAMFQuery UE会话对象AMF查询参数结构体 type UEEventAMFQuery struct { - NeType string `json:"neType" form:"neType" binding:"required,oneof=AMF"` // 网元类型, 暂时支持AMF - NeID string `json:"neId" form:"neId" binding:"required"` - RmUID string `json:"rmUID" form:"rmUID"` - EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state - IMSI string `json:"imsi" form:"imsi"` // imsi - BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 + NeType string `json:"neType" form:"neType"` // 网元类型 + EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state + IMSI string `json:"imsi" form:"imsi"` // imsi + BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc diff --git a/src/modules/network_data/model/ue_event_mme.go b/src/modules/network_data/model/ue_event_mme.go index 5c43eb79..4dce245a 100644 --- a/src/modules/network_data/model/ue_event_mme.go +++ b/src/modules/network_data/model/ue_event_mme.go @@ -3,9 +3,9 @@ package model // UEEventMME UE会话对象MME ue_event_mme type UEEventMME struct { ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` // 接收到的timestamp秒级存储毫秒时间戳 EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` // data JSON String @@ -19,12 +19,12 @@ func (*UEEventMME) TableName() string { // UEEventMMEQuery UE会话对象MME查询参数结构体 type UEEventMMEQuery struct { - NeType string `json:"neType" form:"neType" binding:"required,oneof=MME"` // 网元类型, 暂时支持MME - NeID string `json:"neId" form:"neId" binding:"required"` - RmUID string `json:"rmUID" form:"rmUID"` - EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state - IMSI string `json:"imsi" form:"imsi"` // imsi - BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp + CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 + NeType string `json:"neType" form:"neType"` // 网元类型 + EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state + IMSI string `json:"imsi" form:"imsi"` // imsi + BeginTime int64 `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc diff --git a/src/modules/network_data/network_data.go b/src/modules/network_data/network_data.go index d0a68959..abeb73ef 100644 --- a/src/modules/network_data/network_data.go +++ b/src/modules/network_data/network_data.go @@ -18,7 +18,7 @@ func Setup(router *gin.Engine) { // 启动时需要的初始参数 InitLoad() - neDataGroup := router.Group("/neData") + neDataGroup := router.Group("/ne/data") // 性能统计信息 kpiGroup := neDataGroup.Group("/kpi") @@ -237,7 +237,7 @@ func Setup(router *gin.Engine) { // 网元UDM 鉴权用户信息 udmAuthGroup := neDataGroup.Group("/udm/auth") { - udmAuthGroup.PUT("/resetData/:neId", + udmAuthGroup.PUT("/reset", repeat.RepeatSubmit(5), middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_CLEAN)), @@ -247,35 +247,25 @@ func Setup(router *gin.Engine) { middleware.AuthorizeUser(nil), controller.NewUDMAuth.List, ) - udmAuthGroup.GET("/:neId/:imsi", + udmAuthGroup.GET("", middleware.AuthorizeUser(nil), controller.NewUDMAuth.Info, ) - udmAuthGroup.POST("/:neId", + udmAuthGroup.POST("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)), controller.NewUDMAuth.Add, ) - udmAuthGroup.POST("/:neId/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMAuth.Adds, - ) - udmAuthGroup.PUT("/:neId", + udmAuthGroup.PUT("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_UPDATE)), controller.NewUDMAuth.Edit, ) - udmAuthGroup.DELETE("/:neId/:imsi", + udmAuthGroup.DELETE("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)), controller.NewUDMAuth.Remove, ) - udmAuthGroup.DELETE("/:neId/:imsi/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMAuth.Removes, - ) udmAuthGroup.GET("/export", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_EXPORT)), @@ -301,35 +291,25 @@ func Setup(router *gin.Engine) { middleware.AuthorizeUser(nil), controller.NewUDMSub.List, ) - udmSubGroup.GET("/:neId/:imsi", + udmSubGroup.GET("", middleware.AuthorizeUser(nil), controller.NewUDMSub.Info, ) - udmSubGroup.POST("/:neId", + udmSubGroup.POST("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)), controller.NewUDMSub.Add, ) - udmSubGroup.POST("/:neId/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMSub.Adds, - ) - udmSubGroup.PUT("/:neId", + udmSubGroup.PUT("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_UPDATE)), controller.NewUDMSub.Edit, ) - udmSubGroup.DELETE("/:neId/:imsi", + udmSubGroup.DELETE("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)), controller.NewUDMSub.Remove, ) - udmSubGroup.DELETE("/:neId/:imsi/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMSub.Removes, - ) udmSubGroup.GET("/export", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_EXPORT)), @@ -345,7 +325,7 @@ func Setup(router *gin.Engine) { // 网元UDM VOIP用户信息 udmVOIPGroup := neDataGroup.Group("/udm/voip") { - udmVOIPGroup.PUT("/resetData/:neId", + udmVOIPGroup.PUT("/reset", repeat.RepeatSubmit(5), middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_CLEAN)), @@ -355,30 +335,20 @@ func Setup(router *gin.Engine) { middleware.AuthorizeUser(nil), controller.NewUDMVOIP.List, ) - udmVOIPGroup.GET("/:neId/:username", + udmVOIPGroup.GET("", middleware.AuthorizeUser(nil), controller.NewUDMVOIP.Info, ) - udmVOIPGroup.POST("/:neId", + udmVOIPGroup.POST("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_INSERT)), controller.NewUDMVOIP.Add, ) - udmVOIPGroup.POST("/:neId/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMVOIP.Adds, - ) - udmVOIPGroup.DELETE("/:neId/:username", + udmVOIPGroup.DELETE("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_DELETE)), controller.NewUDMVOIP.Remove, ) - udmVOIPGroup.DELETE("/:neId/:username/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMVOIP.Removes, - ) udmVOIPGroup.GET("/export", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_EXPORT)), @@ -394,7 +364,7 @@ func Setup(router *gin.Engine) { // 网元UDM VolteIMS用户信息 udmVolteIMSGroup := neDataGroup.Group("/udm/volte-ims") { - udmVolteIMSGroup.PUT("/resetData/:neId", + udmVolteIMSGroup.PUT("/reset", repeat.RepeatSubmit(5), middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_CLEAN)), @@ -404,30 +374,20 @@ func Setup(router *gin.Engine) { middleware.AuthorizeUser(nil), controller.NewUDMVolteIMS.List, ) - udmVolteIMSGroup.GET("/:neId/:imsi", + udmVolteIMSGroup.GET("", middleware.AuthorizeUser(nil), controller.NewUDMVolteIMS.Info, ) - udmVolteIMSGroup.POST("/:neId", + udmVolteIMSGroup.POST("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_INSERT)), controller.NewUDMVolteIMS.Add, ) - udmVolteIMSGroup.POST("/:neId/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_INSERT)), - controller.NewUDMVolteIMS.Adds, - ) - udmVolteIMSGroup.DELETE("/:neId/:imsi", + udmVolteIMSGroup.DELETE("", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_DELETE)), controller.NewUDMVolteIMS.Remove, ) - udmVolteIMSGroup.DELETE("/:neId/:imsi/:num", - middleware.AuthorizeUser(nil), - collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_DELETE)), - controller.NewUDMVolteIMS.Removes, - ) udmVolteIMSGroup.GET("/export", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_EXPORT)), diff --git a/src/modules/network_data/repository/alarm.go b/src/modules/network_data/repository/alarm.go index 9cbbea1c..a54c6e73 100644 --- a/src/modules/network_data/repository/alarm.go +++ b/src/modules/network_data/repository/alarm.go @@ -22,14 +22,11 @@ func (r Alarm) SelectByPage(query model.AlarmQuery) ([]model.Alarm, int64) { if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.NeID != "" { - tx = tx.Where("ne_id = ?", query.NeID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) } - if query.NeName != "" { - tx = tx.Where("ne_name = ?", query.NeName) - } - if query.PvFlag != "" { - tx = tx.Where("pv_flag = ?", query.PvFlag) + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.AlarmCode != "" { tx = tx.Where("alarm_code = ?", query.AlarmCode) @@ -87,11 +84,11 @@ func (r Alarm) Select(param model.Alarm) []model.Alarm { if param.NeType != "" { tx = tx.Where("ne_type = ?", param.NeType) } - if param.NeId != "" { - tx = tx.Where("ne_id = ?", param.NeId) + if param.NeUID != "" { + tx = tx.Where("ne_uid = ?", param.NeUID) } - if param.NeName != "" { - tx = tx.Where("ne_name = ?", param.NeName) + if param.CoreUID != "" { + tx = tx.Where("core_uid = ?", param.CoreUID) } if param.AlarmCode > 0 { tx = tx.Where("alarm_code = ?", param.AlarmCode) @@ -106,9 +103,6 @@ func (r Alarm) Select(param model.Alarm) []model.Alarm { eventTypes := strings.Split(param.OrigSeverity, ",") tx = tx.Where("orig_severity in (%s)", eventTypes) } - if param.PvFlag != "" { - tx = tx.Where("pv_flag = ?", param.PvFlag) - } // 查询数据 rows := []model.Alarm{} @@ -180,9 +174,9 @@ func (r Alarm) DeleteByIds(ids []int64) int64 { } // SelectAlarmSeqLast 查询网元告警最后一条序号 -func (r Alarm) SelectAlarmSeqLast(neType, neId string) int64 { +func (r Alarm) SelectAlarmSeqLast(coreUid, neUid string) int64 { tx := db.DB("").Model(&model.Alarm{}) - tx = tx.Where("ne_type=? and ne_id=?", neType, neId) + tx = tx.Where("core_uid=? and ne_uid=?", coreUid, neUid) tx = tx.Select("alarm_seq").Order("alarm_seq DESC") // 查询数据 var alarmSeq int64 = 0 diff --git a/src/modules/network_data/repository/alarm_event.go b/src/modules/network_data/repository/alarm_event.go index c5d84358..f7f1d182 100644 --- a/src/modules/network_data/repository/alarm_event.go +++ b/src/modules/network_data/repository/alarm_event.go @@ -21,8 +21,11 @@ func (r AlarmEvent) SelectByPage(query model.AlarmEventQuery) ([]model.AlarmEven if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.NeID != "" { - tx = tx.Where("ne_id = ?", query.NeID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.AlarmCode != "" { tx = tx.Where("alarm_code = ?", query.AlarmCode) @@ -73,8 +76,11 @@ func (r AlarmEvent) Select(param model.AlarmEvent) []model.AlarmEvent { if param.NeType != "" { tx = tx.Where("ne_type = ?", param.NeType) } - if param.NeId != "" { - tx = tx.Where("ne_id = ?", param.NeId) + if param.NeUID != "" { + tx = tx.Where("ne_uid = ?", param.NeUID) + } + if param.CoreUID != "" { + tx = tx.Where("core_uid = ?", param.CoreUID) } if param.AlarmId != "" { tx = tx.Where("alarm_id = ?", param.AlarmId) @@ -155,9 +161,9 @@ func (r AlarmEvent) DeleteByIds(ids []int64) int64 { } // SelectAlarmEventSeqLast 查询网元告警最后一条序号 -func (r AlarmEvent) SelectAlarmEventSeqLast(neType, neId string) int64 { +func (r AlarmEvent) SelectAlarmEventSeqLast(coreUid, neUid string) int64 { tx := db.DB("").Model(&model.AlarmEvent{}) - tx = tx.Where("ne_type=? and ne_id=?", neType, neId) + tx = tx.Where("core_uid=? and ne_uid=?", coreUid, neUid) tx = tx.Select("alarm_seq").Order("alarm_seq DESC") // 查询数据 var AlarmEventSeq int64 = 0 diff --git a/src/modules/network_data/repository/alarm_forward_log.go b/src/modules/network_data/repository/alarm_forward_log.go index f409a690..6ba093a0 100644 --- a/src/modules/network_data/repository/alarm_forward_log.go +++ b/src/modules/network_data/repository/alarm_forward_log.go @@ -21,8 +21,11 @@ func (r AlarmForwardLog) SelectByPage(query model.AlarmForwardLogQuery) ([]model if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.NeID != "" { - tx = tx.Where("ne_id = ?", query.NeID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("created_at >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/alarm_log.go b/src/modules/network_data/repository/alarm_log.go index 1ee20cec..a333a11e 100644 --- a/src/modules/network_data/repository/alarm_log.go +++ b/src/modules/network_data/repository/alarm_log.go @@ -21,8 +21,11 @@ func (r AlarmLog) SelectByPage(query model.AlarmLogQuery) ([]model.AlarmLog, int if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.NeID != "" { - tx = tx.Where("ne_id = ?", query.NeID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("created_at >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/cdr_event_ims.go b/src/modules/network_data/repository/cdr_event_ims.go index 814bd83d..608ba98a 100644 --- a/src/modules/network_data/repository/cdr_event_ims.go +++ b/src/modules/network_data/repository/cdr_event_ims.go @@ -22,8 +22,11 @@ func (r CDREventIMS) SelectByPage(query model.CDREventIMSQuery) ([]model.CDREven if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("created_at >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/cdr_event_sgwc.go b/src/modules/network_data/repository/cdr_event_sgwc.go index 6410120f..3c19673b 100644 --- a/src/modules/network_data/repository/cdr_event_sgwc.go +++ b/src/modules/network_data/repository/cdr_event_sgwc.go @@ -19,8 +19,11 @@ func (r CDREventSGWC) SelectByPage(query model.CDREventSGWCQuery) ([]model.CDREv if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("timestamp >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/cdr_event_smf.go b/src/modules/network_data/repository/cdr_event_smf.go index 6892e19d..3f344a41 100644 --- a/src/modules/network_data/repository/cdr_event_smf.go +++ b/src/modules/network_data/repository/cdr_event_smf.go @@ -19,8 +19,11 @@ func (r CDREventSMF) SelectByPage(query model.CDREventSMFQuery) ([]model.CDREven if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("timestamp >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/cdr_event_smsc.go b/src/modules/network_data/repository/cdr_event_smsc.go index 928e5063..faa6efe0 100644 --- a/src/modules/network_data/repository/cdr_event_smsc.go +++ b/src/modules/network_data/repository/cdr_event_smsc.go @@ -22,8 +22,11 @@ func (r CDREventSMSC) SelectByPage(query model.CDREventSMSCQuery) ([]model.CDREv if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("timestamp >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/kpi_c_report.go b/src/modules/network_data/repository/kpi_c_report.go index 44a8ee28..d98b5aad 100644 --- a/src/modules/network_data/repository/kpi_c_report.go +++ b/src/modules/network_data/repository/kpi_c_report.go @@ -28,8 +28,14 @@ func (r KpiCReport) SelectKPI(query model.KPIQuery) []model.KpiCReport { tableName := fmt.Sprintf("kpi_c_report_%s", strings.ToLower(query.NeType)) tx.Table(tableName) // 构建查询条件 - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeType != "" { + tx = tx.Where("ne_type = ?", query.NeType) + } + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("created_at >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/kpi_report.go b/src/modules/network_data/repository/kpi_report.go index 202b395f..87733076 100644 --- a/src/modules/network_data/repository/kpi_report.go +++ b/src/modules/network_data/repository/kpi_report.go @@ -28,8 +28,14 @@ func (r KpiReport) SelectKPI(query model.KPIQuery) []model.KpiReport { tableName := fmt.Sprintf("kpi_report_%s", strings.ToLower(query.NeType)) tx = tx.Table(tableName) // 构建查询条件 - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeType != "" { + tx = tx.Where("ne_type = ?", query.NeType) + } + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("created_at >= ?", query.BeginTime) @@ -55,7 +61,7 @@ func (r KpiReport) SelectKPI(query model.KPIQuery) []model.KpiReport { // Insert 新增信息 返回新增数据ID func (r KpiReport) Insert(param model.KpiReport) int64 { - if param.NeType == "" { + if param.CoreUID == "" || param.NeUID == "" || param.NeType == "" { return 0 } if param.CreatedAt == 0 { @@ -89,11 +95,11 @@ func (r KpiReport) SelectKPITitle(neType string) []model.KpiTitle { } // SelectUPF 查询UPF数据 N3上行,N6下行 -func (r KpiReport) SelectUPF(rmUID string, beginTime, endTime int64) []model.KpiReport { +func (r KpiReport) SelectUPF(coreUid, neUid string, beginTime, endTime int64) []model.KpiReport { tx := db.DB("").Model(&model.KpiReport{}) // 表名 tx = tx.Table("kpi_report_upf") - tx = tx.Where("rm_uid = ?", rmUID) + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) tx = tx.Where("created_at >= ?", beginTime) tx = tx.Where("created_at <= ?", endTime) // 查询数据 diff --git a/src/modules/network_data/repository/nb_state.go b/src/modules/network_data/repository/nb_state.go index 6faf437c..2716a53a 100644 --- a/src/modules/network_data/repository/nb_state.go +++ b/src/modules/network_data/repository/nb_state.go @@ -22,11 +22,11 @@ func (r NBState) SelectByPage(query model.NBStateQuery) ([]model.NBState, int64) if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.NeID != "" { - tx = tx.Where("ne_id = ?", query.NeID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) } - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.Status != "" { tx = tx.Where("state = ?", query.Status) diff --git a/src/modules/network_data/repository/ne_state.go b/src/modules/network_data/repository/ne_state.go index 05f48a8f..a5025a0a 100644 --- a/src/modules/network_data/repository/ne_state.go +++ b/src/modules/network_data/repository/ne_state.go @@ -21,8 +21,11 @@ func (r NEState) SelectByPage(query model.NEStateQuery) ([]model.NEState, int64) if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.NeID != "" { - tx = tx.Where("ne_id = ?", query.NeID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != "" { startTime := query.BeginTime diff --git a/src/modules/network_data/repository/udm_auth.go b/src/modules/network_data/repository/udm_auth.go index 4a9565a5..bbb4fddf 100644 --- a/src/modules/network_data/repository/udm_auth.go +++ b/src/modules/network_data/repository/udm_auth.go @@ -16,10 +16,10 @@ var NewUDMAuthUser = &UDMAuthUser{} type UDMAuthUser struct{} // ClearAndInsert 清空ne_id后新增实体 -func (r *UDMAuthUser) ClearAndInsert(neId string, uArr []model.UDMAuthUser) int64 { +func (r *UDMAuthUser) ClearAndInsert(coreUid, neUid string, uArr []model.UDMAuthUser) int64 { // 不指定neID时，用 TRUNCATE 清空表快 // _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_auth", nil) - result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMAuthUser{}) + result := db.DB("").Where("core_uid = ? and ne_id = ?", coreUid, neUid).Unscoped().Delete(&model.UDMAuthUser{}) if result.Error != nil { logger.Errorf("Delete err => %v", result.Error) } @@ -33,8 +33,11 @@ func (r *UDMAuthUser) SelectPage(query map[string]string) (int64, []model.UDMAut if v, ok := query["imsi"]; ok && v != "" { tx = tx.Where("imsi like ?", fmt.Sprintf("%%%s%%", v)) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id = ?", v) + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("ne_uid = ?", v) + } + if v, ok := query["coreUid"]; ok && v != "" { + tx = tx.Where("core_id = ?", v) } if v, ok := query["imsis"]; ok && v != "" { arr := strings.Split(v, ",") @@ -83,8 +86,11 @@ func (r *UDMAuthUser) SelectList(u model.UDMAuthUser) []model.UDMAuthUser { if u.IMSI != "" { tx = tx.Where("imsi = ?", u.IMSI) } - if u.NeId != "" { - tx = tx.Where("ne_id = ?", u.NeId) + if u.NeUID != "" { + tx = tx.Where("ne_uid = ?", u.NeUID) + } + if u.CoreUID != "" { + tx = tx.Where("core_uid = ?", u.CoreUID) } // 查询数据 @@ -95,12 +101,13 @@ func (r *UDMAuthUser) SelectList(u model.UDMAuthUser) []model.UDMAuthUser { return arr } -// SelectByIMSIAndNeID 通过imsi和ne_id查询 -func (r *UDMAuthUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMAuthUser { +// SelectByIMSI 通过imsi和ne_id查询 +func (r *UDMAuthUser) SelectByIMSI(coreUid, neUid, imsi string) model.UDMAuthUser { tx := db.DB("").Model(&model.UDMAuthUser{}) item := model.UDMAuthUser{} // 查询条件拼接 - tx = tx.Where("imsi = ? and ne_id = ?", imsi, neId) + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ?", imsi) // 查询数据 if err := tx.Order("imsi asc").Limit(1).Find(&item).Error; err != nil { logger.Errorf("query err => %v", err) @@ -118,8 +125,11 @@ func (r *UDMAuthUser) Inserts(uArr []model.UDMAuthUser) int64 { } // Delete 删除实体 -func (r *UDMAuthUser) Delete(imsi, neId string) int64 { - tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMAuthUser{}) +func (r *UDMAuthUser) DeleteByIMSI(coreUid, neUid, imsi string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ?", imsi) + tx.Delete(&model.UDMAuthUser{}) if err := tx.Error; err != nil { logger.Errorf("Delete err => %v", err) } @@ -127,8 +137,11 @@ func (r *UDMAuthUser) Delete(imsi, neId string) int64 { } // DeletePrefixByIMSI 删除前缀匹配的实体 -func (r *UDMAuthUser) DeletePrefixByIMSI(imsi, neId string) int64 { - tx := db.DB("").Where("imsi like ? and ne_id = ?", fmt.Sprintf("%s%%", imsi), neId).Delete(&model.UDMAuthUser{}) +func (r *UDMAuthUser) DeletePrefixByIMSI(coreUid, neUid, imsiPrefix string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsiPrefix)) + tx.Delete(&model.UDMAuthUser{}) if err := tx.Error; err != nil { logger.Errorf("DeletePrefixByIMSI err => %v", err) } diff --git a/src/modules/network_data/repository/udm_extend.go b/src/modules/network_data/repository/udm_extend.go index 00a4d73e..dd53a1e9 100644 --- a/src/modules/network_data/repository/udm_extend.go +++ b/src/modules/network_data/repository/udm_extend.go @@ -21,8 +21,11 @@ func (r UDMExtend) SelectByPage(query map[string]string) ([]model.UDMExtend, int if v, ok := query["imsi"]; ok && v != "" { tx = tx.Where("imsi like ?", fmt.Sprintf("%%%s%%", v)) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id = ?", v) + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("ne_uid = ?", v) + } + if v, ok := query["coreUid"]; ok && v != "" { + tx = tx.Where("core_uid = ?", v) } // 查询结果 @@ -61,8 +64,11 @@ func (r *UDMExtend) SelectList(u model.UDMExtend) []model.UDMExtend { if u.IMSI != "" { tx = tx.Where("imsi = ?", u.IMSI) } - if u.NeId != "" { - tx = tx.Where("ne_id = ?", u.NeId) + if u.NeUID != "" { + tx = tx.Where("ne_uid = ?", u.NeUID) + } + if u.CoreUID != "" { + tx = tx.Where("core_uid = ?", u.CoreUID) } tx = tx.Order("imsi asc") // 查询数据 @@ -74,14 +80,16 @@ func (r *UDMExtend) SelectList(u model.UDMExtend) []model.UDMExtend { return rows } -// SelectByIMSIAndNeID 通过imsi和ne_id查询 neId为%时模糊imsi查询 -func (r *UDMExtend) SelectByIMSIAndNeID(imsi, neId string) model.UDMExtend { +// SelectByIMSI 通过imsi和ne_id查询 neUid为%时模糊imsi查询 +func (r *UDMExtend) SelectByIMSI(coreUid, neUid, imsi string) model.UDMExtend { tx := db.DB("").Model(&model.UDMExtend{}) - // 构建查询条件 - if neId == "%" { + // 查询条件拼接 + if neUid == "%" { + tx = tx.Where("core_uid = ?", coreUid) tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsi)) } else { - tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ?", imsi) } // 查询数据 rows := []model.UDMExtend{} @@ -103,13 +111,16 @@ func (r *UDMExtend) Inserts(uArr []model.UDMExtend) int64 { return tx.RowsAffected } -// Delete 删除实体 neId为%时模糊imsi前缀 -func (r *UDMExtend) Delete(imsi, neId string) int64 { +// Delete 删除实体 neUid为%时模糊imsi前缀 +func (r *UDMExtend) DeleteByIMSI(coreUid, neUid, imsi string) int64 { tx := db.DB("") - if neId == "%" { + // 查询条件拼接 + if neUid == "%" { + tx = tx.Where("core_uid = ?", coreUid) tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsi)) } else { - tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ?", imsi) } tx = tx.Delete(&model.UDMExtend{}) if err := tx.Error; err != nil { diff --git a/src/modules/network_data/repository/udm_sub.go b/src/modules/network_data/repository/udm_sub.go index 5e7d2a14..514bbf22 100644 --- a/src/modules/network_data/repository/udm_sub.go +++ b/src/modules/network_data/repository/udm_sub.go @@ -16,10 +16,10 @@ var NewUDMSub = &UDMSubUser{} type UDMSubUser struct{} // ClearAndInsert 清空ne_id后新增实体 -func (r *UDMSubUser) ClearAndInsert(neId string, u []model.UDMSubUser) int64 { +func (r *UDMSubUser) ClearAndInsert(coreUid, neUid string, u []model.UDMSubUser) int64 { // 不指定neID时，用 TRUNCATE 清空表快 // _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_sub", nil) - result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMSubUser{}) + result := db.DB("").Where("core_uid = ? and ne_uid = ?", neUid).Unscoped().Delete(&model.UDMSubUser{}) if result.Error != nil { logger.Errorf("Delete err => %v", result.Error) } @@ -36,8 +36,11 @@ func (r *UDMSubUser) SelectPage(query map[string]string) (int64, []model.UDMSubU if v, ok := query["msisdn"]; ok && v != "" { tx = tx.Where("msisdn like ?", fmt.Sprintf("%%%s%%", v)) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id =?", v) + if v, ok := query["coreUid"]; ok && v != "" { + tx = tx.Where("core_uid = ?", v) + } + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("ne_uid = ?", v) } if v, ok := query["imsis"]; ok && v != "" { arr := strings.Split(v, ",") @@ -86,10 +89,12 @@ func (r *UDMSubUser) SelectList(u model.UDMSubUser) []model.UDMSubUser { if u.IMSI != "" { tx = tx.Where("imsi = ?", u.IMSI) } - if u.NeId != "" { - tx = tx.Where("ne_id = ?", u.NeId) + if u.NeUID != "" { + tx = tx.Where("ne_uid = ?", u.NeUID) + } + if u.CoreUID != "" { + tx = tx.Where("core_uid = ?", u.CoreUID) } - // 查询数据 arr := []model.UDMSubUser{} if err := tx.Order("imsi asc").Find(&arr).Error; err != nil { @@ -98,12 +103,13 @@ func (r *UDMSubUser) SelectList(u model.UDMSubUser) []model.UDMSubUser { return arr } -// SelectByIMSIAndNeID 通过imsi和ne_id查询 -func (r *UDMSubUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMSubUser { +// SelectByIMSIAndNeID 通过imsi查询 +func (r *UDMSubUser) SelectByIMSI(coreUid, neUid, imsi string) model.UDMSubUser { tx := db.DB("").Model(&model.UDMSubUser{}) item := model.UDMSubUser{} // 查询条件拼接 - tx = tx.Where("imsi = ? and ne_id = ?", imsi, neId) + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ?", imsi) // 查询数据 if err := tx.Order("imsi asc").Limit(1).Find(&item).Error; err != nil { logger.Errorf("query err => %v", err) @@ -120,9 +126,12 @@ func (r *UDMSubUser) Inserts(uArr []model.UDMSubUser) int64 { return tx.RowsAffected } -// Delete 删除实体 -func (r *UDMSubUser) Delete(imsi, neId string) int64 { - tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMSubUser{}) +// DeleteByIMSI 删除实体 +func (r *UDMSubUser) DeleteByIMSI(coreUid, neUid, imsi string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ?", imsi) + tx.Delete(&model.UDMSubUser{}) if err := tx.Error; err != nil { logger.Errorf("Delete err => %v", err) } @@ -130,8 +139,11 @@ func (r *UDMSubUser) Delete(imsi, neId string) int64 { } // DeletePrefixByIMSI 删除前缀匹配的实体 -func (r *UDMSubUser) DeletePrefixByIMSI(imsiPrefix, neId string) int64 { - tx := db.DB("").Where("imsi like ? and ne_id = ?", fmt.Sprintf("%s%%", imsiPrefix), neId).Delete(&model.UDMSubUser{}) +func (r *UDMSubUser) DeletePrefixByIMSI(coreUid, neUid, imsiPrefix string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsiPrefix)) + tx.Delete(&model.UDMSubUser{}) if err := tx.Error; err != nil { logger.Errorf("DeletePrefixByIMSI err => %v", err) } diff --git a/src/modules/network_data/repository/udm_voip.go b/src/modules/network_data/repository/udm_voip.go index e0fe4a93..bbba0e37 100644 --- a/src/modules/network_data/repository/udm_voip.go +++ b/src/modules/network_data/repository/udm_voip.go @@ -16,10 +16,10 @@ var NewUDMVOIPUser = &UDMVOIPUser{} type UDMVOIPUser struct{} // ClearAndInsert 清空ne_id后新增实体 -func (r UDMVOIPUser) ClearAndInsert(neId string, uArr []model.UDMVOIPUser) int64 { +func (r UDMVOIPUser) ClearAndInsert(coreUid, neUid string, uArr []model.UDMVOIPUser) int64 { // 不指定neID时，用 TRUNCATE 清空表快 // _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_voip", nil) - result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMVOIPUser{}) + result := db.DB("").Where("core_uid = ? and ne_uid = ?", coreUid, neUid).Unscoped().Delete(&model.UDMVOIPUser{}) if result.Error != nil { logger.Errorf("Delete err => %v", result.Error) } @@ -33,8 +33,11 @@ func (r UDMVOIPUser) SelectPage(query map[string]string) (int64, []model.UDMVOIP if v, ok := query["username"]; ok && v != "" { tx = tx.Where("username like ?", fmt.Sprintf("%%%s%%", v)) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id = ?", v) + if v, ok := query["coreUid"]; ok && v != "" { + tx = tx.Where("core_uid = ?", v) + } + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("ne_uid = ?", v) } if v, ok := query["usernames"]; ok && v != "" { arr := strings.Split(v, ",") @@ -85,8 +88,11 @@ func (r UDMVOIPUser) SelectList(u model.UDMVOIPUser) []model.UDMVOIPUser { if u.UserName != "" { tx = tx.Where("username = ?", u.UserName) } - if u.NeId != "" { - tx = tx.Where("ne_id = ?", u.NeId) + if u.NeUID != "" { + tx = tx.Where("ne_uid = ?", u.NeUID) + } + if u.CoreUID != "" { + tx = tx.Where("core_uid = ?", u.CoreUID) } // 查询数据 @@ -97,12 +103,13 @@ func (r UDMVOIPUser) SelectList(u model.UDMVOIPUser) []model.UDMVOIPUser { return arr } -// SelectByUserNameAndNeID 通过username和ne_id查询 -func (r UDMVOIPUser) SelectByUserNameAndNeID(username, neId string) model.UDMVOIPUser { +// SelectByUserName 通过username查询 +func (r UDMVOIPUser) SelectByUserName(coreUid, neUid, username string) model.UDMVOIPUser { tx := db.DB("").Model(&model.UDMVOIPUser{}) item := model.UDMVOIPUser{} // 查询条件拼接 - tx = tx.Where("username = ? and ne_id = ?", username, neId) + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("username = ?", username) // 查询数据 if err := tx.Order("username asc").Limit(1).Find(&item).Error; err != nil { logger.Errorf("query err => %v", err) @@ -119,9 +126,12 @@ func (r UDMVOIPUser) Inserts(uArr []model.UDMVOIPUser) int64 { return tx.RowsAffected } -// Delete 删除实体 -func (r UDMVOIPUser) Delete(username, neId string) int64 { - tx := db.DB("").Where("username = ? and ne_id = ?", username, neId).Delete(&model.UDMVOIPUser{}) +// DeleteByUserName 删除实体 +func (r UDMVOIPUser) DeleteByUserName(coreUid, neUid, username string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("username = ?", username) + tx.Delete(&model.UDMVOIPUser{}) if err := tx.Error; err != nil { logger.Errorf("Delete err => %v", err) } @@ -129,8 +139,11 @@ func (r UDMVOIPUser) Delete(username, neId string) int64 { } // DeletePrefixByUserName 删除前缀匹配的实体 -func (r UDMVOIPUser) DeletePrefixByUserName(username, neId string) int64 { - tx := db.DB("").Where("username like ? and ne_id = ?", fmt.Sprintf("%s%%", username), neId).Delete(&model.UDMVOIPUser{}) +func (r UDMVOIPUser) DeletePrefixByUserName(coreUid, neUid, usernamePrefix string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("username like ?", fmt.Sprintf("%s%%", usernamePrefix)) + tx.Delete(&model.UDMVOIPUser{}) if err := tx.Error; err != nil { logger.Errorf("DeletePrefixByUserName err => %v", err) } diff --git a/src/modules/network_data/repository/udm_volte_ims.go b/src/modules/network_data/repository/udm_volte_ims.go index b4fc935d..d375f6e7 100644 --- a/src/modules/network_data/repository/udm_volte_ims.go +++ b/src/modules/network_data/repository/udm_volte_ims.go @@ -16,10 +16,10 @@ var NewUDMVolteIMSUser = &UDMVolteIMSUser{} type UDMVolteIMSUser struct{} // ClearAndInsert 清空ne_id后新增实体 -func (r UDMVolteIMSUser) ClearAndInsert(neId string, uArr []model.UDMVolteIMSUser) int64 { +func (r UDMVolteIMSUser) ClearAndInsert(coreUid, neUid string, uArr []model.UDMVolteIMSUser) int64 { // 不指定neID时，用 TRUNCATE 清空表快 // _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_volte_ims", nil) - result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMVolteIMSUser{}) + result := db.DB("").Where("core_uid = ? and ne_uid = ?", coreUid, neUid).Unscoped().Delete(&model.UDMVolteIMSUser{}) if result.Error != nil { logger.Errorf("Delete err => %v", result.Error) } @@ -36,8 +36,11 @@ func (r UDMVolteIMSUser) SelectPage(query map[string]string) (int64, []model.UDM if v, ok := query["msisdn"]; ok && v != "" { tx = tx.Where("msisdn like ?", fmt.Sprintf("%%%s%%", v)) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id = ?", v) + if v, ok := query["coreUid"]; ok && v != "" { + tx = tx.Where("core_uid = ?", v) + } + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("ne_uid = ?", v) } if v, ok := query["tag"]; ok && v != "" { tx = tx.Where("tag = ?", v) @@ -91,12 +94,15 @@ func (r UDMVolteIMSUser) SelectPage(query map[string]string) (int64, []model.UDM func (r UDMVolteIMSUser) SelectList(u model.UDMVolteIMSUser) []model.UDMVolteIMSUser { tx := db.DB("").Model(&model.UDMVolteIMSUser{}) // 查询条件拼接 + if u.NeUID != "" { + tx = tx.Where("ne_uid = ?", u.NeUID) + } + if u.CoreUID != "" { + tx = tx.Where("core_uid = ?", u.CoreUID) + } if u.IMSI != "" { tx = tx.Where("imsi = ?", u.IMSI) } - if u.NeId != "" { - tx = tx.Where("ne_id = ?", u.NeId) - } if u.Tag != "" { tx = tx.Where("tag = ?", u.Tag) } @@ -109,12 +115,13 @@ func (r UDMVolteIMSUser) SelectList(u model.UDMVolteIMSUser) []model.UDMVolteIMS return arr } -// SelectByIMSIAndMSISDNAndNeID 通过imsi,msisdn,ne_id查询 -func (r UDMVolteIMSUser) SelectByIMSIAndMSISDNAndNeID(imsi, msisdn, neId string) model.UDMVolteIMSUser { +// SelectByIMSIAndMSISDN 通过imsi,msisdn查询 +func (r UDMVolteIMSUser) SelectByIMSIAndMSISDN(coreUid, neUid, imsi, msisdn string) model.UDMVolteIMSUser { tx := db.DB("").Model(&model.UDMVolteIMSUser{}) item := model.UDMVolteIMSUser{} // 查询条件拼接 - tx = tx.Where("imsi = ? and msisdn = ? and ne_id = ?", imsi, msisdn, neId) + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ? and msisdn = ?", imsi, msisdn) // 查询数据 if err := tx.Order("imsi asc").Limit(1).Find(&item).Error; err != nil { logger.Errorf("query err => %v", err) @@ -132,8 +139,11 @@ func (r UDMVolteIMSUser) Inserts(uArr []model.UDMVolteIMSUser) int64 { } // Delete 删除实体 -func (r UDMVolteIMSUser) Delete(imsi, neId string) int64 { - tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMVolteIMSUser{}) +func (r UDMVolteIMSUser) DeleteByIMSI(coreUid, neUid, imsi string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi = ?", imsi) + tx.Delete(&model.UDMVolteIMSUser{}) if err := tx.Error; err != nil { logger.Errorf("Delete err => %v", err) } @@ -141,8 +151,11 @@ func (r UDMVolteIMSUser) Delete(imsi, neId string) int64 { } // DeletePrefixByIMSI 删除前缀匹配的实体 -func (r UDMVolteIMSUser) DeletePrefixByIMSI(imsi, neId string) int64 { - tx := db.DB("").Where("imsi like ? and ne_id = ?", fmt.Sprintf("%s%%", imsi), neId).Delete(&model.UDMVolteIMSUser{}) +func (r UDMVolteIMSUser) DeletePrefixByIMSI(coreUid, neUid, imsiPrefix string) int64 { + tx := db.DB("") + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsiPrefix)) + tx.Delete(&model.UDMVolteIMSUser{}) if err := tx.Error; err != nil { logger.Errorf("DeletePrefixByIMSI err => %v", err) } diff --git a/src/modules/network_data/repository/ue_event_amf.go b/src/modules/network_data/repository/ue_event_amf.go index 60c109cc..c2077637 100644 --- a/src/modules/network_data/repository/ue_event_amf.go +++ b/src/modules/network_data/repository/ue_event_amf.go @@ -21,8 +21,11 @@ func (r UEEventAMF) SelectByPage(query model.UEEventAMFQuery) ([]model.UEEventAM if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("timestamp >= ?", query.BeginTime) diff --git a/src/modules/network_data/repository/ue_event_mme.go b/src/modules/network_data/repository/ue_event_mme.go index ffcb6262..2111041c 100644 --- a/src/modules/network_data/repository/ue_event_mme.go +++ b/src/modules/network_data/repository/ue_event_mme.go @@ -21,8 +21,11 @@ func (r UEEventMME) SelectByPage(query model.UEEventMMEQuery) ([]model.UEEventMM if query.NeType != "" { tx = tx.Where("ne_type = ?", query.NeType) } - if query.RmUID != "" { - tx = tx.Where("rm_uid = ?", query.RmUID) + if query.NeUID != "" { + tx = tx.Where("ne_uid = ?", query.NeUID) + } + if query.CoreUID != "" { + tx = tx.Where("core_uid = ?", query.CoreUID) } if query.BeginTime != 0 { tx = tx.Where("timestamp >= ?", query.BeginTime) diff --git a/src/modules/network_data/service/alarm.go b/src/modules/network_data/service/alarm.go index bb98a45a..cefa4215 100644 --- a/src/modules/network_data/service/alarm.go +++ b/src/modules/network_data/service/alarm.go @@ -61,8 +61,8 @@ func (r Alarm) DeleteByIds(ids []int64) (int64, error) { } // FindAlarmSeqLast 查询网元告警最后一条序号 -func (s Alarm) FindAlarmSeqLast(neType, neId string) int64 { - return s.alarmRepository.SelectAlarmSeqLast(neType, neId) +func (s Alarm) FindAlarmSeqLast(coreUid, neUid string) int64 { + return s.alarmRepository.SelectAlarmSeqLast(coreUid, neUid) } // AlarmClearByIds 批量清除告警信息 @@ -193,8 +193,8 @@ func (r Alarm) ExportXlsx(rows []model.Alarm, fileName, language, alarmStatus st "E" + idx: row.AlarmId, "F" + idx: row.AlarmCode, "G" + idx: row.NeType, - "H" + idx: row.NeName, - "I" + idx: row.NeId, + "H" + idx: row.NeUID, + "I" + idx: row.CoreUID, } if alarmStatus == "0" { clearTimeStr := date.ParseDateToStr(row.ClearTime, date.YYYY_MM_DDTHH_MM_SSZ) diff --git a/src/modules/network_data/service/alarm_event.go b/src/modules/network_data/service/alarm_event.go index e3413d81..a4d1976a 100644 --- a/src/modules/network_data/service/alarm_event.go +++ b/src/modules/network_data/service/alarm_event.go @@ -54,6 +54,6 @@ func (r AlarmEvent) DeleteByIds(ids []int64) (int64, error) { } // FindAlarmEventSeqLast 查询网元告警最后一条序号 -func (s AlarmEvent) FindAlarmEventSeqLast(neType, neId string) int64 { - return s.AlarmEventRepository.SelectAlarmEventSeqLast(neType, neId) +func (s AlarmEvent) FindAlarmEventSeqLast(coreUid string, neUid string) int64 { + return s.AlarmEventRepository.SelectAlarmEventSeqLast(coreUid, neUid) } diff --git a/src/modules/network_data/service/cdr_event_ims.go b/src/modules/network_data/service/cdr_event_ims.go index 30ad78a8..45f33cc1 100644 --- a/src/modules/network_data/service/cdr_event_ims.go +++ b/src/modules/network_data/service/cdr_event_ims.go @@ -155,7 +155,7 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, - "B" + idx: row.NeName, + "B" + idx: row.NeUID, "C" + idx: recordType, "D" + idx: callTypeLable, "E" + idx: caller, diff --git a/src/modules/network_data/service/cdr_event_sgwc.go b/src/modules/network_data/service/cdr_event_sgwc.go index ca6ede41..65ae22d9 100644 --- a/src/modules/network_data/service/cdr_event_sgwc.go +++ b/src/modules/network_data/service/cdr_event_sgwc.go @@ -205,8 +205,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, - "B" + idx: row.NeName, - "C" + idx: row.RmUid, + "B" + idx: row.NeType, + "C" + idx: row.NeUID, "D" + idx: chargingID, "E" + idx: servedIMSI, "F" + idx: servedMSISDN, diff --git a/src/modules/network_data/service/cdr_event_smf.go b/src/modules/network_data/service/cdr_event_smf.go index cb5bc7fb..7b32fbb4 100644 --- a/src/modules/network_data/service/cdr_event_smf.go +++ b/src/modules/network_data/service/cdr_event_smf.go @@ -202,8 +202,8 @@ func (r CDREventSMF) ExportXlsx(rows []model.CDREventSMF, fileName string) (stri dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, "B" + idx: chargingID, - "C" + idx: row.NeName, - "D" + idx: row.RmUid, + "C" + idx: row.NeType, + "D" + idx: row.NeUID, "E" + idx: subscriptionIDData, "F" + idx: subscriptionIDType, "G" + idx: dataVolumeUplink, diff --git a/src/modules/network_data/service/cdr_event_smsc.go b/src/modules/network_data/service/cdr_event_smsc.go index 99006c31..b1217f9f 100644 --- a/src/modules/network_data/service/cdr_event_smsc.go +++ b/src/modules/network_data/service/cdr_event_smsc.go @@ -122,7 +122,7 @@ func (r CDREventSMSC) ExportXlsx(rows []model.CDREventSMSC, fileName, language s dataCells = append(dataCells, map[string]any{ "A" + idx: row.ID, - "B" + idx: row.NeName, + "B" + idx: row.NeUID, "C" + idx: recordType, "D" + idx: serviceType, "E" + idx: caller, diff --git a/src/modules/network_data/service/kpi_c_report.go b/src/modules/network_data/service/kpi_c_report.go index 1c70a507..17e15440 100644 --- a/src/modules/network_data/service/kpi_c_report.go +++ b/src/modules/network_data/service/kpi_c_report.go @@ -42,8 +42,8 @@ func (s KpiCReport) FindData(query model.KPIQuery) []map[string]any { item := map[string]any{ "neType": row.NeType, - "neName": row.NeName, - "rmUID": row.RmUid, + "neUid": row.NeUID, + "coreUid": row.CoreUID, "startIndex": row.Index, "timeGroup": row.CreatedAt, } diff --git a/src/modules/network_data/service/kpi_report.go b/src/modules/network_data/service/kpi_report.go index 6dea301f..fdbaeed8 100644 --- a/src/modules/network_data/service/kpi_report.go +++ b/src/modules/network_data/service/kpi_report.go @@ -46,8 +46,8 @@ func (s KpiReport) FindData(query model.KPIQuery) []map[string]any { item := map[string]any{ "neType": row.NeType, - "neName": row.NeName, - "rmUID": row.RmUid, + "neUid": row.NeUID, + "coreUid": row.CoreUID, "startIndex": row.Index, "timeGroup": row.CreatedAt, } @@ -144,7 +144,7 @@ func (r KpiReport) FindTitle(neType string) []model.KpiTitle { // UPFTodayFlowFind 查询UPF总流量 N3上行 N6下行 // day 统计天数 // down * 8 / 1000 / 1000 单位M -func (r KpiReport) UPFTodayFlowFind(rmUID string, day int) (int64, int64) { +func (r KpiReport) UPFTodayFlowFind(neUid string, day int) (int64, int64) { // 获取当前日期 now := time.Now() var upTotal, downTotal int64 @@ -152,7 +152,7 @@ func (r KpiReport) UPFTodayFlowFind(rmUID string, day int) (int64, int64) { // 查询最近day天的数据 for i := 0; i <= day; i++ { dateKey := now.AddDate(0, 0, -i).Format("2006-01-02") - key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, rmUID, dateKey) + key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, neUid, dateKey) // 读取缓存数据 up, err := redis.GetHash("", key, "up") @@ -172,10 +172,10 @@ func (r KpiReport) UPFTodayFlowFind(rmUID string, day int) (int64, int64) { } // UPFTodayFlow UPF流量今日统计 -func (r KpiReport) UPFTodayFlowUpdate(rmUID string, upValue, downValue int64) error { +func (r KpiReport) UPFTodayFlowUpdate(neUid string, upValue, downValue int64) error { // 按日期存储统计数据 dateKey := time.Now().Format("2006-01-02") - key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, rmUID, dateKey) + key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, neUid, dateKey) // 使用HIncrBy实时累加统计值 if err := redis.IncrBy("", key, "up", upValue); err != nil { @@ -202,16 +202,16 @@ func (r KpiReport) UPFTodayFlowLoad(day int) { if len(jsonStr) > 7 { json.Unmarshal([]byte(jsonStr), &v) } - if v.NeType == "UPF" && v.RmUID != "" { + if v.NeType == "UPF" && v.NeUID != "" { // 查询最近day天的数据 for i := 0; i <= day; i++ { dateKey := now.AddDate(0, 0, -i).Format("2006-01-02") - key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, v.RmUID, dateKey) + key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, v.NeUID, dateKey) // 根据传入天数计算时间范围 beginTime := now.AddDate(0, 0, -i).Truncate(24 * time.Hour).UnixMilli() endTime := beginTime + 24*60*60*1000 - 1 // 查询历史数据 - rows := r.kpiReportRepository.SelectUPF(v.RmUID, beginTime, endTime) + rows := r.kpiReportRepository.SelectUPF(v.CoreUID, v.NeUID, beginTime, endTime) var upTotal, downTotal int64 // 处理历史数据 diff --git a/src/modules/network_data/service/udm_auth.go b/src/modules/network_data/service/udm_auth.go index 73e94c7d..05a93690 100644 --- a/src/modules/network_data/service/udm_auth.go +++ b/src/modules/network_data/service/udm_auth.go @@ -23,13 +23,13 @@ type UDMAuthUser struct { } // dataByRedis UDM鉴权用户 db:0 中 ausf:* -func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser { +func (r *UDMAuthUser) dataByRedis(coreUid, neUid, imsi string) []model.UDMAuthUser { arr := []model.UDMAuthUser{} key := fmt.Sprintf("ausf:%s", imsi) - source := fmt.Sprintf("UDM_%s", neId) + source := fmt.Sprintf("UDM_%s", neUid) // 网元主机的Redis客户端 - redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId) + redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid) if err != nil { return arr } @@ -64,12 +64,14 @@ func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser { amf = strings.Replace(v, "\r\n", "", 1) } a := model.UDMAuthUser{ + CoreUID: coreUid, + NeUID: neUid, + NeType: "UDM", IMSI: imsi, Amf: amf, Ki: m["ki"], AlgoIndex: m["algo"], Opc: m["opc"], - NeId: neId, } arr = append(arr, a) } @@ -77,20 +79,20 @@ func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser { } // ResetData 重置鉴权用户数据，清空数据库重新同步Redis数据 -func (r *UDMAuthUser) ResetData(neId string) int64 { - authArr := r.dataByRedis("*", neId) +func (r *UDMAuthUser) ResetData(coreUid, neUid string) int64 { + authArr := r.dataByRedis(coreUid, neUid, "*") // 数据清空后添加 - go r.udmAuthRepository.ClearAndInsert(neId, authArr) + go r.udmAuthRepository.ClearAndInsert(coreUid, neUid, authArr) return int64(len(authArr)) } // ParseInfo 解析单个用户imsi鉴权信息 data从命令MML得到的结果 -func (r *UDMAuthUser) ParseInfo(imsi, neId string, data map[string]string) model.UDMAuthUser { - u := r.udmAuthRepository.SelectByIMSIAndNeID(imsi, neId) - +func (r *UDMAuthUser) ParseInfo(coreUid, neUid, imsi string, data map[string]string) model.UDMAuthUser { + u := r.udmAuthRepository.SelectByIMSI(coreUid, neUid, imsi) + u.CoreUID = coreUid + u.NeUID = neUid + u.NeType = "UDM" // 用于更新 - u.IMSI = imsi - u.NeId = neId u.Amf = data["amf"] u.Ki = data["ki"] u.AlgoIndex = data["algo"] @@ -110,17 +112,17 @@ func (r *UDMAuthUser) Find(u model.UDMAuthUser) []model.UDMAuthUser { // Insert 从数据中读取后删除imsi再存入数据库 // imsi长度15，ki长度32，opc长度0或者32 -func (r *UDMAuthUser) Insert(neId string, u model.UDMAuthUser) int64 { - uArr := r.dataByRedis(u.IMSI, neId) +func (r *UDMAuthUser) Insert(coreUid, neUid string, u model.UDMAuthUser) int64 { + uArr := r.dataByRedis(coreUid, neUid, u.IMSI) if len(uArr) > 0 { - r.udmAuthRepository.Delete(u.IMSI, neId) + r.udmAuthRepository.DeleteByIMSI(coreUid, neUid, u.IMSI) return r.udmAuthRepository.Inserts(uArr) } return 0 } // InsertData 导入文件数据 dataType目前两种：txt/csv -func (r *UDMAuthUser) InsertData(neId, dataType string, data any) int64 { +func (r *UDMAuthUser) InsertData(coreUid, neUid, dataType string, data any) int64 { // imsi截取前缀,重新获取部分数据 prefixes := make(map[string]struct{}) @@ -149,9 +151,9 @@ func (r *UDMAuthUser) InsertData(neId, dataType string, data any) int64 { var num int64 = 0 for prefix := range prefixes { // 直接删除前缀的记录 - r.udmAuthRepository.DeletePrefixByIMSI(prefix, neId) + r.udmAuthRepository.DeletePrefixByIMSI(coreUid, neUid, prefix) // keys ausf:4600001000004* - arr := r.dataByRedis(prefix+"*", neId) + arr := r.dataByRedis(coreUid, neUid, prefix+"*") if len(arr) > 0 { num += r.udmAuthRepository.Inserts(arr) } @@ -160,21 +162,20 @@ func (r *UDMAuthUser) InsertData(neId, dataType string, data any) int64 { } // Delete 删除单个不重新加载 -func (r *UDMAuthUser) Delete(imsi, neId string) int64 { - return r.udmAuthRepository.Delete(imsi, neId) +func (r *UDMAuthUser) Delete(coreUid, neUid, imsi string) int64 { + return r.udmAuthRepository.DeleteByIMSI(coreUid, neUid, imsi) } // LoadData 重新加载从imsi开始num的数据 -func (r *UDMAuthUser) LoadData(neId, imsi, num string) { +func (r *UDMAuthUser) LoadData(coreUid, neUid, imsi string, num int64) { startIMSI, _ := strconv.ParseInt(imsi, 10, 64) - subNum, _ := strconv.ParseInt(num, 10, 64) var i int64 - for i = 0; i < subNum; i++ { + for i = 0; i < num; i++ { keyIMSI := fmt.Sprintf("%015d", startIMSI+i) // 删除原数据 - r.udmAuthRepository.Delete(keyIMSI, neId) + r.udmAuthRepository.DeleteByIMSI(coreUid, neUid, keyIMSI) // 加载数据 - arr := r.dataByRedis(keyIMSI, neId) + arr := r.dataByRedis(coreUid, neUid, keyIMSI) if len(arr) < 1 { continue } diff --git a/src/modules/network_data/service/udm_extend.go b/src/modules/network_data/service/udm_extend.go index 07068279..f2ba1975 100644 --- a/src/modules/network_data/service/udm_extend.go +++ b/src/modules/network_data/service/udm_extend.go @@ -17,17 +17,17 @@ type UDMExtend struct { } // FindByIMSIAndNeID 通过IMSI和网元标识查询信息 neId为%时模糊imsi查询 -func (r UDMExtend) FindByIMSIAndNeID(imsi, neId string) model.UDMExtend { - return r.UDMExtendRepository.SelectByIMSIAndNeID(imsi, neId) +func (r UDMExtend) FindByIMSIAndNeID(coreUid, neUid, imsi string) model.UDMExtend { + return r.UDMExtendRepository.SelectByIMSI(coreUid, neUid, imsi) } // Save 新增或修改信息 func (r UDMExtend) Save(u model.UDMExtend) bool { - r.UDMExtendRepository.Delete(u.IMSI, u.NeId) + r.UDMExtendRepository.DeleteByIMSI(u.CoreUID, u.NeUID, u.IMSI) return r.UDMExtendRepository.Inserts([]model.UDMExtend{u}) > 0 } // Delete 删除信息 neId为%时模糊imsi查询 -func (r UDMExtend) Delete(imsi, neId string) int64 { - return r.UDMExtendRepository.Delete(imsi, neId) +func (r UDMExtend) Delete(coreUid, neUid, imsi string) int64 { + return r.UDMExtendRepository.DeleteByIMSI(coreUid, neUid, imsi) } diff --git a/src/modules/network_data/service/udm_sub.go b/src/modules/network_data/service/udm_sub.go index 8da74756..2846f87b 100644 --- a/src/modules/network_data/service/udm_sub.go +++ b/src/modules/network_data/service/udm_sub.go @@ -24,13 +24,13 @@ type UDMSubUser struct { } // dataByRedis UDM签约用户 db:0 中 udm-sd:* -func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser { +func (r *UDMSubUser) dataByRedis(coreUid, neUid, imsi string) []model.UDMSubUser { arr := []model.UDMSubUser{} key := fmt.Sprintf("udm-sd:%s", imsi) - source := fmt.Sprintf("UDM_%s", neId) + source := fmt.Sprintf("UDM_%s", neUid) // 网元主机的Redis客户端 - redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId) + redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid) if err != nil { return arr } @@ -61,12 +61,14 @@ func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser { } a := model.UDMSubUser{ - IMSI: imsi, // udm-sd:360000100000130 - MSISDN: m["gpsi"], // 8612300000130 - NeId: neId, - SmfSel: m["smf-sel"], // def_snssai - SmData: m["sm-dat"], // 1-000001&cmnet&ims&3gnet - Cag: m["cag"], // def_cag + CoreUID: coreUid, + NeUID: neUid, + NeType: "UDM", + IMSI: imsi, // udm-sd:360000100000130 + MSISDN: m["gpsi"], // 8612300000130 + SmfSel: m["smf-sel"], // def_snssai + SmData: m["sm-dat"], // 1-000001&cmnet&ims&3gnet + Cag: m["cag"], // def_cag } // def_ambr,def_nssai,0,def_arfb,def_sar,3,1,12000,1,1000,0,1,- @@ -123,16 +125,16 @@ func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser { } // ResetData 重置鉴权用户数据，清空数据库重新同步Redis数据 -func (r *UDMSubUser) ResetData(neId string) int64 { - subArr := r.dataByRedis("*", neId) +func (r *UDMSubUser) ResetData(coreUid, neUid string) int64 { + subArr := r.dataByRedis(coreUid, neUid, "*") // 数据清空后添加 - go r.udmSubRepository.ClearAndInsert(neId, subArr) + go r.udmSubRepository.ClearAndInsert(coreUid, neUid, subArr) return int64(len(subArr)) } // ParseInfo 解析单个用户imsi签约信息 data从命令MML得到的结果 -func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.UDMSubUser { - u := r.udmSubRepository.SelectByIMSIAndNeID(imsi, neId) +func (r *UDMSubUser) ParseInfo(coreUid, neUid, imsi string, data map[string]string) model.UDMSubUser { + u := r.udmSubRepository.SelectByIMSI(coreUid, neUid, imsi) cnType, _ := strconv.ParseInt(data["CNType"][:4], 0, 64) // 0x03(EPC|5GC) rat, _ := strconv.ParseInt(data["RAT"][:4], 0, 64) // 0x00(VIRTUAL|WLAN|EUTRA|NR) @@ -142,9 +144,11 @@ func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model. } // 用于更新 + u.CoreUID = coreUid + u.NeUID = neUid + u.NeType = "UDM" u.IMSI = imsi u.MSISDN = msisdn - u.NeId = neId u.UeAmbrTpl = data["AMBR"] u.NssaiTpl = data["NSSAI"] u.AreaForbiddenTpl = data["AreaForbidden"] @@ -172,7 +176,7 @@ func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model. } // 补充用户拓展信息 - info := r.UDMExtendRepository.SelectByIMSIAndNeID(imsi, neId) + info := r.UDMExtendRepository.SelectByIMSI(coreUid, neUid, imsi) if info.IMSI == imsi { u.Remark = info.Remark } @@ -191,18 +195,20 @@ func (r *UDMSubUser) Find(u model.UDMSubUser) []model.UDMSubUser { // Insert 从数据中读取后删除imsi再存入数据库 // imsi长度15，ki长度32，opc长度0或者32 -func (r *UDMSubUser) Insert(neId string, u model.UDMSubUser) int64 { - uArr := r.dataByRedis(u.IMSI, neId) +func (r *UDMSubUser) Insert(coreUid, neUid string, u model.UDMSubUser) int64 { + uArr := r.dataByRedis(coreUid, neUid, u.IMSI) if len(uArr) > 0 { - r.udmSubRepository.Delete(u.IMSI, neId) + r.udmSubRepository.DeleteByIMSI(coreUid, neUid, u.IMSI) // 新增到拓展信息 if u.Remark != "" { - r.UDMExtendRepository.Delete(u.IMSI, "%") + r.UDMExtendRepository.DeleteByIMSI(coreUid, "%", u.IMSI) r.UDMExtendRepository.Inserts([]model.UDMExtend{{ - IMSI: u.IMSI, - MSISDN: u.MSISDN, - NeId: u.NeId, - Remark: u.Remark, + CoreUID: u.CoreUID, + NeUID: u.NeUID, + NeType: u.NeType, + IMSI: u.IMSI, + MSISDN: u.MSISDN, + Remark: u.Remark, }}) } return r.udmSubRepository.Inserts(uArr) @@ -211,7 +217,7 @@ func (r *UDMSubUser) Insert(neId string, u model.UDMSubUser) int64 { } // InsertData 导入文件数据 dataType目前两种：txt/csv -func (r *UDMSubUser) InsertData(neId, dataType string, data any) int64 { +func (r *UDMSubUser) InsertData(coreUid, neUid, dataType string, data any) int64 { // imsi截取前缀,重新获取部分数据 prefixes := make(map[string]struct{}) @@ -240,9 +246,9 @@ func (r *UDMSubUser) InsertData(neId, dataType string, data any) int64 { var num int64 = 0 for prefix := range prefixes { // keys udm-sd:4600001000004* - arr := r.dataByRedis(prefix+"*", neId) + arr := r.dataByRedis(coreUid, neUid, prefix+"*") if len(arr) > 0 { - r.udmSubRepository.DeletePrefixByIMSI(prefix, neId) + r.udmSubRepository.DeletePrefixByIMSI(coreUid, neUid, prefix) num += r.udmSubRepository.Inserts(arr) } } @@ -250,27 +256,26 @@ func (r *UDMSubUser) InsertData(neId, dataType string, data any) int64 { } // Delete 删除单个不重新加载 -func (r *UDMSubUser) Delete(neId, imsi string) int64 { +func (r *UDMSubUser) Delete(coreUid, neUid, imsi string) int64 { // 删除拓展信息 - r.UDMExtendRepository.Delete(imsi, neId) - return r.udmSubRepository.Delete(imsi, neId) + r.UDMExtendRepository.DeleteByIMSI(coreUid, neUid, imsi) + return r.udmSubRepository.DeleteByIMSI(coreUid, neUid, imsi) } // LoadData 重新加载从imsi开始num的数据 // remark不为空，则新增到拓展信息，删除标记为-(Deleted)- -func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) { +func (r *UDMSubUser) LoadData(coreUid, neUid, imsi string, num int64, remark string) { startIMSI, _ := strconv.ParseInt(imsi, 10, 64) - subNum, _ := strconv.ParseInt(num, 10, 64) var i int64 - for i = 0; i < subNum; i++ { + for i = 0; i < num; i++ { keyIMSI := fmt.Sprintf("%015d", startIMSI+i) // 删除原数据 - r.udmSubRepository.Delete(keyIMSI, neId) + r.udmSubRepository.DeleteByIMSI(coreUid, neUid, keyIMSI) if remark == "-(Deleted)-" { - r.UDMExtendRepository.Delete(keyIMSI, "%") + r.UDMExtendRepository.DeleteByIMSI(coreUid, "%", keyIMSI) } // 加载数据，删除标记为-(Deleted)-加载为空不插入 - arr := r.dataByRedis(keyIMSI, neId) + arr := r.dataByRedis(coreUid, neUid, keyIMSI) if len(arr) < 1 { continue } @@ -280,13 +285,15 @@ func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) { uarr := make([]model.UDMExtend, 0, len(arr)) for _, v := range arr { uarr = append(uarr, model.UDMExtend{ - IMSI: v.IMSI, - MSISDN: v.MSISDN, - NeId: v.NeId, - Remark: remark, + CoreUID: v.CoreUID, + NeUID: v.NeUID, + NeType: v.NeType, + IMSI: v.IMSI, + MSISDN: v.MSISDN, + Remark: remark, }) } - r.UDMExtendRepository.Delete(keyIMSI, neId) + r.UDMExtendRepository.DeleteByIMSI(coreUid, neUid, keyIMSI) r.UDMExtendRepository.Inserts(uarr) } } diff --git a/src/modules/network_data/service/udm_voip.go b/src/modules/network_data/service/udm_voip.go index 10c95d92..a1b1f986 100644 --- a/src/modules/network_data/service/udm_voip.go +++ b/src/modules/network_data/service/udm_voip.go @@ -23,13 +23,13 @@ type UDMVOIPUser struct { } // dataByRedis UDMVOIP用户 db:0 中 voip:* -func (r UDMVOIPUser) dataByRedis(username, neId string) []model.UDMVOIPUser { +func (r UDMVOIPUser) dataByRedis(coreUid, neUid, username string) []model.UDMVOIPUser { arr := []model.UDMVOIPUser{} key := fmt.Sprintf("voip:%s", username) - source := fmt.Sprintf("UDM_%s", neId) + source := fmt.Sprintf("UDM_%s", neUid) // 网元主机的Redis客户端 - redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId) + redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid) if err != nil { return arr } @@ -56,7 +56,9 @@ func (r UDMVOIPUser) dataByRedis(username, neId string) []model.UDMVOIPUser { } a := model.UDMVOIPUser{ - NeId: neId, + CoreUID: coreUid, + NeUID: neUid, + NeType: "UDM", UserName: username, Password: m["password"], } @@ -66,22 +68,24 @@ func (r UDMVOIPUser) dataByRedis(username, neId string) []model.UDMVOIPUser { } // ResetData 重置VOIP用户数据，清空数据库重新同步Redis数据 -func (r UDMVOIPUser) ResetData(neId string) int64 { - arr := r.dataByRedis("*", neId) +func (r UDMVOIPUser) ResetData(coreUid, neUid string) int64 { + arr := r.dataByRedis(coreUid, neUid, "*") // 数据清空后添加 - go r.udmVOIPRepository.ClearAndInsert(neId, arr) + go r.udmVOIPRepository.ClearAndInsert(coreUid, neUid, arr) return int64(len(arr)) } // ParseInfo 解析单个用户userName信息 data从命令MML得到的结果 -func (r UDMVOIPUser) ParseInfo(neId string, data map[string]string) model.UDMVOIPUser { +func (r UDMVOIPUser) ParseInfo(coreUid, neUid string, data map[string]string) model.UDMVOIPUser { u := model.UDMVOIPUser{ - NeId: neId, + CoreUID: coreUid, + NeUID: neUid, + NeType: "UDM", UserName: data["username"], Password: data["password"], } // 赋予ID - item := r.udmVOIPRepository.SelectByUserNameAndNeID(u.UserName, neId) + item := r.udmVOIPRepository.SelectByUserName(coreUid, neUid, u.UserName) if item.ID != "" { u.ID = item.ID } @@ -99,17 +103,17 @@ func (r UDMVOIPUser) Find(u model.UDMVOIPUser) []model.UDMVOIPUser { } // Insert 从数据中读取后删除username再存入数据库 -func (r UDMVOIPUser) Insert(neId string, username string) int64 { - uArr := r.dataByRedis(username, neId) +func (r UDMVOIPUser) Insert(coreUid, neUid string, username string) int64 { + uArr := r.dataByRedis(coreUid, neUid, username) if len(uArr) > 0 { - r.udmVOIPRepository.Delete(username, neId) + r.udmVOIPRepository.DeleteByUserName(coreUid, neUid, username) return r.udmVOIPRepository.Inserts(uArr) } return 0 } // InsertData 导入文件数据 dataType目前两种：txt/csv -func (r UDMVOIPUser) InsertData(neId, dataType string, data any) int64 { +func (r UDMVOIPUser) InsertData(coreUid, neUid, dataType string, data any) int64 { // imsi截取前缀,重新获取部分数据 prefixes := make(map[string]struct{}) @@ -138,9 +142,9 @@ func (r UDMVOIPUser) InsertData(neId, dataType string, data any) int64 { var num int64 = 0 for prefix := range prefixes { // 直接删除前缀的记录 - r.udmVOIPRepository.DeletePrefixByUserName(prefix, neId) + r.udmVOIPRepository.DeletePrefixByUserName(coreUid, neUid, prefix) // keys voip:4600001000004* - arr := r.dataByRedis(prefix+"*", neId) + arr := r.dataByRedis(coreUid, neUid, prefix+"*") if len(arr) > 0 { num += r.udmVOIPRepository.Inserts(arr) } @@ -149,21 +153,20 @@ func (r UDMVOIPUser) InsertData(neId, dataType string, data any) int64 { } // Delete 删除单个不重新加载 -func (r UDMVOIPUser) Delete(username, neId string) int64 { - return r.udmVOIPRepository.Delete(username, neId) +func (r UDMVOIPUser) Delete(coreUid, neUid, username string) int64 { + return r.udmVOIPRepository.DeleteByUserName(coreUid, neUid, username) } // LoadData 重新加载从username开始num的数据 -func (r UDMVOIPUser) LoadData(neId, username, num string) { +func (r UDMVOIPUser) LoadData(coreUid, neUid, username string, num int64) { startUserName, _ := strconv.ParseInt(username, 10, 64) - subNum, _ := strconv.ParseInt(num, 10, 64) var i int64 - for i = 0; i < subNum; i++ { + for i = 0; i < num; i++ { keyUserName := fmt.Sprintf("%d", startUserName+i) // 删除原数据 - r.udmVOIPRepository.Delete(keyUserName, neId) + r.udmVOIPRepository.DeleteByUserName(coreUid, neUid, keyUserName) // 加载数据 - arr := r.dataByRedis(keyUserName, neId) + arr := r.dataByRedis(coreUid, neUid, keyUserName) if len(arr) < 1 { continue } diff --git a/src/modules/network_data/service/udm_volte_ims.go b/src/modules/network_data/service/udm_volte_ims.go index dbdb6146..79bc09f1 100644 --- a/src/modules/network_data/service/udm_volte_ims.go +++ b/src/modules/network_data/service/udm_volte_ims.go @@ -23,13 +23,13 @@ type UDMVolteIMSUser struct { } // dataByRedis UDMVolteIMS用户 db:0 中 volte:* -func (r UDMVolteIMSUser) dataByRedis(imsi, neId string) []model.UDMVolteIMSUser { +func (r UDMVolteIMSUser) dataByRedis(coreUid, neUid, imsi string) []model.UDMVolteIMSUser { arr := []model.UDMVolteIMSUser{} key := fmt.Sprintf("volte:%s", imsi) - source := fmt.Sprintf("UDM_%s", neId) + source := fmt.Sprintf("UDM_%s", neUid) // 网元主机的Redis客户端 - redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId) + redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid) if err != nil { return arr } @@ -63,11 +63,13 @@ func (r UDMVolteIMSUser) dataByRedis(imsi, neId string) []model.UDMVolteIMSUser } a := model.UDMVolteIMSUser{ - NeId: neId, - IMSI: keys[1], - MSISDN: keys[2], - Tag: m["tag"], // volte = tag - VNI: vni, + CoreUID: coreUid, + NeUID: neUid, + NeType: "UDM", + IMSI: keys[1], + MSISDN: keys[2], + Tag: m["tag"], // volte = tag + VNI: vni, } arr = append(arr, a) } @@ -75,15 +77,15 @@ func (r UDMVolteIMSUser) dataByRedis(imsi, neId string) []model.UDMVolteIMSUser } // ResetData 重置VolteIMS用户数据，清空数据库重新同步Redis数据 -func (r UDMVolteIMSUser) ResetData(neId string) int64 { - authArr := r.dataByRedis("*", neId) +func (r UDMVolteIMSUser) ResetData(coreUid, neUid string) int64 { + authArr := r.dataByRedis(coreUid, neUid, "*") // 数据清空后添加 - go r.udmVolteIMSRepository.ClearAndInsert(neId, authArr) + go r.udmVolteIMSRepository.ClearAndInsert(coreUid, neUid, authArr) return int64(len(authArr)) } // ParseInfo 解析单个用户imsi信息 data从命令MML得到的结果 -func (r UDMVolteIMSUser) ParseInfo(neId string, data map[string]string) model.UDMVolteIMSUser { +func (r UDMVolteIMSUser) ParseInfo(coreUid, neUid string, data map[string]string) model.UDMVolteIMSUser { // "110011200004217@ims.mnc001.mcc110.3gppnetwork.org" vni := "" impiParts := strings.Split(data["impi"], "@") @@ -95,14 +97,15 @@ func (r UDMVolteIMSUser) ParseInfo(neId string, data map[string]string) model.UD } u := model.UDMVolteIMSUser{ - NeId: neId, - IMSI: data["imsi"], - MSISDN: data["msisdn"], - Tag: data["volte_tag"], - VNI: vni, + CoreUID: coreUid, + NeUID: neUid, + IMSI: data["imsi"], + MSISDN: data["msisdn"], + Tag: data["volte_tag"], + VNI: vni, } // 赋予ID - item := r.udmVolteIMSRepository.SelectByIMSIAndMSISDNAndNeID(u.IMSI, u.MSISDN, neId) + item := r.udmVolteIMSRepository.SelectByIMSIAndMSISDN(coreUid, neUid, u.IMSI, u.MSISDN) if item.ID != "" { u.ID = item.ID } @@ -121,17 +124,17 @@ func (r UDMVolteIMSUser) Find(u model.UDMVolteIMSUser) []model.UDMVolteIMSUser { // InsertByIMSI 从数据中读取后删除imsi再存入数据库 // imsi长度15 -func (r UDMVolteIMSUser) InsertByIMSI(imsi, neId string) int64 { - uArr := r.dataByRedis(imsi+":*", neId) +func (r UDMVolteIMSUser) InsertByIMSI(coreUid, neUid, imsi string) int64 { + uArr := r.dataByRedis(coreUid, neUid, imsi+":*") if len(uArr) > 0 { - r.udmVolteIMSRepository.Delete(imsi, neId) + r.udmVolteIMSRepository.DeleteByIMSI(coreUid, neUid, imsi) return r.udmVolteIMSRepository.Inserts(uArr) } return 0 } // InsertData 导入文件数据 dataType目前两种：txt/csv -func (r UDMVolteIMSUser) InsertData(neId, dataType string, data any) int64 { +func (r UDMVolteIMSUser) InsertData(coreUid, neUid, dataType string, data any) int64 { // imsi截取前缀,重新获取部分数据 prefixes := make(map[string]struct{}) @@ -160,9 +163,9 @@ func (r UDMVolteIMSUser) InsertData(neId, dataType string, data any) int64 { var num int64 = 0 for prefix := range prefixes { // 直接删除前缀的记录 - r.udmVolteIMSRepository.DeletePrefixByIMSI(prefix, neId) + r.udmVolteIMSRepository.DeletePrefixByIMSI(coreUid, neUid, prefix) // keys voip:4600001000004* - arr := r.dataByRedis(prefix+"*", neId) + arr := r.dataByRedis(coreUid, neUid, prefix+"*") if len(arr) > 0 { num += r.udmVolteIMSRepository.Inserts(arr) } @@ -171,21 +174,20 @@ func (r UDMVolteIMSUser) InsertData(neId, dataType string, data any) int64 { } // Delete 删除单个不重新加载 -func (r UDMVolteIMSUser) Delete(imsi, neId string) int64 { - return r.udmVolteIMSRepository.Delete(imsi, neId) +func (r UDMVolteIMSUser) Delete(coreUid, neUid, imsi string) int64 { + return r.udmVolteIMSRepository.DeleteByIMSI(coreUid, neUid, imsi) } // LoadData 重新加载从imsi开始num的数据 -func (r UDMVolteIMSUser) LoadData(neId, imsiOrMsisdn, num string) { +func (r UDMVolteIMSUser) LoadData(coreUid, neUid, imsiOrMsisdn string, num int64) { startIMSIOrMsisdn, _ := strconv.ParseInt(imsiOrMsisdn, 10, 64) - subNum, _ := strconv.ParseInt(num, 10, 64) var i int64 - for i = 0; i < subNum; i++ { + for i = 0; i < num; i++ { keyIMSI := fmt.Sprintf("%d", startIMSIOrMsisdn+i) // 删除原数据 - r.udmVolteIMSRepository.Delete(keyIMSI, neId) + r.udmVolteIMSRepository.DeleteByIMSI(coreUid, neUid, keyIMSI) // 加载数据 - arr := r.dataByRedis(keyIMSI+":*", neId) + arr := r.dataByRedis(coreUid, neUid, keyIMSI+":*") if len(arr) < 1 { continue } diff --git a/src/modules/network_element/controller/action.go b/src/modules/network_element/controller/action.go index 524e6689..3516b5e3 100644 --- a/src/modules/network_element/controller/action.go +++ b/src/modules/network_element/controller/action.go @@ -47,8 +47,8 @@ type NeActionController struct { func (s *NeActionController) PushFile(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` - NeID string `json:"neId" binding:"required"` + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 UploadPath string `json:"uploadPath" binding:"required"` DelTemp bool `json:"delTemp"` // 删除本地临时文件 } @@ -59,14 +59,14 @@ func (s *NeActionController) PushFile(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeID) - if neInfo.NeId != body.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -118,28 +118,28 @@ func (s *NeActionController) PushFile(c *gin.Context) { // @Router /ne/action/pullFile [get] func (s *NeActionController) PullFile(c *gin.Context) { language := reqctx.AcceptLanguage(c) - var querys struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 Path string `form:"path" binding:"required"` FileName string `form:"fileName" binding:"required"` DelTemp bool `form:"delTemp"` // 删除本地临时文件 } - if err := c.ShouldBindQuery(&querys); err != nil { + if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -153,8 +153,8 @@ func (s *NeActionController) PullFile(c *gin.Context) { } defer sftpClient.Close() - nePath := filepath.ToSlash(filepath.Join(querys.Path, querys.FileName)) - fileName := generate.Code(6) + "_" + querys.FileName + nePath := filepath.ToSlash(filepath.Join(query.Path, query.FileName)) + fileName := generate.Code(6) + "_" + query.FileName localFilePath := filepath.Join("/tmp/omc/pull", fileName) if runtime.GOOS == "windows" { localFilePath = fmt.Sprintf("C:%s", localFilePath) @@ -166,7 +166,7 @@ func (s *NeActionController) PullFile(c *gin.Context) { } defer func() { - if querys.DelTemp { + if query.DelTemp { _ = os.Remove(localFilePath) } }() @@ -192,8 +192,8 @@ func (s *NeActionController) PullFile(c *gin.Context) { func (s *NeActionController) PullDirZip(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 Path string `form:"path" binding:"required"` DelTemp bool `form:"delTemp"` // 删除本地临时文件 } @@ -204,14 +204,14 @@ func (s *NeActionController) PullDirZip(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID) + if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -239,7 +239,7 @@ func (s *NeActionController) PullDirZip(c *gin.Context) { } // 压缩zip文件名 - zipFileName := fmt.Sprintf("%s-%s-%s.zip", neInfo.NeType, neInfo.NeId, dirName) + zipFileName := fmt.Sprintf("%s-%s-%s.zip", neInfo.NeType, neInfo.NeUID, dirName) zipFilePath := filepath.Join(localFilePath, zipFileName) if err := file.CompressZipByDir(zipFilePath, localDirFilePath); err != nil { c.JSON(200, resp.ErrMsg(err.Error())) @@ -273,8 +273,8 @@ func (s *NeActionController) PullDirZip(c *gin.Context) { func (s *NeActionController) ViewFile(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 Path string `form:"path" binding:"required"` FileName string `form:"fileName" binding:"required"` } @@ -285,14 +285,14 @@ func (s *NeActionController) ViewFile(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID) + if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -332,8 +332,8 @@ func (s *NeActionController) ViewFile(c *gin.Context) { func (s *NeActionController) Files(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 Path string `form:"path" binding:"required"` PageNum int64 `form:"pageNum" binding:"required"` PageSize int64 `form:"pageSize" binding:"required"` @@ -346,14 +346,14 @@ func (s *NeActionController) Files(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID) + if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -407,9 +407,9 @@ func (s *NeActionController) Files(c *gin.Context) { func (s *NeActionController) Service(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` - NeID string `json:"neId" binding:"required"` - Action string `json:"action" binding:"required,oneof=start restart stop reboot poweroff"` // 操作行为 + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 + Action string `json:"action" binding:"required,oneof=start restart stop reboot poweroff"` // 操作行为 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -418,8 +418,8 @@ func (s *NeActionController) Service(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeID) - if neInfo.NeId != body.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -443,7 +443,7 @@ func (s *NeActionController) Service(c *gin.Context) { cmdStr = "sudo shutdown -h now" } - _, err := s.neInfoService.NeRunSSHCmd(body.NeType, body.NeID, cmdStr) + _, err := s.neInfoService.NeRunSSHCmd(neInfo.CoreUID, neInfo.NeUID, cmdStr) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return diff --git a/src/modules/network_element/controller/ne_config.go b/src/modules/network_element/controller/ne_config.go index 3fd08c2e..908bdc6a 100644 --- a/src/modules/network_element/controller/ne_config.go +++ b/src/modules/network_element/controller/ne_config.go @@ -198,8 +198,8 @@ func (s NeConfigController) ListByNeType(c *gin.Context) { func (s NeConfigController) DataInfo(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeType string `form:"neType" binding:"required"` // 网元类型 - NeId string `form:"neId" binding:"required"` // 网元ID + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 ParamName string `form:"paramName" binding:"required"` // 可用属性 } if err := c.ShouldBindQuery(&query); err != nil { @@ -208,13 +208,13 @@ func (s NeConfigController) DataInfo(c *gin.Context) { return } - neInfo := s.neInfoService.FindByNeTypeAndNeID(query.NeType, query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - if query.NeType == "OMC" { + if neInfo.NeType == "OMC" { if query.ParamName == "alarmEmailForward" || query.ParamName == "alarmSMSForward" { var o *cm_omc.ConfigOMC resData, err := o.Query(query.ParamName) @@ -256,8 +256,8 @@ func (s NeConfigController) DataInfo(c *gin.Context) { func (s NeConfigController) DataEdit(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` // 网元类型 - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 ParamName string `json:"paramName" binding:"required"` ParamData map[string]any `json:"paramData" binding:"required"` Loc string `json:"loc"` // 仅array使用与数据对象内index一致,有多层时划分嵌套层(index/subParamName/index) @@ -268,12 +268,12 @@ func (s NeConfigController) DataEdit(c *gin.Context) { return } - neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - if body.NeType == "OMC" { + if neInfo.NeType == "OMC" { if body.ParamName == "alarmEmailForward" || body.ParamName == "alarmSMSForward" { var o *cm_omc.ConfigOMC resData, err := o.Modify(body.ParamName, body.ParamData) @@ -322,8 +322,8 @@ func (s NeConfigController) DataEdit(c *gin.Context) { func (s NeConfigController) DataAdd(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` // 网元类型 - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 ParamName string `json:"paramName" binding:"required"` // 根据配置可选值 ParamData map[string]any `json:"paramData" binding:"required"` // 数据对象 Loc string `json:"loc" binding:"required"` // 与数据对象内index一致,有多层时划分嵌套层(index/subParamName/index) @@ -334,8 +334,14 @@ func (s NeConfigController) DataAdd(c *gin.Context) { return } + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { + c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) + return + } + // 检查是否array - info := s.neConfigService.FindByNeTypeAndParamName(body.NeType, body.ParamName) + info := s.neConfigService.FindByNeTypeAndParamName(neInfo.NeType, body.ParamName) if info.ParamType != "array" { c.JSON(200, resp.ErrMsg("this attribute does not support adding")) return @@ -347,12 +353,6 @@ func (s NeConfigController) DataAdd(c *gin.Context) { return } - neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) - return - } - // 网元直连 resData, err := neFetchlink.NeConfigAdd(neInfo, body.ParamName, body.Loc, body.ParamData) if err != nil { @@ -381,8 +381,8 @@ func (s NeConfigController) DataAdd(c *gin.Context) { func (s NeConfigController) DataRemove(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeType string `form:"neType" binding:"required"` // 网元类型 - NeId string `form:"neId" binding:"required"` // 网元ID + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 ParamName string `form:"paramName" binding:"required"` Loc string `form:"loc" binding:"required"` // 与数据对象内index一致,有多层时划分嵌套层(index/subParamName/index) } @@ -392,16 +392,16 @@ func (s NeConfigController) DataRemove(c *gin.Context) { return } - // 检查是否array - info := s.neConfigService.FindByNeTypeAndParamName(query.NeType, query.ParamName) - if info.ParamType != "array" { - c.JSON(200, resp.ErrMsg("this attribute does not support adding")) + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { + c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - neInfo := s.neInfoService.FindByNeTypeAndNeID(query.NeType, query.NeId) - if neInfo.NeId != query.NeId || neInfo.IP == "" { - c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) + // 检查是否array + info := s.neConfigService.FindByNeTypeAndParamName(neInfo.NeType, query.ParamName) + if info.ParamType != "array" { + c.JSON(200, resp.ErrMsg("this attribute does not support adding")) return } diff --git a/src/modules/network_element/controller/ne_config_backup.go b/src/modules/network_element/controller/ne_config_backup.go index dac18864..e04eba73 100644 --- a/src/modules/network_element/controller/ne_config_backup.go +++ b/src/modules/network_element/controller/ne_config_backup.go @@ -137,10 +137,10 @@ func (s NeConfigBackupController) Remove(c *gin.Context) { func (s NeConfigBackupController) Import(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` - NeId string `json:"neId" binding:"required"` - Type string `json:"type" binding:"required,oneof=backup upload"` // 导入类型 - Path string `json:"path" binding:"required"` // 文件路径 + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 + Type string `json:"type" binding:"required,oneof=backup upload"` // 导入类型 + Path string `json:"path" binding:"required"` // 文件路径 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -153,8 +153,8 @@ func (s NeConfigBackupController) Import(c *gin.Context) { } // 查网元 - neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -176,8 +176,8 @@ func (s NeConfigBackupController) Import(c *gin.Context) { func (s NeConfigBackupController) Export(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` - NeId string `json:"neId" binding:"required"` + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -185,8 +185,8 @@ func (s NeConfigBackupController) Export(c *gin.Context) { return } // 查网元 - neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeId) - if neInfo.NeId != body.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -198,8 +198,9 @@ func (s NeConfigBackupController) Export(c *gin.Context) { } // 新增备份记录 item := model.NeConfigBackup{ + CoreUID: neInfo.CoreUID, + NeUID: neInfo.NeUID, NeType: neInfo.NeType, - NeId: neInfo.NeId, Name: filepath.Base(zipFilePath), Path: zipFilePath, CreateBy: reqctx.LoginUserToUserName(c), diff --git a/src/modules/network_element/controller/ne_info.go b/src/modules/network_element/controller/ne_info.go index 0a221b81..4c377f53 100644 --- a/src/modules/network_element/controller/ne_info.go +++ b/src/modules/network_element/controller/ne_info.go @@ -52,22 +52,22 @@ var mutex sync.Mutex // @Router /ne/info/state [get] func (s NeInfoController) State(c *gin.Context) { language := reqctx.AcceptLanguage(c) - var querys struct { - NeType string `form:"neType" binding:"required"` - NeId string `form:"neId" binding:"required"` + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 } - if err := c.ShouldBindQuery(&querys); err != nil { + if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeId) - if neInfo.NeId != querys.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } - neKey := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId) + neKey := fmt.Sprintf("%s_%s", neInfo.CoreUID, neInfo.NeUID) // 网元直连 resData, err := neFetchlink.NeState(neInfo) @@ -79,11 +79,12 @@ func (s NeInfoController) State(c *gin.Context) { resDataCache.(map[string]any)["online"] = false } else { resDataCache = map[string]any{ - "online": false, - "neId": neInfo.NeId, - "neName": neInfo.NeName, - "neType": neInfo.NeType, - "neIP": neInfo.IP, + "online": false, + "coreUid": neInfo.CoreUID, + "neUid": neInfo.NeUID, + "neName": neInfo.NeName, + "neType": neInfo.NeType, + "neIP": neInfo.IPAddr, } } neStateCacheMap.Store(neKey, resDataCache) @@ -102,7 +103,7 @@ func (s NeInfoController) State(c *gin.Context) { // 网元neType和neID查询 // -// GET /byTypeAndID +// GET /core-ne-uid // // @Tags network_element/info // @Accept json @@ -113,21 +114,21 @@ func (s NeInfoController) State(c *gin.Context) { // @Security TokenAuth // @Summary Network element neType and neID queries // @Description Network element neType and neID queries -// @Router /ne/info/byTypeAndID [get] -func (s NeInfoController) NeTypeAndID(c *gin.Context) { +// @Router /ne/info/core-ne-uid [get] +func (s NeInfoController) CoreUidAndNeUid(c *gin.Context) { language := reqctx.AcceptLanguage(c) - var querys struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + var query struct { + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 } - if err := c.ShouldBindQuery(&querys); err != nil { + if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs)) return } - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID) + if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -136,7 +137,7 @@ func (s NeInfoController) NeTypeAndID(c *gin.Context) { // 网元信息列表全部无分页 // -// GET /listAll +// GET /list/all // // @Tags network_element/info // @Accept json @@ -149,12 +150,13 @@ func (s NeInfoController) NeTypeAndID(c *gin.Context) { // @Security TokenAuth // @Summary The list of network element information is all unpaginated // @Description The list of network element information is all unpaginated -// @Router /ne/info/listAll [get] +// @Router /ne/info/list/all [get] func (s NeInfoController) ListAll(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { + CoreUID string `form:"coreUid"` // 核心网唯一标识 + NeUID string `form:"neUid"` // 网元唯一标识 NeType string `form:"neType"` - NeId string `form:"neId"` BandStatus bool `form:"bandStatus"` BandHost bool `form:"bandHost"` } @@ -166,12 +168,15 @@ func (s NeInfoController) ListAll(c *gin.Context) { // 查询实体参数 ne := model.NeInfo{} + if querys.CoreUID != "" { + ne.CoreUID = querys.CoreUID + } + if querys.NeUID != "" { + ne.NeUID = querys.NeUID + } if querys.NeType != "" { ne.NeType = querys.NeType } - if querys.NeId != "" { - ne.NeId = querys.NeId - } neList := s.neInfoService.Find(ne, querys.BandStatus, querys.BandHost) if len(neList) == 0 { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) @@ -182,7 +187,7 @@ func (s NeInfoController) ListAll(c *gin.Context) { // 网元端Para5G配置文件读取 // -// GET /para5GFile +// GET /file/para5g func (s NeInfoController) Para5GFileRead(c *gin.Context) { data, err := s.neInfoService.NeConfPara5GRead() if err != nil { @@ -194,7 +199,7 @@ func (s NeInfoController) Para5GFileRead(c *gin.Context) { // 网元端Para5G配置文件写入 // -// PUT /para5GFile +// PUT /file/para5g func (s NeInfoController) Para5GFileWrite(c *gin.Context) { var body struct { Content map[string]any `json:"content" binding:"required"` // 内容 @@ -216,11 +221,11 @@ func (s NeInfoController) Para5GFileWrite(c *gin.Context) { // 网元端OAM配置文件读取 // -// GET /oamFile +// GET /file/oam func (s NeInfoController) OAMFileRead(c *gin.Context) { var querys struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 } if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -228,7 +233,7 @@ func (s NeInfoController) OAMFileRead(c *gin.Context) { return } - data, err := s.neInfoService.NeConfOAMReadSync(querys.NeType, querys.NeID) + data, err := s.neInfoService.NeConfOAMReadSync(querys.CoreUID, querys.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return @@ -238,12 +243,12 @@ func (s NeInfoController) OAMFileRead(c *gin.Context) { // 网元端OAM配置文件写入 // -// PUT /oamFile +// PUT /file/oam func (s NeInfoController) OAMFileWrite(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` - NeID string `json:"neId" binding:"required"` + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 Content map[string]any `json:"content" binding:"required"` // 内容 Sync bool `json:"sync"` // 同步到网元 } @@ -254,8 +259,8 @@ func (s NeInfoController) OAMFileWrite(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeID) - if neInfo.NeId != body.NeID || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } @@ -354,10 +359,10 @@ func (s NeInfoController) Add(c *gin.Context) { } // 检查属性值唯一 - uniqueInfo := s.neInfoService.CheckUniqueNeTypeAndNeId(body.NeType, body.NeId, 0) + uniqueInfo := s.neInfoService.CheckUniqueCoreIdAndNeType(body.CoreUID, body.NeUID, 0) if !uniqueInfo { // 网元信息操作【%s】失败，同类型下标识已存在 - msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeId}) + msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeUID}) c.JSON(200, resp.ErrMsg(msg)) return } @@ -381,14 +386,16 @@ func (s NeInfoController) Add(c *gin.Context) { loginUserName := reqctx.LoginUserToUserName(c) // 新增Version信息 neVersion := model.NeVersion{ + CoreUID: body.CoreUID, + NeUID: body.NeUID, NeType: body.NeType, - NeId: body.NeId, CreateBy: loginUserName, } // 新增License信息 neLicense := model.NeLicense{ + CoreUID: body.CoreUID, + NeUID: body.NeUID, NeType: body.NeType, - NeId: body.NeId, CreateBy: loginUserName, } @@ -450,10 +457,10 @@ func (s NeInfoController) Edit(c *gin.Context) { } // 检查属性值唯一 - uniqueInfo := s.neInfoService.CheckUniqueNeTypeAndNeId(body.NeType, body.NeId, body.ID) + uniqueInfo := s.neInfoService.CheckUniqueCoreIdAndNeType(body.CoreUID, body.NeUID, body.ID) if !uniqueInfo { // 网元信息操作【%s】失败，同类型下标识已存在 - msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeId}) + msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeUID}) c.JSON(200, resp.ErrMsg(msg)) return } @@ -490,8 +497,8 @@ func (s NeInfoController) Edit(c *gin.Context) { } loginUserName := reqctx.LoginUserToUserName(c) - neLicense := s.neLicenseService.FindByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) - neVersion := s.neVersionService.FindByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) + neLicense := s.neLicenseService.FindByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID) + neVersion := s.neVersionService.FindByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID) // 已有网元可获取的信息 if body.ServerState != nil { @@ -515,16 +522,14 @@ func (s NeInfoController) Edit(c *gin.Context) { } if neVersion.ID <= 0 { - if neVersion.NeType != body.NeType || neVersion.NeId != body.NeId { + if neVersion.NeType != body.NeType { neVersion.NeType = body.NeType - neVersion.NeId = body.NeId } s.neVersionService.Update(neVersion) } if neLicense.ID <= 0 { - if neLicense.NeType != body.NeType || neLicense.NeId != body.NeId { + if neLicense.NeType != body.NeType { neLicense.NeType = body.NeType - neLicense.NeId = body.NeId } s.neLicenseService.Update(neLicense) } diff --git a/src/modules/network_element/controller/ne_license.go b/src/modules/network_element/controller/ne_license.go index cf34f9b3..8a372076 100644 --- a/src/modules/network_element/controller/ne_license.go +++ b/src/modules/network_element/controller/ne_license.go @@ -98,8 +98,8 @@ func (s *NeLicenseController) Info(c *gin.Context) { func (s *NeLicenseController) NeTypeAndID(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeType string `form:"neType" binding:"required"` - NeId string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 } if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -107,8 +107,8 @@ func (s *NeLicenseController) NeTypeAndID(c *gin.Context) { return } - neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId) - if neLicense.NeId != querys.NeId { + neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID) + if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID { // 没有可访问网元授权激活数据！ c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData"))) return @@ -134,8 +134,8 @@ func (s *NeLicenseController) NeTypeAndID(c *gin.Context) { func (s *NeLicenseController) Code(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeType string `form:"neType" binding:"required"` - NeId string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 } if err := c.ShouldBindQuery(&querys); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -144,8 +144,8 @@ func (s *NeLicenseController) Code(c *gin.Context) { } // 检查是否存在授权记录 - neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId) - if neLicense.NeId != querys.NeId { + neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID) + if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID { // 没有可访问网元授权激活数据！ c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData"))) return @@ -192,8 +192,8 @@ func (s *NeLicenseController) Change(c *gin.Context) { } // 检查是否存在授权记录 - neLicense := s.neLicenseService.FindByNeTypeAndNeID(body.NeType, body.NeId) - if neLicense.NeId != body.NeId { + neLicense := s.neLicenseService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neLicense.CoreUID != body.CoreUID || neLicense.NeUID != body.NeUID { // 没有可访问网元授权激活数据！ c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData"))) return @@ -237,8 +237,8 @@ func (s *NeLicenseController) Change(c *gin.Context) { func (s *NeLicenseController) State(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeType string `form:"neType" binding:"required"` - NeId string `form:"neId" binding:"required"` + CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `form:"neUid" binding:"required"` // 网元唯一标识 } if err := c.ShouldBindQuery(&querys); err != nil { c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) @@ -246,16 +246,16 @@ func (s *NeLicenseController) State(c *gin.Context) { } // 检查是否存在授权记录 - neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId) - if neLicense.NeId != querys.NeId { + neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID) + if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID { // 没有可访问网元授权激活数据！ c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData"))) return } // 查询网元获取IP获取网元状态 - neInfo := s.neInfoService.FindByNeTypeAndNeID(neLicense.NeType, neLicense.NeId) - if neInfo.NeId != neLicense.NeId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(neLicense.CoreUID, neLicense.NeUID) + if neInfo.CoreUID != neLicense.CoreUID || neInfo.NeUID != neLicense.NeUID { c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } diff --git a/src/modules/network_element/controller/ne_version.go b/src/modules/network_element/controller/ne_version.go index 0ee0d1f3..b54c5d08 100644 --- a/src/modules/network_element/controller/ne_version.go +++ b/src/modules/network_element/controller/ne_version.go @@ -70,9 +70,9 @@ func (s *NeVersionController) Info(c *gin.Context) { func (s *NeVersionController) Operate(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { + CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" binding:"required"` // 网元唯一标识 Action string `json:"action" binding:"required,oneof=install upgrade rollback"` // 操作行为 - NeType string `json:"neType" gorm:"ne_type" binding:"required"` // 网元类型 - NeId string `json:"neId" gorm:"ne_id" binding:"required"` // 网元ID Preinput map[string]string `json:"preinput" ` // 预先输入参数 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { @@ -81,8 +81,8 @@ func (s *NeVersionController) Operate(c *gin.Context) { return } - neVersion := s.neVersionService.FindByNeTypeAndNeID(body.NeType, body.NeId) - if neVersion.NeId != body.NeId { + neVersion := s.neVersionService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID) + if neVersion.CoreUID != body.CoreUID || neVersion.NeUID != body.NeUID { // 没有可访问网元版本数据！ c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neVersion.noData"))) return diff --git a/src/modules/network_element/fetch_link/alarm.go b/src/modules/network_element/fetch_link/alarm.go index b6721597..e97d5c0b 100644 --- a/src/modules/network_element/fetch_link/alarm.go +++ b/src/modules/network_element/fetch_link/alarm.go @@ -13,7 +13,7 @@ import ( // AlarmHistory 告警历史记录 func AlarmHistory(neInfo model.NeInfo) ([]map[string]any, error) { // 网元参数配置信息 - neUrl := fmt.Sprintf("http://%s:%d/api/rest/faultManagement/v1/elementType/%s/objectType/alarms", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType)) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/faultManagement/v1/elementType/%s/objectType/alarms", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType)) resBytes, err := fetch.Get(neUrl, nil, 60_000) var resData []map[string]any if err != nil { diff --git a/src/modules/network_element/fetch_link/amf.go b/src/modules/network_element/fetch_link/amf.go index f1b2dfec..434f9aa2 100644 --- a/src/modules/network_element/fetch_link/amf.go +++ b/src/modules/network_element/fetch_link/amf.go @@ -16,7 +16,7 @@ import ( // // 返回结果 [] func AMFNbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbInfo", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbInfo", neInfo.IPAddr, neInfo.Port) // 查询参数拼接 query := []string{} if v, ok := data["id"]; ok && v != "" { @@ -59,7 +59,7 @@ func AMFNbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]an // // 返回结果 [] func AMFGnbStateList(neInfo model.NeInfo) ([]map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbState", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbState", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.Get(neUrl, nil, 60_000) if err != nil { errStr := err.Error() diff --git a/src/modules/network_element/fetch_link/hlr.go b/src/modules/network_element/fetch_link/hlr.go index 4d3cfe6d..59074d99 100644 --- a/src/modules/network_element/fetch_link/hlr.go +++ b/src/modules/network_element/fetch_link/hlr.go @@ -18,7 +18,7 @@ import ( // data参数 {traceID:"跟踪任务ID", imsi:"IMSI和MSISDN必填一个，都带的话以IMSI为准", msisdn:""} func HLRTraceStart(neInfo model.NeInfo, data map[string]any) (string, error) { // 网元参数配置新增（array） - neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/add-task", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/add-task", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.PostJSON(neUrl, data, nil) var resData map[string]string if err != nil { @@ -45,7 +45,7 @@ func HLRTraceStart(neInfo model.NeInfo, data map[string]any) (string, error) { // data参数 {traceIDArray: ["跟踪任务ID数组"]} func HLRTraceStop(neInfo model.NeInfo, data map[string]any) (string, error) { // 网元参数配置新增（array） - neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/delete-task", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/delete-task", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.PostJSON(neUrl, data, nil) var resData map[string]string if err != nil { diff --git a/src/modules/network_element/fetch_link/ims.go b/src/modules/network_element/fetch_link/ims.go index 015da592..2a32fd1f 100644 --- a/src/modules/network_element/fetch_link/ims.go +++ b/src/modules/network_element/fetch_link/ims.go @@ -15,7 +15,7 @@ import ( // // 返回结果 0 func IMSUeSessionNum(neInfo model.NeInfo) (int64, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueNum", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueNum", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.Get(neUrl, nil, 60_000) if err != nil { errStr := err.Error() @@ -47,7 +47,7 @@ func IMSUeSessionNum(neInfo model.NeInfo) (int64, error) { // // 返回结果 [] func IMSUeSessionList(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueInfo", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueInfo", neInfo.IPAddr, neInfo.Port) // 查询参数拼接 query := []string{} if v, ok := data["imsi"]; ok && v != "" { diff --git a/src/modules/network_element/fetch_link/mme.go b/src/modules/network_element/fetch_link/mme.go index 39bd1140..d9debe71 100644 --- a/src/modules/network_element/fetch_link/mme.go +++ b/src/modules/network_element/fetch_link/mme.go @@ -16,7 +16,7 @@ import ( // // 返回结果 [] func MMENbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbInfo", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbInfo", neInfo.IPAddr, neInfo.Port) // 查询参数拼接 query := []string{} if v, ok := data["id"]; ok && v != "" { @@ -59,7 +59,7 @@ func MMENbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]an // // 返回结果 [] func MMEEnbStateList(neInfo model.NeInfo) ([]map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbState", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbState", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.Get(neUrl, nil, 60_000) if err != nil { errStr := err.Error() diff --git a/src/modules/network_element/fetch_link/ne_config.go b/src/modules/network_element/fetch_link/ne_config.go index 6128411d..8ed3714c 100644 --- a/src/modules/network_element/fetch_link/ne_config.go +++ b/src/modules/network_element/fetch_link/ne_config.go @@ -13,14 +13,14 @@ import ( // NeConfigOMC 网元配置对端网管信息 func NeConfigOMC(neInfo model.NeInfo) (map[string]any, error) { // 网元配置对端网管信息 - neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType)) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType)) resBytes, err := fetch.PutJSON(neUrl, map[string]any{ - "neId": neInfo.NeId, + "neId": neInfo.ID, "neName": neInfo.NeName, "port": neInfo.Port, "province": neInfo.Province, "pvFlag": neInfo.PvFlag, - "rmUID": neInfo.RmUID, + "rmUID": neInfo.NeUID, "vendorName": neInfo.VendorName, "dn": neInfo.Dn, }, nil) @@ -53,7 +53,7 @@ func NeConfigOMC(neInfo model.NeInfo) (map[string]any, error) { // NeConfigInfo 网元配置信息 func NeConfigInfo(neInfo model.NeInfo, paramName string) (map[string]any, error) { // 网元参数配置信息 - neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName) resBytes, err := fetch.Get(neUrl, nil, 30_000) if err != nil { logger.Warnf("NeConfigInfo Get \"%s\"", neUrl) @@ -82,7 +82,7 @@ func NeConfigUpdate(neInfo model.NeInfo, paramName, loc string, data map[string] loc = fmt.Sprintf("?loc=%v", loc) } // 网元参数配置新增（array） - neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s%s", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s%s", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc) resBytes, err := fetch.PutJSON(neUrl, data, nil) var resData map[string]any if err != nil { @@ -112,7 +112,7 @@ func NeConfigUpdate(neInfo model.NeInfo, paramName, loc string, data map[string] // NeConfigAdd 网元配置新增 array func NeConfigAdd(neInfo model.NeInfo, paramName, loc string, data map[string]any) (map[string]any, error) { // 网元参数配置新增（array） - neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc) resBytes, err := fetch.PostJSON(neUrl, data, nil) var resData map[string]any if err != nil { @@ -142,7 +142,7 @@ func NeConfigAdd(neInfo model.NeInfo, paramName, loc string, data map[string]any // NeConfigDelete 网元配置删除 array func NeConfigDelete(neInfo model.NeInfo, paramName, loc string) (map[string]any, error) { // 网元参数配置删除（array） - neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc) resBytes, err := fetch.Delete(neUrl, nil) var resData map[string]any if err != nil { diff --git a/src/modules/network_element/fetch_link/ne_state.go b/src/modules/network_element/fetch_link/ne_state.go index 7cd50e6c..f92ba988 100644 --- a/src/modules/network_element/fetch_link/ne_state.go +++ b/src/modules/network_element/fetch_link/ne_state.go @@ -14,7 +14,7 @@ import ( // NeState 获取网元端服务状态 func NeState(neInfo model.NeInfo) (map[string]any, error) { // 网元状态 - neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType)) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType)) resBytes, err := fetch.Get(neUrl, nil, 1000) if err != nil { logger.Errorf("NeState %s", err.Error()) @@ -40,10 +40,11 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) { } return map[string]any{ + "coreUid": neInfo.CoreUID, + "neUid": neInfo.NeUID, "neType": neInfo.NeType, - "neId": neInfo.NeId, "neName": neInfo.NeName, - "neIP": neInfo.IP, + "neIP": neInfo.IPAddr, "refreshTime": time.Now().UnixMilli(), // 获取时间 "standby": resData["standby"], // 是否备用服务 "version": resData["version"], diff --git a/src/modules/network_element/fetch_link/ne_trace.go b/src/modules/network_element/fetch_link/ne_trace.go index fe708348..022b30c2 100644 --- a/src/modules/network_element/fetch_link/ne_trace.go +++ b/src/modules/network_element/fetch_link/ne_trace.go @@ -13,7 +13,7 @@ import ( // NeTraceAdd 网元跟踪任务新增 func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) { // 跟踪任务创建 - neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions", neInfo.IP, neInfo.Port, neInfo.NeType) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions", neInfo.IPAddr, neInfo.Port, neInfo.NeType) resBytes, err := fetch.PostJSON(neUrl, data, nil) var resData map[string]any if err != nil { @@ -41,7 +41,7 @@ func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) { // NeTraceDelete 网元跟踪任务删除 func NeTraceDelete(neInfo model.NeInfo, traceId string) (map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions?id=%s", neInfo.IP, neInfo.Port, neInfo.NeType, traceId) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions?id=%s", neInfo.IPAddr, neInfo.Port, neInfo.NeType, traceId) resBytes, err := fetch.Delete(neUrl, nil) var resData map[string]any if err != nil { diff --git a/src/modules/network_element/fetch_link/pcf.go b/src/modules/network_element/fetch_link/pcf.go index 924cedb9..32e6df39 100644 --- a/src/modules/network_element/fetch_link/pcf.go +++ b/src/modules/network_element/fetch_link/pcf.go @@ -12,7 +12,7 @@ import ( // PCFRuleInfo PCF策略配置查询信息 func PCFRuleInfo(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port) // 查询参数拼接 query := []string{} if v, ok := data["imsi"]; ok && v != "" { @@ -56,7 +56,7 @@ func PCFRuleInfo(neInfo model.NeInfo, data map[string]string) ([]map[string]any, // PCFRuleAdd PCF策略配置添加 func PCFRuleAdd(neInfo model.NeInfo, data any) error { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.PostJSON(neUrl, data, nil) if err != nil { errStr := err.Error() @@ -85,7 +85,7 @@ func PCFRuleAdd(neInfo model.NeInfo, data any) error { // PCFRuleAddBatch PCF策略配置批量添加 func PCFRuleAddBatch(neInfo model.NeInfo, data map[string]any, num int64) error { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IP, neInfo.Port, num) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IPAddr, neInfo.Port, num) resBytes, err := fetch.PostJSON(neUrl, data, nil) if err != nil { errStr := err.Error() @@ -114,7 +114,7 @@ func PCFRuleAddBatch(neInfo model.NeInfo, data map[string]any, num int64) error // PCFRuleUpdate PCF策略配置修改 func PCFRuleUpdate(neInfo model.NeInfo, data map[string]any) error { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.PutJSON(neUrl, data, nil) if err != nil { errStr := err.Error() @@ -139,7 +139,7 @@ func PCFRuleUpdate(neInfo model.NeInfo, data map[string]any) error { // PCFRuleUpdateBatch PCF策略配置批量修改 func PCFRuleUpdateBatch(neInfo model.NeInfo, data map[string]any, num int64) error { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IP, neInfo.Port, num) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IPAddr, neInfo.Port, num) resBytes, err := fetch.PutJSON(neUrl, data, nil) if err != nil { errStr := err.Error() @@ -164,7 +164,7 @@ func PCFRuleUpdateBatch(neInfo model.NeInfo, data map[string]any, num int64) err // PCFRuleDelete PCF策略配置删除 func PCFRuleDelete(neInfo model.NeInfo, imsi string) error { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo?imsi=%s", neInfo.IP, neInfo.Port, imsi) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo?imsi=%s", neInfo.IPAddr, neInfo.Port, imsi) resBytes, err := fetch.Delete(neUrl, nil) if err != nil { errStr := err.Error() @@ -193,7 +193,7 @@ func PCFRuleDelete(neInfo model.NeInfo, imsi string) error { // PCFRuleDeleteBatch PCF策略配置批量删除 func PCFRuleDeleteBatch(neInfo model.NeInfo, imsi string, num int64) error { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d?imsi=%s", neInfo.IP, neInfo.Port, num, imsi) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d?imsi=%s", neInfo.IPAddr, neInfo.Port, num, imsi) resBytes, err := fetch.Delete(neUrl, nil) if err != nil { errStr := err.Error() @@ -222,7 +222,7 @@ func PCFRuleDeleteBatch(neInfo model.NeInfo, imsi string, num int64) error { // PCFRuleExport PCF策略配置导出 func PCFRuleExport(neInfo model.NeInfo, data map[string]string) ([]byte, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/export", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/export", neInfo.IPAddr, neInfo.Port) // 查询参数拼接 query := []string{} if v, ok := data["fileType"]; ok && v != "" { @@ -243,7 +243,7 @@ func PCFRuleExport(neInfo model.NeInfo, data map[string]string) ([]byte, error) // PCFRuleImport PCF策略配置导入 func PCFRuleImport(neInfo model.NeInfo, data map[string]any) (string, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/import", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/import", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.PutJSON(neUrl, data, nil) var resData map[string]any if err != nil { diff --git a/src/modules/network_element/fetch_link/smf.go b/src/modules/network_element/fetch_link/smf.go index 41633cb5..bf2e7946 100644 --- a/src/modules/network_element/fetch_link/smf.go +++ b/src/modules/network_element/fetch_link/smf.go @@ -15,7 +15,7 @@ import ( // // 返回结果 0 func SMFSubNum(neInfo model.NeInfo) (int64, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueNum", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueNum", neInfo.IPAddr, neInfo.Port) resBytes, err := fetch.Get(neUrl, nil, 60_000) if err != nil { errStr := err.Error() @@ -47,7 +47,7 @@ func SMFSubNum(neInfo model.NeInfo) (int64, error) { // // 返回结果 {"rows":[],"total":0} func SMFSubInfoList(neInfo model.NeInfo, data map[string]string) (map[string]any, error) { - neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo", neInfo.IP, neInfo.Port) + neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port) // 查询参数拼接 query := []string{} if v, ok := data["imsi"]; ok && v != "" { diff --git a/src/modules/network_element/model/core_info.go b/src/modules/network_element/model/core_info.go new file mode 100644 index 00000000..8dc9fa21 --- /dev/null +++ b/src/modules/network_element/model/core_info.go @@ -0,0 +1,20 @@ +package model + +// CoreInfo 核心网_基础信息 core_info +type CoreInfo struct { + ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 核心网ID + CoreUID string `json:"coreUid" gorm:"column:core_uid"` // 核心网唯一标识 + CoreName string `json:"coreName" gorm:"column:core_name"` // 核心网名称 + CoreSN string `json:"coreSN" gorm:"column:core_sn"` // 核心网序列号 + OmcId string `json:"omcId" gorm:"column:omc_id"` // OMC安装生成的唯一编码 + Remark string `json:"remark" gorm:"column:remark"` // 备注 + CreateBy string `json:"createBy" gorm:"column:create_by"` // 创建者 + CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 + UpdateBy string `json:"updateBy" gorm:"column:update_by"` // 更新者 + UpdateTime int64 `json:"updateTime" gorm:"column:update_time"` // 更新时间 +} + +// TableName 表名称 +func (*CoreInfo) TableName() string { + return "core_info" +} diff --git a/src/modules/network_element/model/ne_config_backup.go b/src/modules/network_element/model/ne_config_backup.go index 978e06c3..e2d7864d 100644 --- a/src/modules/network_element/model/ne_config_backup.go +++ b/src/modules/network_element/model/ne_config_backup.go @@ -3,15 +3,16 @@ package model // NeConfigBackup 网元配置文件备份记录 ne_config_backup type NeConfigBackup struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` // 网元类型 - NeId string `json:"neId" gorm:"column:ne_id"` // 网元ID - Name string `json:"name" gorm:"column:name"` // 压缩包名称 - Path string `json:"path" gorm:"column:path"` // 压缩包位置 - Remark string `json:"remark" gorm:"column:remark"` // 备注 - CreateBy string `json:"createBy" gorm:"column:create_by"` // 创建者 - CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 - UpdateBy string `json:"updateBy" gorm:"column:update_by"` // 更新者 - UpdateTime int64 `json:"updateTime" gorm:"column:update_time"` // 更新时间 + CoreUID string `json:"coreUid" gorm:"column:core_uid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid" binding:"required"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type" binding:"required"` // 网元类型 + Name string `json:"name" gorm:"column:name"` // 压缩包名称 + Path string `json:"path" gorm:"column:path"` // 压缩包位置 + Remark string `json:"remark" gorm:"column:remark"` // 备注 + CreateBy string `json:"createBy" gorm:"column:create_by"` // 创建者 + CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 + UpdateBy string `json:"updateBy" gorm:"column:update_by"` // 更新者 + UpdateTime int64 `json:"updateTime" gorm:"column:update_time"` // 更新时间 // ====== 非数据库字段属性 ====== diff --git a/src/modules/network_element/model/ne_info.go b/src/modules/network_element/model/ne_info.go index d17862df..26e5ee67 100644 --- a/src/modules/network_element/model/ne_info.go +++ b/src/modules/network_element/model/ne_info.go @@ -2,18 +2,18 @@ package model // NeInfo 网元信息对象 ne_info type NeInfo struct { - ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` + ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 网元ID + CoreUID string `json:"coreUid" gorm:"column:core_uid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid" binding:"required"` // 网元唯一标识 NeType string `json:"neType" gorm:"column:ne_type" binding:"required"` // 网元类型 - NeId string `json:"neId" gorm:"column:ne_id" binding:"required"` // 网元ID - RmUID string `json:"rmUid" gorm:"column:rm_uid"` // 网元资源唯一标识 NeName string `json:"neName" gorm:"column:ne_name"` // 网元名称 - IP string `json:"ip" gorm:"column:ip" binding:"required"` // 网元服务IP + IPAddr string `json:"ipAddr" gorm:"column:ip_addr" binding:"required"` // 网元服务IP Port int64 `json:"port" gorm:"column:port" binding:"required,number,max=65535,min=1"` // 端口 PvFlag string `json:"pvFlag" gorm:"column:pv_flag" binding:"omitempty,oneof=PNF VNF"` // 网元虚拟化标识 物理PNF 虚拟VNF Province string `json:"province" gorm:"column:province"` // 省份地域 VendorName string `json:"vendorName" gorm:"column:vendor_name"` // 厂商名称 Dn string `json:"dn" gorm:"column:dn"` // 网络标识 - NeAddress string `json:"neAddress" gorm:"column:ne_address"` // MAC地址 + MacAddr string `json:"macAddr" gorm:"column:mac_addr"` // MAC地址 HostIDs string `json:"hostIds" gorm:"column:host_ids"` // 网元主机ID组 数据格式(ssh,telnet) UDM(ssh,telnet,redis) UPF(ssh,telnet,telnet) Status int64 `json:"status" gorm:"column:status"` // 网元状态 0离线 1在线 2配置待下发 3备用模式 Remark string `json:"remark" gorm:"column:remark"` // 备注 diff --git a/src/modules/network_element/model/ne_license.go b/src/modules/network_element/model/ne_license.go index 9731d8f0..39e01e10 100644 --- a/src/modules/network_element/model/ne_license.go +++ b/src/modules/network_element/model/ne_license.go @@ -3,11 +3,12 @@ package model // NeLicense 网元授权激活信息 ne_license type NeLicense struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` + CoreUID string `json:"coreUid" gorm:"column:core_uid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid" binding:"required"` // 网元唯一标识 NeType string `json:"neType" gorm:"column:ne_type" binding:"required"` // 网元类型 - NeId string `json:"neId" gorm:"column:ne_id" binding:"required"` // 网元ID ActivationRequestCode string `json:"activationRequestCode" gorm:"column:activation_request_code"` // 激活申请代码 LicensePath string `json:"licensePath" gorm:"column:license_path"` // 激活授权文件 - Capability int64 `json:"capability" gorm:"column:capability"` // 容量 + Capability int64 `json:"capability" gorm:"column:capability"` // 容量 仅AMF/MME/UDM限制 SerialNum string `json:"serialNum" gorm:"column:serial_num"` // 序列号 ExpiryDate string `json:"expiryDate" gorm:"column:expiry_date"` // 许可证到期日期 Status string `json:"status" gorm:"column:status"` // 状态 0无效 1有效 diff --git a/src/modules/network_element/model/ne_version.go b/src/modules/network_element/model/ne_version.go index 9bd651ad..3d64902a 100644 --- a/src/modules/network_element/model/ne_version.go +++ b/src/modules/network_element/model/ne_version.go @@ -3,22 +3,23 @@ package model // NeVersion 网元版本信息 ne_version type NeVersion struct { ID int64 `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type" binding:"required"` // 网元类型 - NeId string `json:"neId" gorm:"column:ne_id" binding:"required"` // 网元ID - Name string `json:"name" gorm:"column:name"` // 当前包名 - Version string `json:"version" gorm:"column:version" binding:"required"` // 当前版本 - Path string `json:"path" gorm:"column:path" binding:"required"` // 当前软件包 - PreName string `json:"preName" gorm:"column:pre_name"` // 上一版本包名 - PreVersion string `json:"preVersion" gorm:"column:pre_version"` // 上一版本 - PrePath string `json:"prePath" gorm:"column:pre_path"` // 上一版本软件包 - NewName string `json:"newName" gorm:"column:new_name"` // 新版本包名 - NewVersion string `json:"newVersion" gorm:"column:new_version"` // 新版本 - NewPath string `json:"newPath" gorm:"column:new_path"` // 新版本软件包 - Status string `json:"status" gorm:"column:status"` // 当前状态 1当前版本 2上一版本 3有新版本 - CreateBy string `json:"createBy" gorm:"column:create_by"` // 创建者 - CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 - UpdateBy string `json:"updateBy" gorm:"column:update_by"` // 更新者 - UpdateTime int64 `json:"updateTime" gorm:"column:update_time"` // 更新时间 + CoreUID string `json:"coreUid" gorm:"column:core_uid" binding:"required"` // 核心网唯一标识 + NeUID string `json:"neUid" gorm:"column:ne_uid" binding:"required"` // 网元唯一标识 + NeType string `json:"neType" gorm:"column:ne_type" binding:"required"` // 网元类型 + Name string `json:"name" gorm:"column:name"` // 当前包名 + Version string `json:"version" gorm:"column:version" binding:"required"` // 当前版本 + Path string `json:"path" gorm:"column:path" binding:"required"` // 当前软件包 + PreName string `json:"preName" gorm:"column:pre_name"` // 上一版本包名 + PreVersion string `json:"preVersion" gorm:"column:pre_version"` // 上一版本 + PrePath string `json:"prePath" gorm:"column:pre_path"` // 上一版本软件包 + NewName string `json:"newName" gorm:"column:new_name"` // 新版本包名 + NewVersion string `json:"newVersion" gorm:"column:new_version"` // 新版本 + NewPath string `json:"newPath" gorm:"column:new_path"` // 新版本软件包 + Status string `json:"status" gorm:"column:status"` // 当前状态 1当前版本 2上一版本 3有新版本 + CreateBy string `json:"createBy" gorm:"column:create_by"` // 创建者 + CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 + UpdateBy string `json:"updateBy" gorm:"column:update_by"` // 更新者 + UpdateTime int64 `json:"updateTime" gorm:"column:update_time"` // 更新时间 } // TableName 表名称 diff --git a/src/modules/network_element/network_element.go b/src/modules/network_element/network_element.go index 95f7685c..aa3de9ec 100644 --- a/src/modules/network_element/network_element.go +++ b/src/modules/network_element/network_element.go @@ -55,28 +55,28 @@ func Setup(router *gin.Engine) { middleware.AuthorizeUser(nil), controller.NewNeInfo.State, ) - neInfoGroup.GET("/byTypeAndID", + neInfoGroup.GET("/core-ne-uid", middleware.AuthorizeUser(nil), - controller.NewNeInfo.NeTypeAndID, + controller.NewNeInfo.CoreUidAndNeUid, ) - neInfoGroup.GET("/listAll", + neInfoGroup.GET("/list/all", middleware.AuthorizeUser(nil), controller.NewNeInfo.ListAll, ) - neInfoGroup.GET("/para5GFile", + neInfoGroup.GET("/file/para5g", middleware.AuthorizeUser(nil), controller.NewNeInfo.Para5GFileRead, ) - neInfoGroup.PUT("/para5GFile", + neInfoGroup.PUT("/file/para5g", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_OTHER)), controller.NewNeInfo.Para5GFileWrite, ) - neInfoGroup.GET("/oamFile", + neInfoGroup.GET("/file/oam", middleware.AuthorizeUser(nil), controller.NewNeInfo.OAMFileRead, ) - neInfoGroup.PUT("/oamFile", + neInfoGroup.PUT("/file/oam", middleware.AuthorizeUser(nil), collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_OTHER)), controller.NewNeInfo.OAMFileWrite, @@ -357,8 +357,8 @@ func Setup(router *gin.Engine) { // InitLoad 初始参数 func InitLoad() { // 启动时，清除缓存-网元类型 - service.NewNeInfo.ClearNeCacheByNeType("*") - service.NewNeInfo.FindByRmuid("") + service.NewNeInfo.ClearNeCacheByCoreUid("*") + service.NewNeInfo.RefreshNeCacheByCoreUid("*") // 启动时，网元公共参数数据记录到全局变量 if para5GMap, err := service.NewNeInfo.NeConfPara5GRead(); para5GMap != nil && err == nil { service.NewNeInfo.NeConfPara5GWirte(para5GMap, nil) diff --git a/src/modules/network_element/repository/ne_info.go b/src/modules/network_element/repository/ne_info.go index da3cf1a8..b53279ff 100644 --- a/src/modules/network_element/repository/ne_info.go +++ b/src/modules/network_element/repository/ne_info.go @@ -68,11 +68,11 @@ func (r NeInfo) SelectByPage(query map[string]string) ([]model.NeInfo, int64) { if v, ok := query["neType"]; ok && v != "" { tx = tx.Where("ne_type = ?", v) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id = ?", v) + if v, ok := query["coreUid"]; ok && v != "" { + tx = tx.Where("core_uid = ?", v) } - if v, ok := query["rmUid"]; ok && v != "" { - tx = tx.Where("rmUid like ?", fmt.Sprintf("%s%%", v)) + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("neUid like ?", fmt.Sprintf("%s%%", v)) } // 查询结果 @@ -87,7 +87,7 @@ func (r NeInfo) SelectByPage(query map[string]string) ([]model.NeInfo, int64) { // 查询数据分页 pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"]) tx = tx.Limit(pageSize).Offset(pageSize * pageNum) - err := tx.Order("ne_type asc, ne_id asc").Find(&rows).Error + err := tx.Order("ne_type asc").Find(&rows).Error if err != nil { logger.Errorf("query find err => %v", err.Error()) return rows, total @@ -168,24 +168,31 @@ func (r NeInfo) SelectList(neInfo model.NeInfo) []model.NeInfo { if neInfo.NeType != "" { tx = tx.Where("ne_type = ?", neInfo.NeType) } - if neInfo.NeId != "" { - tx = tx.Where("ne_id = ?", neInfo.NeId) + if neInfo.CoreUID != "" { + tx = tx.Where("core_uid = ?", neInfo.CoreUID) + } + if neInfo.NeUID != "" { + tx = tx.Where("ne_uid = ?", neInfo.NeUID) } // 查询数据 rows := []model.NeInfo{} - if err := tx.Order("ne_type asc, ne_id asc").Find(&rows).Error; err != nil { + if err := tx.Order("ne_type asc").Find(&rows).Error; err != nil { logger.Errorf("query find err => %v", err.Error()) return rows } return r.neListSort(rows) } -// SelectNeInfoByNeTypeAndNeID 通过ne_type和ne_id查询网元信息 -func (r NeInfo) SelectNeInfoByNeTypeAndNeID(neType, neID string) model.NeInfo { +// SelectNeInfoByCoreUidAndNeUid 通过core_uid和ne_uid查询网元信息 +func (r NeInfo) SelectNeInfoByCoreUidAndNeUid(coreUid, neUid string) model.NeInfo { tx := db.DB("").Model(&model.NeInfo{}) // 构建查询条件 - tx = tx.Where("ne_type = ? and ne_id = ?", neType, neID) + if coreUid == "*" || coreUid == "" { + tx = tx.Where("ne_uid = ?", neUid) + } else { + tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid) + } // 查询数据 row := model.NeInfo{} if err := tx.Limit(1).Find(&row).Error; err != nil { @@ -195,15 +202,18 @@ func (r NeInfo) SelectNeInfoByNeTypeAndNeID(neType, neID string) model.NeInfo { return row } -// CheckUniqueNeTypeAndNeId 校验同类型下标识是否唯一 -func (r NeInfo) CheckUniqueNeTypeAndNeId(neInfo model.NeInfo) int64 { +// CheckUniqueCoreIdAndNeType 校验同类型下标识是否唯一 +func (r NeInfo) CheckUniqueCoreIdAndNeType(neInfo model.NeInfo) int64 { tx := db.DB("").Model(&model.NeInfo{}) // 查询条件拼接 if neInfo.NeType != "" { tx = tx.Where("ne_type = ?", neInfo.NeType) } - if neInfo.NeId != "" { - tx = tx.Where("ne_id = ?", neInfo.NeType) + if neInfo.CoreUID != "" { + tx = tx.Where("core_uid = ?", neInfo.CoreUID) + } + if neInfo.NeUID != "" { + tx = tx.Where("ne_uid = ?", neInfo.NeUID) } // 查询数据 var id int64 = 0 diff --git a/src/modules/network_element/repository/ne_license.go b/src/modules/network_element/repository/ne_license.go index 8d9c9d7a..4309c0ac 100644 --- a/src/modules/network_element/repository/ne_license.go +++ b/src/modules/network_element/repository/ne_license.go @@ -22,8 +22,8 @@ func (r NeLicense) SelectByPage(query map[string]string) ([]model.NeLicense, int if v, ok := query["neType"]; ok && v != "" { tx = tx.Where("ne_type = ?", v) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id = ?", v) + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("ne_uid = ?", v) } if v, ok := query["expiryDate"]; ok && v != "" { tx = tx.Where("expiry_date = ?", v) @@ -60,11 +60,11 @@ func (r NeLicense) SelectByPage(query map[string]string) ([]model.NeLicense, int func (r NeLicense) Select(param model.NeLicense) []model.NeLicense { tx := db.DB("").Model(&model.NeLicense{}) // 查询条件拼接 - if param.NeType != "" { - tx = tx.Where("ne_type = ?", param.NeType) + if param.CoreUID != "" { + tx = tx.Where("core_uid = ?", param.CoreUID) } - if param.NeId != "" { - tx = tx.Where("ne_id = ?", param.NeId) + if param.NeUID != "" { + tx = tx.Where("ne_uid = ?", param.NeUID) } if param.ExpiryDate != "" { tx = tx.Where("expiry_date = ?", param.ExpiryDate) diff --git a/src/modules/network_element/repository/ne_version.go b/src/modules/network_element/repository/ne_version.go index 668d8cd2..3d9bfd5e 100644 --- a/src/modules/network_element/repository/ne_version.go +++ b/src/modules/network_element/repository/ne_version.go @@ -22,8 +22,8 @@ func (r NeVersion) SelectByPage(query map[string]string) ([]model.NeVersion, int if v, ok := query["neType"]; ok && v != "" { tx = tx.Where("ne_type = ?", v) } - if v, ok := query["neId"]; ok && v != "" { - tx = tx.Where("ne_id = ?", v) + if v, ok := query["neUid"]; ok && v != "" { + tx = tx.Where("ne_uid = ?", v) } if v, ok := query["version"]; ok && v != "" { tx = tx.Where("version like ?", fmt.Sprintf("%s%%", v)) @@ -57,11 +57,11 @@ func (r NeVersion) SelectByPage(query map[string]string) ([]model.NeVersion, int func (r NeVersion) Select(param model.NeVersion) []model.NeVersion { tx := db.DB("").Model(&model.NeVersion{}) // 查询条件拼接 - if param.NeType != "" { - tx = tx.Where("ne_type = ?", param.NeType) + if param.CoreUID != "" { + tx = tx.Where("core_uid = ?", param.CoreUID) } - if param.NeId != "" { - tx = tx.Where("ne_id = ?", param.NeId) + if param.NeUID != "" { + tx = tx.Where("ne_uid = ?", param.NeUID) } if param.Version != "" { tx = tx.Where("version like ?", fmt.Sprintf("%s%%", param.Version)) diff --git a/src/modules/network_element/service/ne_config_backup.go b/src/modules/network_element/service/ne_config_backup.go index cdd623e0..7329542a 100644 --- a/src/modules/network_element/service/ne_config_backup.go +++ b/src/modules/network_element/service/ne_config_backup.go @@ -74,13 +74,13 @@ func (s NeConfigBackup) FileLocalToNe(neInfo model.NeInfo, localFile string) err if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) } - localDirPath := fmt.Sprintf("%s/%s/%s/backup/tmp_import", omcPath, neTypeLower, neInfo.NeId) + localDirPath := fmt.Sprintf("%s/%s/%s/backup/tmp_import", omcPath, neTypeLower, neInfo.NeUID) if err := file.UnZip(localFile, localDirPath); err != nil { return fmt.Errorf("unzip err") } // 网元主机的SSH客户端 - sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { return fmt.Errorf("ne info ssh client err") } @@ -93,7 +93,7 @@ func (s NeConfigBackup) FileLocalToNe(neInfo model.NeInfo, localFile string) err defer sftpClient.Close() // 网元配置端上的临时目录 - neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeId) + neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeUID) sshClient.RunCMD(fmt.Sprintf("sudo mkdir -p /tmp/omc/ne_config && sudo chmod 755 -R /tmp/omc && sudo rm -rf %s", neDirTemp)) // 复制到网元端 if err = sftpClient.CopyDirLocalToRemote(localDirPath, neDirTemp); err != nil { @@ -133,7 +133,7 @@ func (s NeConfigBackup) FileLocalToNe(neInfo model.NeInfo, localFile string) err // FileNeToLocal 网元备份文件网元端复制到本地 func (s NeConfigBackup) FileNeToLocal(neInfo model.NeInfo) (string, error) { // 网元主机的SSH客户端 - sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { return "", fmt.Errorf("ne info ssh client err") } @@ -151,11 +151,11 @@ func (s NeConfigBackup) FileNeToLocal(neInfo model.NeInfo) (string, error) { if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) } - localDirPath := fmt.Sprintf("%s/%s/%s/from_ne_tmp", omcPath, neTypeLower, neInfo.NeId) + localDirPath := fmt.Sprintf("%s/%s/%s/from_ne_tmp", omcPath, neTypeLower, neInfo.NeUID) // 网元配置文件先复制到临时目录 sshClient.RunCMD("sudo mkdir -p /tmp/omc/ne_config && sudo chmod 755 -R /tmp/omc") - neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeId) + neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeUID) if neTypeLower == "ims" { // ims目录 sshClient.RunCMD(fmt.Sprintf("mkdir -p %s/ims", neDirTemp)) @@ -186,8 +186,8 @@ func (s NeConfigBackup) FileNeToLocal(neInfo model.NeInfo) (string, error) { } // 压缩zip文件名 - zipFileName := fmt.Sprintf("%s-%s-etc-%s.zip", neTypeLower, neInfo.NeId, date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS)) - zipFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neInfo.NeId, zipFileName) + zipFileName := fmt.Sprintf("%s-%s-etc-%s.zip", neTypeLower, neInfo.NeUID, date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS)) + zipFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neInfo.NeUID, zipFileName) if err := file.CompressZipByDir(zipFilePath, localDirPath); err != nil { return "", fmt.Errorf("compress zip err") } diff --git a/src/modules/network_element/service/ne_info.go b/src/modules/network_element/service/ne_info.go index b574dba0..fad2a39d 100644 --- a/src/modules/network_element/service/ne_info.go +++ b/src/modules/network_element/service/ne_info.go @@ -35,10 +35,10 @@ type NeInfo struct { Para5GData map[string]string } -// FindByNeTypeAndNeID 通过ne_type和ne_id查询网元信息 -func (r NeInfo) FindByNeTypeAndNeID(neType, neID string) model.NeInfo { +// FindByCoreUidAndNeUid 通过core_uid和ne_uid查询网元信息 +func (r NeInfo) FindByCoreUidAndNeUid(coreUid string, neUid string) model.NeInfo { var neInfo model.NeInfo - key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(neType), neID) + key := fmt.Sprintf("%s:%s:*:%s", constants.CACHE_NE_INFO, coreUid, neUid) jsonStr, _ := redis.Get("", key) if len(jsonStr) > 7 { err := json.Unmarshal([]byte(jsonStr), &neInfo) @@ -46,8 +46,8 @@ func (r NeInfo) FindByNeTypeAndNeID(neType, neID string) model.NeInfo { neInfo = model.NeInfo{} } } else { - neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID) - if neInfo.ID != 0 && neInfo.NeId == neID { + neInfo = r.neInfoRepository.SelectNeInfoByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID == coreUid && neInfo.NeUID == neUid { redis.Del("", key) values, _ := json.Marshal(neInfo) redis.Set("", key, string(values), 0) @@ -56,36 +56,26 @@ func (r NeInfo) FindByNeTypeAndNeID(neType, neID string) model.NeInfo { return neInfo } -// RefreshByNeTypeAndNeID 通过ne_type和ne_id刷新redis中的缓存 -func (r NeInfo) RefreshByNeTypeAndNeID(neType, neID string) model.NeInfo { +// RefreshByCoreUidAndNeUid 通过core_id和ne_uid刷新缓存 +func (r NeInfo) RefreshByCoreUidAndNeUid(coreuid string, neUid string) model.NeInfo { var neInfo model.NeInfo - key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(neType), neID) + if coreuid == "*" || coreuid == "" { + return neInfo + } + key := fmt.Sprintf("%s:%s:*:%s", constants.CACHE_NE_INFO, coreuid, neUid) redis.Del("", key) - neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID) - if neInfo.ID != 0 && neInfo.NeId == neID { + neInfo = r.neInfoRepository.SelectNeInfoByCoreUidAndNeUid(coreuid, neUid) + if neInfo.CoreUID == coreuid && neInfo.NeUID == neUid { values, _ := json.Marshal(neInfo) redis.Set("", key, string(values), 0) } return neInfo } -// ClearNeCacheByNeType 清除网元类型缓存 -func (r NeInfo) ClearNeCacheByNeType(neType string) bool { - key := fmt.Sprintf("%s:*", constants.CACHE_NE_INFO) - if neType != "*" { - key = fmt.Sprintf("%s:%s*", constants.CACHE_NE_INFO, neType) - } - keys, err := redis.GetKeys("", key) - if err != nil { - return false - } - return redis.DelKeys("", keys) == nil -} - -// FindByNeType 通过ne_type查询网元信息 -func (r NeInfo) FindByNeType(neType string) []model.NeInfo { +// FindByCoreUidAndNeType 通过core_uid和ne_type查询网元信息 +func (r NeInfo) FindByCoreUidAndNeType(coreUid string, neType string) []model.NeInfo { neInfo := make([]model.NeInfo, 0) - key := fmt.Sprintf("%s:%s:*", constants.CACHE_NE_INFO, strings.ToUpper(neType)) + key := fmt.Sprintf("%s:%s:%s:*", constants.CACHE_NE_INFO, coreUid, neType) cacheKeys, _ := redis.GetKeys("", key) if len(cacheKeys) > 0 { for _, key := range cacheKeys { @@ -98,9 +88,9 @@ func (r NeInfo) FindByNeType(neType string) []model.NeInfo { } return neInfo } else { - neInfo = r.neInfoRepository.SelectList(model.NeInfo{NeType: neType}) + neInfo = r.neInfoRepository.SelectList(model.NeInfo{CoreUID: coreUid, NeType: neType}) for _, v := range neInfo { - key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(v.NeType), v.NeId) + key := fmt.Sprintf("%s:%s:%s:%s", constants.CACHE_NE_INFO, v.CoreUID, v.NeType, v.NeUID) redis.Del("", key) values, _ := json.Marshal(v) redis.Set("", key, string(values), 0) @@ -109,35 +99,33 @@ func (r NeInfo) FindByNeType(neType string) []model.NeInfo { return neInfo } -// FindByRmuid 通过rmUID查询网元信息 -func (r NeInfo) FindByRmuid(rmUid string) model.NeInfo { - var neInfo model.NeInfo - cacheKeys, _ := redis.GetKeys("", constants.CACHE_NE_INFO+":*") - if len(cacheKeys) > 0 { - for _, key := range cacheKeys { - var v model.NeInfo - jsonStr, _ := redis.Get("", key) - if len(jsonStr) > 7 { - json.Unmarshal([]byte(jsonStr), &v) - } - if v.RmUID == rmUid { - neInfo = v - break - } - } - } else { - neInfos := r.Find(neInfo, false, false) - for _, v := range neInfos { - key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(v.NeType), v.NeId) - redis.Del("", key) - values, _ := json.Marshal(v) - redis.Set("", key, string(values), 0) - if v.RmUID == rmUid { - neInfo = v - } - } +// ClearNeCacheByCoreUidOrNeUid 清除核心网下网元信息缓存 +// coreUid 核心网唯一标识 *表示清除所有 +func (r NeInfo) ClearNeCacheByCoreUid(coreUid string) bool { + key := fmt.Sprintf("%s:*", constants.CACHE_NE_INFO) + if coreUid != "*" { + key = fmt.Sprintf("%s:%s:*", constants.CACHE_NE_INFO, coreUid) + } + keys, err := redis.GetKeys("", key) + if err != nil { + return false + } + return redis.DelKeys("", keys) == nil +} + +// RefreshNeCacheByCoreUid 刷新核心网下网元信息缓存 +// coreUid 核心网唯一标识 *表示所有 +func (r NeInfo) RefreshNeCacheByCoreUid(coreUid string) { + if coreUid == "*" { + coreUid = "" + } + neInfos := r.Find(model.NeInfo{CoreUID: coreUid}, false, false) + for _, v := range neInfos { + key := fmt.Sprintf("%s:%s:%s:%s", constants.CACHE_NE_INFO, v.CoreUID, v.NeType, v.NeUID) + redis.Del("", key) + values, _ := json.Marshal(v) + redis.Set("", key, string(values), 0) } - return neInfo } // FindByPage 根据条件分页查询 @@ -270,8 +258,7 @@ func (r NeInfo) Insert(neInfo model.NeInfo) int64 { insertId := r.neInfoRepository.Insert(neInfo) if insertId > 0 { - // 刷新缓存 - r.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) + r.RefreshByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID) // 刷新缓存 } return insertId } @@ -293,8 +280,7 @@ func (r NeInfo) Update(neInfo model.NeInfo) int64 { num := r.neInfoRepository.Update(neInfo) if num > 0 { - // 刷新缓存 - r.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId) + r.RefreshByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID) // 刷新缓存 } return num } @@ -319,17 +305,17 @@ func (r NeInfo) DeleteByIds(ids []int64) (int64, error) { r.neHostService.DeleteByIds(hostIds, false) } // 删除License - neLicense := NewNeLicense.FindByNeTypeAndNeID(v.NeType, v.NeId) - if neLicense.NeId == v.NeId { + neLicense := NewNeLicense.FindByCoreUidAndNeUid(v.CoreUID, v.NeUID) + if neLicense.CoreUID == v.CoreUID && neLicense.NeUID == v.NeUID { NewNeLicense.DeleteByIds([]int64{neLicense.ID}) } // 删除Version - neVersion := NewNeVersion.FindByNeTypeAndNeID(v.NeType, v.NeId) - if neVersion.NeId == v.NeId { + neVersion := NewNeVersion.FindByCoreUidAndNeUid(v.CoreUID, v.NeUID) + if neVersion.CoreUID == v.CoreUID && neVersion.NeUID == v.NeUID { NewNeVersion.DeleteByIds([]int64{neVersion.ID}) } // 缓存信息删除 - redis.Del("", fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, v.NeType, v.NeId)) + redis.Del("", fmt.Sprintf("%s:%s:%s:%s", constants.CACHE_NE_INFO, v.CoreUID, v.NeType, v.NeUID)) } rows := r.neInfoRepository.DeleteByIds(ids) return rows, nil @@ -338,11 +324,11 @@ func (r NeInfo) DeleteByIds(ids []int64) (int64, error) { return 0, fmt.Errorf("delete fail") } -// CheckUniqueNeTypeAndNeId 校验同类型下标识是否唯一 -func (r NeInfo) CheckUniqueNeTypeAndNeId(neType, neId string, id int64) bool { - uniqueId := r.neInfoRepository.CheckUniqueNeTypeAndNeId(model.NeInfo{ - NeType: neType, - NeId: neId, +// CheckUniqueCoreUidAndNeUid 校验同类型下标识是否唯一 +func (r NeInfo) CheckUniqueCoreIdAndNeType(coreUid, neUid string, id int64) bool { + uniqueId := r.neInfoRepository.CheckUniqueCoreIdAndNeType(model.NeInfo{ + CoreUID: coreUid, + NeUID: neUid, }) if uniqueId == id { return true @@ -351,15 +337,15 @@ func (r NeInfo) CheckUniqueNeTypeAndNeId(neType, neId string, id int64) bool { } // NeRunSSHClient 网元主机的SSH客户端-为创建相关连接，注意结束后 Close() -func (r NeInfo) NeRunSSHClient(neType, neId string) (*ssh.ConnSSH, error) { - neInfo := r.FindByNeTypeAndNeID(neType, neId) - if neInfo.NeId != neId { - logger.Errorf("NeRunSSHClient NeType:%s NeID:%s not found", neType, neId) +func (r NeInfo) NeRunSSHClient(coreUid, neUid string) (*ssh.ConnSSH, error) { + neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID != coreUid || neInfo.NeUID == neUid { + logger.Errorf("NeRunSSHClient CoreUID:%s or NeUID:%s not found", coreUid, neUid) return nil, fmt.Errorf("neinfo not found") } // 取主机信息 if neInfo.HostIDs == "" { - logger.Errorf("NeRunSSHClient NeType:%s NeID:%s hostId not found", neType, neId) + logger.Errorf("NeRunSSHClient CoreUID:%s or NeUID:%s hostId not found", coreUid, neUid) return nil, fmt.Errorf("neinfo hostId not found") } hostIds := strings.Split(neInfo.HostIDs, ",") @@ -395,15 +381,15 @@ func (r NeInfo) NeRunSSHClient(neType, neId string) (*ssh.ConnSSH, error) { } // NeRunSSHCmd 网元主机的SSH客户端发送cmd命令 -func (r NeInfo) NeRunSSHCmd(neType, neId, cmd string) (string, error) { - sshClient, err := r.NeRunSSHClient(neType, neId) +func (r NeInfo) NeRunSSHCmd(coreUid, neUid string, cmdStr string) (string, error) { + sshClient, err := r.NeRunSSHClient(coreUid, neUid) if err != nil { return "", err } defer sshClient.Close() // 执行命令 - output, err := sshClient.RunCMD(cmd) + output, err := sshClient.RunCMD(cmdStr) if err != nil { logger.Errorf("NeRunSSHCmd RunCMD %s err => %s", output, err.Error()) return "", fmt.Errorf("neinfo ssh run cmd err") @@ -413,15 +399,15 @@ func (r NeInfo) NeRunSSHCmd(neType, neId, cmd string) (string, error) { // NeRunTelnetClient 网元主机的Telnet客户端-为创建相关连接，注意结束后 Close() // num 是网元主机telnet 1：4100 2：5200（UPF标准版） -func (r NeInfo) NeRunTelnetClient(neType, neId string, num int) (*telnet.ConnTelnet, error) { - neInfo := r.FindByNeTypeAndNeID(neType, neId) - if neInfo.NeId != neId { - logger.Errorf("NeRunTelnetClient NeType:%s NeID:%s not found", neType, neId) +func (r NeInfo) NeRunTelnetClient(coreUid, neUid string, num int) (*telnet.ConnTelnet, error) { + neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID != coreUid || neInfo.NeUID == neUid { + logger.Errorf("NeRunSSHClient CoreUID:%s or NeUID:%s not found", coreUid, neUid) return nil, fmt.Errorf("neinfo not found") } // 取主机信息 if neInfo.HostIDs == "" { - logger.Errorf("NeRunTelnetClient NeType:%s NeID:%s hostId not found", neType, neId) + logger.Errorf("NeRunTelnetClient CoreUID:%s or NeUID:%s hostId not found", coreUid, neUid) return nil, fmt.Errorf("neinfo hostId not found") } hostIds := strings.Split(neInfo.HostIDs, ",") @@ -449,15 +435,15 @@ func (r NeInfo) NeRunTelnetClient(neType, neId string, num int) (*telnet.ConnTel // NeRunRedisClient 网元主机的Redis客户端-为创建相关连接，注意结束后 Close() // 暂时只有UDM有Redis配置项 -func (r NeInfo) NeRunRedisClient(neType, neId string) (*redis.ConnRedis, error) { - neInfo := r.FindByNeTypeAndNeID(neType, neId) - if neInfo.NeId != neId { - logger.Errorf("NeRunRedisClient NeType:%s NeID:%s not found", neType, neId) +func (r NeInfo) NeRunRedisClient(coreUid, neUid string) (*redis.ConnRedis, error) { + neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid { + logger.Errorf("NeRunRedisClient CoreUid:%s NeUid:%s not found", coreUid, neUid) return nil, fmt.Errorf("neinfo not found") } // 取主机信息 if neInfo.HostIDs == "" { - logger.Errorf("NeRunRedisClient NeType:%s NeID:%s hostId not found", neType, neId) + logger.Errorf("NeRunRedisClient CoreUid:%s NeUid:%s hostId not found", coreUid, neUid) return nil, fmt.Errorf("neinfo hostId not found") } hostIds := strings.Split(neInfo.HostIDs, ",") @@ -484,8 +470,14 @@ func (r NeInfo) NeRunRedisClient(neType, neId string) (*redis.ConnRedis, error) } // NeConfOAMReadSync 网元OAM配置文件读取 -func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) { - oamData, err := r.neConfOAMRead(neType, neId, true) +func (r NeInfo) NeConfOAMReadSync(coreUid, neUid string) (map[string]any, error) { + neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid { + logger.Errorf("NeRunRedisClient CoreUid:%s NeUid:%s not found", coreUid, neUid) + return nil, fmt.Errorf("neinfo not found") + } + + oamData, err := r.neConfOAMRead(neInfo, true) if err != nil { return nil, err } @@ -500,7 +492,7 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) { } oamData["httpManageCfg"] = item delete(oamData, "httpmanagecfg") - r.neConfOAMWirte(neType, neId, oamData, false) + r.neConfOAMWirte(neInfo, oamData, false) } // 对网管HTTP配置 if v, ok := oamData["oamconfig"]; ok && v != nil { @@ -515,7 +507,7 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) { } oamData["oamConfig"] = item delete(oamData, "oamconfig") - r.neConfOAMWirte(neType, neId, oamData, false) + r.neConfOAMWirte(neInfo, oamData, false) } // 对网管SNMP配置 if v, ok := oamData["snmpconfig"]; ok && v != nil { @@ -526,14 +518,14 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) { } oamData["snmpConfig"] = item delete(oamData, "snmpconfig") - r.neConfOAMWirte(neType, neId, oamData, false) + r.neConfOAMWirte(neInfo, oamData, false) } // 对网管KPI上报配置 if v, ok := oamData["kpiconfig"]; ok && v != nil { item := v.(map[string]any) oamData["kpiConfig"] = item delete(oamData, "kpiconfig") - r.neConfOAMWirte(neType, neId, oamData, false) + r.neConfOAMWirte(neInfo, oamData, false) } // NSSF和MME 配置KPIconfig名不一致时 @@ -541,7 +533,7 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) { item := v.(map[string]any) oamData["kpiConfig"] = item delete(oamData, "KPIconfig") - r.neConfOAMWirte(neType, neId, oamData, false) + r.neConfOAMWirte(neInfo, oamData, false) } return oamData, nil @@ -591,11 +583,11 @@ func (r NeInfo) neConfOAMData() map[string]any { } // neConfOAMRead 网元OAM配置文件读取 sync从网元端同步到本地 -func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, error) { - neTypeLower := strings.ToLower(neType) +func (r NeInfo) neConfOAMRead(neInfo model.NeInfo, sync bool) (map[string]any, error) { + neTypeLower := strings.ToLower(neInfo.NeType) fileName := "oam_manager.yaml" // 网管本地路径 - localFilePath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s/%s", neTypeLower, neId, fileName) + localFilePath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s/%s", neTypeLower, neInfo.NeUID, fileName) if runtime.GOOS == "windows" { localFilePath = fmt.Sprintf("C:%s", localFilePath) } @@ -603,7 +595,7 @@ func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, e // 从网元端同步到本地 if sync { // 网元主机的SSH客户端 - sshClient, err := r.NeRunSSHClient(neType, neId) + sshClient, err := r.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { return nil, fmt.Errorf("ne info ssh client err") } @@ -631,7 +623,7 @@ func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, e // return nil, fmt.Errorf("read file error") // 无保留文件时返回默认文件数据 oamData := r.neConfOAMData() - r.neConfOAMWirte(neType, neId, oamData, false) + r.neConfOAMWirte(neInfo, oamData, false) return oamData, nil } content := string(bytes) @@ -646,15 +638,15 @@ func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, e } // neConfOAMWirte 网元OAM配置文件写入 content内容 sync同步到网元端 -func (r NeInfo) neConfOAMWirte(neType, neId string, content any, sync bool) error { - neTypeLower := strings.ToLower(neType) +func (r NeInfo) neConfOAMWirte(neInfo model.NeInfo, content any, sync bool) error { + neTypeLower := strings.ToLower(neInfo.NeType) fileName := "oam_manager.yaml" // 网管本地路径 omcPath := "/usr/local/omc/backup/ne_config" if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) } - localFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neId, fileName) + localFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neInfo.NeUID, fileName) // 写入文件 if err := parse.ConvertConfigToFile("yaml", localFilePath, content); err != nil { @@ -664,7 +656,7 @@ func (r NeInfo) neConfOAMWirte(neType, neId string, content any, sync bool) erro // 同步到网元端 if sync { // 网元主机的SSH客户端 - sshClient, err := r.NeRunSSHClient(neType, neId) + sshClient, err := r.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { return err } @@ -692,7 +684,7 @@ func (r NeInfo) neConfOAMWirte(neType, neId string, content any, sync bool) erro // NeConfOAMWirteSync 网元OAM配置文件生成并同步 func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any, sync bool) error { - oamData, err := r.neConfOAMRead(neInfo.NeType, neInfo.NeId, false) + oamData, err := r.neConfOAMRead(neInfo, false) if oamData == nil || err != nil { return fmt.Errorf("error read OAM file info") } @@ -703,13 +695,13 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any, httpManageCfg = neConfOAMData["httpManageCfg"].(map[string]any) } httpManageCfg["port"] = neInfo.Port - if strings.Contains(neInfo.IP, ":") { + if strings.Contains(neInfo.IPAddr, ":") { httpManageCfg["ipType"] = "ipv6" - httpManageCfg["ipv6"] = neInfo.IP + httpManageCfg["ipv6"] = neInfo.IPAddr } - if strings.Contains(neInfo.IP, ".") { + if strings.Contains(neInfo.IPAddr, ".") { httpManageCfg["ipType"] = "ipv4" - httpManageCfg["ipv4"] = neInfo.IP + httpManageCfg["ipv4"] = neInfo.IPAddr } delete(httpManageCfg, "iptype") delete(oamData, "httpmanagecfg") @@ -723,8 +715,8 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any, } delete(oamConfig, "neconfig") oamConfig["neConfig"] = map[string]string{ - "neId": neInfo.NeId, - "rmUid": neInfo.RmUID, + "coreId": neInfo.CoreUID, + "neUid": neInfo.NeUID, "neName": neInfo.NeName, "dn": neInfo.Dn, "vendorName": neInfo.VendorName, @@ -770,13 +762,13 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any, neConfOAMData := r.neConfOAMData() snmpConfig = neConfOAMData["snmpConfig"].(map[string]any) } - if strings.Contains(neInfo.IP, ":") { + if strings.Contains(neInfo.IPAddr, ":") { snmpConfig["ipType"] = "ipv6" - snmpConfig["ipv6"] = neInfo.IP + snmpConfig["ipv6"] = neInfo.IPAddr } - if strings.Contains(neInfo.IP, ".") { + if strings.Contains(neInfo.IPAddr, ".") { snmpConfig["ipType"] = "ipv4" - snmpConfig["ipv4"] = neInfo.IP + snmpConfig["ipv4"] = neInfo.IPAddr } delete(snmpConfig, "iptype") if snmpEnable, ok := content["snmpEnable"]; ok && snmpEnable != nil { @@ -808,7 +800,7 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any, delete(oamData, "kpiconfig") oamData["kpiConfig"] = kpiConfig - if err := r.neConfOAMWirte(neInfo.NeType, neInfo.NeId, oamData, sync); err != nil { + if err := r.neConfOAMWirte(neInfo, oamData, sync); err != nil { return fmt.Errorf("error wirte OAM file info") } return nil @@ -858,7 +850,7 @@ func (r *NeInfo) NeConfPara5GWirte(content map[string]any, syncNE []string) erro // 网元主机的SSH客户端 sshClient, err := r.NeRunSSHClient(ti[0], ti[1]) if err != nil { - errMsg = append(errMsg, fmt.Sprintf("%s : %s", ti, err.Error())) + errMsg = append(errMsg, fmt.Sprintf("core_ne %s : %s", ti, err.Error())) continue } defer sshClient.Close() diff --git a/src/modules/network_element/service/ne_license.go b/src/modules/network_element/service/ne_license.go index 59db136f..2114120a 100644 --- a/src/modules/network_element/service/ne_license.go +++ b/src/modules/network_element/service/ne_license.go @@ -71,23 +71,11 @@ func (r *NeLicense) DeleteByIds(ids []int64) (int64, error) { return 0, fmt.Errorf("delete fail") } -// FindByTypeAndID 通过网元类型和网元ID查询 -func (r *NeLicense) FindByTypeAndID(neType, neId string) model.NeLicense { +// FindByCoreUidAndNeUid 通过核心网和网元唯一标识查询 +func (r *NeLicense) FindByCoreUidAndNeUid(coreUid, neUid string) model.NeLicense { neLicenses := r.neLicenseRepository.Select(model.NeLicense{ - NeType: neType, - NeId: neId, - }) - if len(neLicenses) > 0 { - return neLicenses[0] - } - return model.NeLicense{} -} - -// FindByNeTypeAndNeID 通过ne_type和ne_id查询信息 -func (r *NeLicense) FindByNeTypeAndNeID(neType, neId string) model.NeLicense { - neLicenses := r.neLicenseRepository.Select(model.NeLicense{ - NeType: neType, - NeId: neId, + CoreUID: coreUid, + NeUID: neUid, }) if len(neLicenses) > 0 { return neLicenses[0] @@ -104,12 +92,12 @@ func (r *NeLicense) ReadLicenseInfo(neLicense model.NeLicense) (string, string) if runtime.GOOS == "windows" { omcPath = fmt.Sprintf("C:%s", omcPath) } - omcPath = fmt.Sprintf("%s/%s/%s", omcPath, neTypeLower, neLicense.NeId) + omcPath = fmt.Sprintf("%s/%s/%s", omcPath, neTypeLower, neLicense.NeUID) // 网元端授权文件路径 nePath := fmt.Sprintf("/usr/local/etc/%s/license", neTypeLower) // 网元主机的SSH客户端 - sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.NeType, neLicense.NeId) + sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.CoreUID, neLicense.NeUID) if err != nil { return "", "" } @@ -154,7 +142,7 @@ func (r *NeLicense) UploadLicense(neLicense model.NeLicense) error { } // 网元主机的SSH客户端 - sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.NeType, neLicense.NeId) + sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.CoreUID, neLicense.NeUID) if err != nil { return err } diff --git a/src/modules/network_element/service/ne_version.go b/src/modules/network_element/service/ne_version.go index ea7340d7..1234e6d7 100644 --- a/src/modules/network_element/service/ne_version.go +++ b/src/modules/network_element/service/ne_version.go @@ -55,8 +55,8 @@ func (r NeVersion) checkNeVersion(arr *[]model.NeVersion) { for i := range *arr { item := (*arr)[i] // 查询网元获取IP - neInfo := r.neInfoService.FindByNeTypeAndNeID(item.NeType, item.NeId) - if neInfo.NeId != item.NeId || neInfo.IP == "" { + neInfo := r.neInfoService.FindByCoreUidAndNeUid(item.CoreUID, item.NeUID) + if neInfo.CoreUID != item.CoreUID || neInfo.NeUID != item.NeUID { continue } result, err := neFetchlink.NeState(neInfo) @@ -72,9 +72,8 @@ func (r NeVersion) checkNeVersion(arr *[]model.NeVersion) { item.Path = "-" item.Version = ver } - if item.NeType != neInfo.NeType || item.NeId != neInfo.NeId { + if item.NeType != neInfo.NeType { item.NeType = neInfo.NeType - item.NeId = neInfo.NeId } r.Update(item) (*arr)[i] = item @@ -119,11 +118,11 @@ func (r NeVersion) DeleteByIds(ids []int64) (int64, error) { return 0, fmt.Errorf("delete fail") } -// FindByNeTypeAndNeID 通过网元类型和网元ID查询 -func (r NeVersion) FindByNeTypeAndNeID(neType, neId string) model.NeVersion { +// FindByCoreUidAndNeUid 通过核心网和网元唯一标识查询 +func (r NeVersion) FindByCoreUidAndNeUid(coreUid, neUid string) model.NeVersion { neVersions := r.neVersionRepository.Select(model.NeVersion{ - NeType: neType, - NeId: neId, + CoreUID: coreUid, + NeUID: neUid, }) if len(neVersions) > 0 { return neVersions[0] @@ -136,7 +135,7 @@ func (r NeVersion) FindByNeTypeAndNeID(neType, neId string) model.NeVersion { // action 安装行为：install upgrade rollback func (r NeVersion) Operate(action string, neVersion model.NeVersion, preinput map[string]string) (string, error) { // 网元主机的SSH客户端 - sshClient, err := r.neInfoService.NeRunSSHClient(neVersion.NeType, neVersion.NeId) + sshClient, err := r.neInfoService.NeRunSSHClient(neVersion.CoreUID, neVersion.NeUID) if err != nil { return "", err } @@ -162,7 +161,7 @@ func (r NeVersion) Operate(action string, neVersion model.NeVersion, preinput ma if para5GMap == nil || err != nil { return "", fmt.Errorf("error read para5G file info") } - if err := r.neInfoService.NeConfPara5GWirte(para5GMap, []string{fmt.Sprintf("%s@%s", neVersion.NeType, neVersion.NeId)}); err != nil { + if err := r.neInfoService.NeConfPara5GWirte(para5GMap, []string{fmt.Sprintf("%s@%s", neVersion.CoreUID, neVersion.NeUID)}); err != nil { return "", fmt.Errorf("error wirte para5G file info") } } @@ -689,8 +688,8 @@ func (r NeVersion) operateRun(sshClient *ssh.ConnSSH, preinput map[string]string func (r NeVersion) operateDome(action string, neVersion model.NeVersion) error { if action == "install" { // 网元信息 - neInfo := r.neInfoService.FindByNeTypeAndNeID(neVersion.NeType, neVersion.NeId) - if neInfo.NeId != neVersion.NeId { + neInfo := r.neInfoService.FindByCoreUidAndNeUid(neVersion.CoreUID, neVersion.NeUID) + if neInfo.CoreUID != neVersion.CoreUID || neInfo.NeUID != neVersion.NeUID { return fmt.Errorf("error found neinfo") } @@ -712,29 +711,29 @@ func (r NeVersion) operateDome(action string, neVersion model.NeVersion) error { // IMS 配置 imsNEs := r.neInfoService.Find(model.NeInfo{NeType: "IMS"}, false, false) for _, v := range imsNEs { - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscIPCMD) - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscHostCMD) - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smsHost) - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, "sudo sed -i '/^#!define WITH_SMS/ s/^/#/' /usr/local/etc/ims/vars.cfg") - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, "ims-stop || true && ims-start") + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscIPCMD) + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscHostCMD) + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smsHost) + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, "sudo sed -i '/^#!define WITH_SMS/ s/^/#/' /usr/local/etc/ims/vars.cfg") + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, "ims-stop || true && ims-start") } // UDM 配置 smscASName := fmt.Sprintf("sudo sed -i \"/- name: 'sms_as'/{n;s|serverName: .*|serverName: 'sip:%s:5060'|}\" /usr/local/etc/udm/as.yaml", para5GData["SMSC_IP"]) smscASAddress := fmt.Sprintf("sudo sed -i \"/- name: 'sms_as'/{n;n;n;s|diameterAddress: .*|diameterAddress: 'smsc.ims.%s.3gppnetwork.org'|}\" /usr/local/etc/udm/as.yaml", mnc_mcc) udmNEs := r.neInfoService.Find(model.NeInfo{NeType: "UDM"}, false, false) for _, v := range udmNEs { - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscIPCMD) - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscHostCMD) - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscASName) - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscASAddress) - r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, "sudo service udm restart") + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscIPCMD) + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscHostCMD) + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscASName) + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscASAddress) + r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, "sudo service udm restart") } } } // 更新Version - verInfo := r.FindByNeTypeAndNeID(neVersion.NeType, neVersion.NeId) - if verInfo.NeId == neVersion.NeId { + verInfo := r.FindByCoreUidAndNeUid(neVersion.CoreUID, neVersion.NeUID) + if verInfo.CoreUID == neVersion.CoreUID && verInfo.NeUID == neVersion.NeUID { curName := verInfo.Name curVersion := verInfo.Version curPath := verInfo.Path diff --git a/src/modules/tool/controller/iperf.go b/src/modules/tool/controller/iperf.go index 1c7705fa..bca521a9 100644 --- a/src/modules/tool/controller/iperf.go +++ b/src/modules/tool/controller/iperf.go @@ -49,8 +49,8 @@ type IPerfController struct { func (s *IPerfController) Version(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeType string `form:"neType" binding:"required"` // 网元类型 - NeId string `form:"neId" binding:"required"` // 网元ID + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 Version string `form:"version" binding:"required,oneof=V2 V3"` // 版本 } if err := c.ShouldBindQuery(&query); err != nil { @@ -59,7 +59,7 @@ func (s *IPerfController) Version(c *gin.Context) { return } - output, err := s.iperfService.Version(query.NeType, query.NeId, query.Version) + output, err := s.iperfService.Version(query.CoreUid, query.NeUid, query.Version) if err != nil { c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) return @@ -84,8 +84,8 @@ func (s *IPerfController) Version(c *gin.Context) { func (s *IPerfController) Install(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` // 网元类型 - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 Version string `form:"version" binding:"required,oneof=V2 V3"` // 版本 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { @@ -94,7 +94,7 @@ func (s *IPerfController) Install(c *gin.Context) { return } - if err := s.iperfService.Install(body.NeType, body.NeId, body.Version); err != nil { + if err := s.iperfService.Install(body.CoreUid, body.NeUid, body.Version); err != nil { c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) return } @@ -121,10 +121,10 @@ func (s *IPerfController) Install(c *gin.Context) { func (s *IPerfController) Run(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeType string `form:"neType" binding:"required"` // 网元类型 - NeId string `form:"neId" binding:"required"` // 网元标识id - Cols int `form:"cols"` // 终端单行字符数 - Rows int `form:"rows"` // 终端显示行数 + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 + Cols int `form:"cols"` // 终端单行字符数 + Rows int `form:"rows"` // 终端显示行数 } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -140,7 +140,7 @@ func (s *IPerfController) Run(c *gin.Context) { } // 网元主机的SSH客户端 - sshClient, err := neService.NewNeInfo.NeRunSSHClient(query.NeType, query.NeId) + sshClient, err := neService.NewNeInfo.NeRunSSHClient(query.CoreUid, query.NeUid) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return diff --git a/src/modules/tool/controller/ping.go b/src/modules/tool/controller/ping.go index 48056c8f..730c587a 100644 --- a/src/modules/tool/controller/ping.go +++ b/src/modules/tool/controller/ping.go @@ -119,8 +119,8 @@ func (s *PingController) StatisticsOn(c *gin.Context) { func (s *PingController) Version(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeType string `form:"neType" binding:"required"` // 网元类型 - NeID string `form:"neId" binding:"required"` // 网元ID + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -128,7 +128,7 @@ func (s *PingController) Version(c *gin.Context) { return } - output, err := s.pingService.Version(query.NeType, query.NeID) + output, err := s.pingService.Version(query.CoreUid, query.NeUid) if err != nil { c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) return @@ -156,10 +156,10 @@ func (s *PingController) Version(c *gin.Context) { func (s *PingController) Run(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeType string `form:"neType" binding:"required"` // 网元类型 - NeId string `form:"neId" binding:"required"` // 网元标识id - Cols int `form:"cols"` // 终端单行字符数 - Rows int `form:"rows"` // 终端显示行数 + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 + Cols int `form:"cols"` // 终端单行字符数 + Rows int `form:"rows"` // 终端显示行数 } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -175,7 +175,7 @@ func (s *PingController) Run(c *gin.Context) { } // 网元主机的SSH客户端 - sshClient, err := neService.NewNeInfo.NeRunSSHClient(query.NeType, query.NeId) + sshClient, err := neService.NewNeInfo.NeRunSSHClient(query.CoreUid, query.NeUid) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return diff --git a/src/modules/tool/service/iperf.go b/src/modules/tool/service/iperf.go index d1530911..8f30cf41 100644 --- a/src/modules/tool/service/iperf.go +++ b/src/modules/tool/service/iperf.go @@ -22,7 +22,7 @@ var NewIPerf = &IPerf{} type IPerf struct{} // Version 查询版本信息 -func (s *IPerf) Version(meType, neId, version string) (string, error) { +func (s *IPerf) Version(coreUid, neUid, version string) (string, error) { if version != "V2" && version != "V3" { return "", fmt.Errorf("iperf version is required V2 or V3") } @@ -32,7 +32,7 @@ func (s *IPerf) Version(meType, neId, version string) (string, error) { } // 网元主机的SSH客户端 - sshClient, err := neService.NewNeInfo.NeRunSSHClient(meType, neId) + sshClient, err := neService.NewNeInfo.NeRunSSHClient(coreUid, neUid) if err != nil { return "", err } @@ -50,13 +50,13 @@ func (s *IPerf) Version(meType, neId, version string) (string, error) { } // Install 安装iperf3 -func (s *IPerf) Install(meType, neId, version string) error { +func (s *IPerf) Install(coreUid, neUid, version string) error { if version != "V2" && version != "V3" { return fmt.Errorf("iperf version is required V2 or V3") } // 网元主机的SSH客户端 - sshClient, err := neService.NewNeInfo.NeRunSSHClient(meType, neId) + sshClient, err := neService.NewNeInfo.NeRunSSHClient(coreUid, neUid) if err != nil { return err } diff --git a/src/modules/tool/service/ping.go b/src/modules/tool/service/ping.go index 6d2db937..7312afa0 100644 --- a/src/modules/tool/service/ping.go +++ b/src/modules/tool/service/ping.go @@ -136,9 +136,9 @@ func (s *Ping) StatisticsOn(client *wsModel.WSClient, reqMsg wsModel.WSRequest) } // Version 查询版本信息 -func (s *Ping) Version(meType, neId string) (string, error) { +func (s *Ping) Version(coreUid, neUid string) (string, error) { // 检查是否安装ping - output, err := neService.NewNeInfo.NeRunSSHCmd(meType, neId, "ping -V") + output, err := neService.NewNeInfo.NeRunSSHCmd(coreUid, neUid, "ping -V") if err != nil { return "", fmt.Errorf("ping not installed") } diff --git a/src/modules/trace/controller/tcpdump.go b/src/modules/trace/controller/tcpdump.go index e81b66e5..929bab70 100644 --- a/src/modules/trace/controller/tcpdump.go +++ b/src/modules/trace/controller/tcpdump.go @@ -39,9 +39,9 @@ type TCPdumpController struct { func (s *TCPdumpController) DumpStart(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` // 网元类型 - NeId string `json:"neId" binding:"required"` // 网元ID - Cmd string `json:"cmd" binding:"required"` // 命令 "-n -s 0 -v" + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 + Cmd string `json:"cmd" binding:"required"` // 命令 "-n -s 0 -v" } if err := c.ShouldBindBodyWithJSON(&body); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -49,7 +49,7 @@ func (s *TCPdumpController) DumpStart(c *gin.Context) { return } - taskCode, err := s.tcpdumpService.DumpStart(body.NeType, body.NeId, body.Cmd) + taskCode, err := s.tcpdumpService.DumpStart(body.CoreUid, body.NeUid, body.Cmd) if err != nil { c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) return @@ -73,8 +73,8 @@ func (s *TCPdumpController) DumpStart(c *gin.Context) { func (s *TCPdumpController) DumpStop(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` // 网元类型 - NeId string `json:"neId" binding:"required"` // 网元ID + CoreUid string `json:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `json:"neUid" binding:"required"` // 网元唯一资源标识 TaskCode string `json:"taskCode" binding:"required"` // 任务码，停止任务并查看日志信息 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { @@ -83,7 +83,7 @@ func (s *TCPdumpController) DumpStop(c *gin.Context) { return } - logFiles, err := s.tcpdumpService.DumpStop(body.NeType, body.NeId, body.TaskCode) + logFiles, err := s.tcpdumpService.DumpStop(body.CoreUid, body.NeUid, body.TaskCode) if err != nil { c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) return @@ -107,9 +107,9 @@ func (s *TCPdumpController) DumpStop(c *gin.Context) { func (s *TCPdumpController) UPFTrace(c *gin.Context) { language := reqctx.AcceptLanguage(c) var body struct { - NeType string `json:"neType" binding:"required"` // 网元类型 - NeId string `json:"neId" binding:"required"` // 网元ID - Cmd string `json:"cmd" binding:"required"` // 命令 + CoreUid string `json:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `json:"neUid" binding:"required"` // 网元唯一资源标识 + Cmd string `json:"cmd" binding:"required"` // 命令 } if err := c.ShouldBindBodyWithJSON(&body); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -117,7 +117,7 @@ func (s *TCPdumpController) UPFTrace(c *gin.Context) { return } - msg, err := s.tcpdumpService.UPFTrace(body.NeType, body.NeId, body.Cmd) + msg, err := s.tcpdumpService.UPFTrace(body.CoreUid, body.NeUid, body.Cmd) if err != nil { c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) return diff --git a/src/modules/trace/controller/trace_task_hlr.go b/src/modules/trace/controller/trace_task_hlr.go index 5bd30031..962c313e 100644 --- a/src/modules/trace/controller/trace_task_hlr.go +++ b/src/modules/trace/controller/trace_task_hlr.go @@ -186,8 +186,8 @@ func (s *TraceTaskHlrController) File(c *gin.Context) { func (s *TraceTaskHlrController) FilePull(c *gin.Context) { language := reqctx.AcceptLanguage(c) var querys struct { - NeType string `form:"neType" binding:"required"` - NeID string `form:"neId" binding:"required"` + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 Path string `form:"path" binding:"required"` FileName string `form:"fileName" binding:"required"` DelTemp bool `form:"delTemp"` // 删除本地临时文件 @@ -199,14 +199,14 @@ func (s *TraceTaskHlrController) FilePull(c *gin.Context) { } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, i18n.TKey(language, "app.common.noNEInfo"))) + neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUid, querys.NeUid) + if neInfo.CoreUID != querys.CoreUid || neInfo.NeUID != querys.NeUid { + c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo"))) return } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return diff --git a/src/modules/trace/model/trace_task.go b/src/modules/trace/model/trace_task.go index 4a2ff489..99627161 100644 --- a/src/modules/trace/model/trace_task.go +++ b/src/modules/trace/model/trace_task.go @@ -16,7 +16,8 @@ type TraceTask struct { CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间 Title string `json:"title" gorm:"column:title" binding:"required"` // 任务标题 Remark string `json:"remark" gorm:"column:remark"` // 备注 - NeList string `json:"neList" gorm:"column:ne_list" binding:"required"` // 网元列表 neType_neId 例如 UDM_001,AMF_001 + CoreUid string `json:"coreUid" gorm:"column:core_uid" binding:"required"` // 核心网唯一标识 + NeList string `json:"neList" gorm:"column:ne_list" binding:"required"` // 网元列表 neUid,neUid NotifyUrl string `json:"notifyUrl" gorm:"column:notify_url"` // 信息数据通知回调地址UDP 例如udp:192.168.5.58:33033 } diff --git a/src/modules/trace/service/tcpdump.go b/src/modules/trace/service/tcpdump.go index baa772b8..44331d71 100644 --- a/src/modules/trace/service/tcpdump.go +++ b/src/modules/trace/service/tcpdump.go @@ -27,19 +27,19 @@ type TCPdump struct { var dumpPIDMap sync.Map // DumpStart 触发tcpdump开始抓包 -func (s *TCPdump) DumpStart(neType, neId, cmdStr string) (string, error) { +func (s *TCPdump) DumpStart(coreUid, neUid, cmdStr string) (string, error) { // 命令检查 if strings.Contains(cmdStr, "-w") { return "", fmt.Errorf("command cannot contain -w") } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(neType, neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid { return "", fmt.Errorf("app.common.noNEInfo") } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(coreUid, neUid) if err != nil { return "", err } @@ -55,7 +55,7 @@ func (s *TCPdump) DumpStart(neType, neId, cmdStr string) (string, error) { taskCode := time.Now().Format("20060102150405") // 存放文件目录 /usr/local/omc/tcpdump/udm/001/20240817104241 - neDirTemp := fmt.Sprintf("/usr/local/omc/tcpdump/%s/%s/%s", strings.ToLower(neInfo.NeType), neInfo.NeId, taskCode) + neDirTemp := fmt.Sprintf("/usr/local/omc/tcpdump/%s/%s/%s", strings.ToLower(neInfo.NeType), neInfo.NeUID, taskCode) sshClient.RunCMD(fmt.Sprintf("sudo mkdir -p %s && sudo chmod 755 -R /usr/local/omc/tcpdump", neDirTemp)) // 命令拼装 @@ -79,36 +79,36 @@ func (s *TCPdump) DumpStart(neType, neId, cmdStr string) (string, error) { } // 日志文件行号 - PIDMap := s.logFileLastLine(neType, sshClient) + PIDMap := s.logFileLastLine(neInfo.NeType, sshClient) PIDMap["neType"] = neInfo.NeType - PIDMap["neId"] = neInfo.NeId + PIDMap["rmUid"] = neInfo.NeUID PIDMap["taskCode"] = taskCode PIDMap["pid"] = outputPID PIDMap["cmd"] = sendCmd // 检查进程 ps aux | grep tcpdump // 强杀 sudo pkill tcpdump - pidKey := fmt.Sprintf("%s_%s_%s", strings.ToLower(neInfo.NeType), neInfo.NeId, taskCode) + pidKey := fmt.Sprintf("%s_%s", neInfo.NeUID, taskCode) dumpPIDMap.Store(pidKey, PIDMap) return taskCode, err } // DumpStop 停止已存在抓包句柄 -func (s *TCPdump) DumpStop(neType, neId, taskCode string) ([]string, error) { +func (s *TCPdump) DumpStop(coreUid, neUid, taskCode string) ([]string, error) { // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(neType, neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid { return []string{}, fmt.Errorf("app.common.noNEInfo") } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(coreUid, neUid) if err != nil { return []string{}, err } defer sshClient.Close() // 是否存在执行过的进程 - pidKey := fmt.Sprintf("%s_%s_%s", strings.ToLower(neInfo.NeType), neInfo.NeId, taskCode) + pidKey := fmt.Sprintf("%s_%s_%s", strings.ToLower(neInfo.NeType), neInfo.NeUID, taskCode) PIDMap, ok := dumpPIDMap.Load(pidKey) if !ok || PIDMap == nil { return []string{}, fmt.Errorf("tcpdump is not running") @@ -120,7 +120,7 @@ func (s *TCPdump) DumpStop(neType, neId, taskCode string) ([]string, error) { s.logFileLastLineToFile(PIDMap.(map[string]string), sshClient) // 存放文件目录 /usr/local/omc/tcpdump/udm/001/20240817104241 - neDirTemp := fmt.Sprintf("/usr/local/omc/tcpdump/%s/%s/%s", strings.ToLower(neInfo.NeType), neInfo.NeId, taskCode) + neDirTemp := fmt.Sprintf("/usr/local/omc/tcpdump/%s/%s/%s", strings.ToLower(neInfo.NeType), neInfo.NeUID, taskCode) // 命令拼装 sendCmd := fmt.Sprintf("pids=$(pgrep -P %s) && [ -n \"$pids\" ] && sudo kill $pids;sudo timeout 2s ls %s", pid, neDirTemp) // pids=$(pgrep -P 1914341) && [ -n "$pids" ] && sudo kill $pids;sudo timeout 2s ls /usr/local/omc/tcpdump/udm/001/20240817104241 @@ -207,32 +207,32 @@ func (s *TCPdump) logFileLastLineToFile(PIDMap map[string]string, sshClient *ssh } // UPFTrace UPF标准版内部抓包 -func (s *TCPdump) UPFTrace(neType, neId, cmdStr string) (string, error) { +func (s *TCPdump) UPFTrace(coreUid, neUid, cmdStr string) (string, error) { // 命令检查 if strings.Contains(cmdStr, "file") { return "", fmt.Errorf("command cannot contain file") } // 查询网元获取IP - neInfo := s.neInfoService.FindByNeTypeAndNeID(neType, neId) - if neInfo.NeId != neId || neInfo.IP == "" { + neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid) + if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid { return "", fmt.Errorf("app.common.noNEInfo") } // 网元主机的SSH客户端 - sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := s.neInfoService.NeRunSSHClient(coreUid, neUid) if err != nil { return "", err } defer sshClient.Close() // 网元主机的Telnet客户端 - telnetClient, err := s.neInfoService.NeRunTelnetClient("UPF", neInfo.NeId, 2) + telnetClient, err := s.neInfoService.NeRunTelnetClient(coreUid, neUid, 2) if err != nil { return "", err } defer telnetClient.Close() // 命令拼装 - fileName := fmt.Sprintf("%s_%s_part_%s.pcap ", neInfo.NeType, neInfo.NeId, time.Now().Format("20060102150405")) + fileName := fmt.Sprintf("%s_%s_part_%s.pcap ", neInfo.NeType, neInfo.NeUID, time.Now().Format("20060102150405")) pcapCmd := fmt.Sprintf("%s\r\n", cmdStr) // 以off结尾是停止抓包，不需要写文件 if !strings.Contains(cmdStr, "off") { diff --git a/src/modules/trace/service/trace_task.go b/src/modules/trace/service/trace_task.go index 2085f282..b955546c 100644 --- a/src/modules/trace/service/trace_task.go +++ b/src/modules/trace/service/trace_task.go @@ -212,20 +212,20 @@ func (r TraceTask) createTaskToNe(task *model.TraceTask, ignoreErr bool) error { // 发送任务给网元 errNe := []string{} - for _, neTypeID := range neList { - neTypeIDArr := strings.Split(neTypeID, "_") - if len(neTypeIDArr) != 2 { - logger.Warnf("ne type id is error") + for _, coreUid_neUid := range neList { + coreUidAneUidArr := strings.Split(coreUid_neUid, "_") + if len(coreUidAneUidArr) != 2 { + logger.Warnf("ne uid is error") continue } - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1]) - if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" { - logger.Warnf("ne type id is not exist") + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(coreUidAneUidArr[0], coreUidAneUidArr[1]) + if neInfo.CoreUID != coreUidAneUidArr[0] || neInfo.NeUID != coreUidAneUidArr[1] { + logger.Warnf("ne uid is not exist") continue } if err := r.traceNeTask(neInfo, *task); err != nil { - logger.Errorf("ne type id is %s to %s error: %s", task.TraceId, neTypeID, err.Error()) - errNe = append(errNe, neTypeID) + logger.Errorf("ne uid is %s to %s error: %s", task.TraceId, coreUidAneUidArr, err.Error()) + errNe = append(errNe, coreUid_neUid) continue } } @@ -233,13 +233,13 @@ func (r TraceTask) createTaskToNe(task *model.TraceTask, ignoreErr bool) error { return nil } // 移除任务 - for _, neTypeID := range neList { - neTypeIDArr := strings.Split(neTypeID, "_") - if len(neTypeIDArr) != 2 { + for _, coreUid_neUid := range neList { + coreUidAneUidArr := strings.Split(coreUid_neUid, "_") + if len(coreUidAneUidArr) != 2 { continue } - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1]) - if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(coreUidAneUidArr[0], coreUidAneUidArr[1]) + if neInfo.CoreUID != coreUidAneUidArr[0] || neInfo.NeUID != coreUidAneUidArr[1] { continue } neFetchlink.NeTraceDelete(neInfo, task.TraceId) @@ -315,13 +315,13 @@ func (r TraceTask) DeleteByIds(ids []int64) (int64, error) { continue } // 停止任务 - for _, neTypeID := range neList { - neTypeIDArr := strings.Split(neTypeID, "_") - if len(neTypeIDArr) != 2 { + for _, coreUid_neUid := range neList { + coreUidAneUidArr := strings.Split(coreUid_neUid, "_") + if len(coreUidAneUidArr) != 2 { continue } - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1]) - if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(coreUidAneUidArr[0], coreUidAneUidArr[1]) + if neInfo.CoreUID != coreUidAneUidArr[0] || neInfo.NeUID != coreUidAneUidArr[1] { continue } neFetchlink.NeTraceDelete(neInfo, v.TraceId) @@ -336,8 +336,8 @@ func (r TraceTask) DeleteByIds(ids []int64) (int64, error) { } // RunUnstopped 启动跟踪未停止的任务 -func (r TraceTask) RunUnstopped(neType string, neId string) { - neStr := fmt.Sprintf("%s_%s", neType, neId) +func (r TraceTask) RunUnstopped(coreUid, neUid string) { + neStr := fmt.Sprintf("%s_%s", coreUid, neUid) tasks := r.traceTaskRepository.SelectByUnstopped(neStr) for _, task := range tasks { r.createTaskToNe(&task, true) diff --git a/src/modules/trace/service/trace_task_hlr.go b/src/modules/trace/service/trace_task_hlr.go index 6642a21d..c9001d36 100644 --- a/src/modules/trace/service/trace_task_hlr.go +++ b/src/modules/trace/service/trace_task_hlr.go @@ -101,9 +101,10 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (int64, error) { neInfos := r.neInfoService.Find(neModel.NeInfo{NeType: "HLR"}, false, false) for _, neInfo := range neInfos { hlrItem := map[string]any{ - "neType": neInfo.NeType, - "neId": neInfo.NeId, - "msg": "", + "coreUid": neInfo.CoreUID, + "neUid": neInfo.NeUID, + "neType": neInfo.NeType, + "msg": "", } msg, err := neFetchlink.HLRTraceStart(neInfo, data) if err != nil { @@ -132,9 +133,10 @@ func (r *TraceTaskHlr) Stop(task model.TraceTaskHlr) error { neInfos := r.neInfoService.Find(neModel.NeInfo{NeType: "HLR"}, false, false) for _, neInfo := range neInfos { hlrItem := map[string]any{ - "neType": neInfo.NeType, - "neId": neInfo.NeId, - "msg": "", + "coreUid": neInfo.CoreUID, + "neUid": neInfo.NeUID, + "neType": neInfo.NeType, + "msg": "", } msg, err := neFetchlink.HLRTraceStop(neInfo, map[string]any{ "traceIDArray": []string{task.TraceId}, @@ -169,14 +171,15 @@ func (r *TraceTaskHlr) File(traceId, dirPath string) ([]map[string]any, error) { // 遍历多个网元主机获取文件 for _, neInfo := range neInfos { hlrItem := map[string]any{ - "neType": neInfo.NeType, - "neId": neInfo.NeId, - "neName": neInfo.NeName, - "err": "", + "coreUid": neInfo.CoreUID, + "neUid": neInfo.NeUID, + "neType": neInfo.NeType, + "neName": neInfo.NeName, + "err": "", } // 网元主机的SSH客户端 - sshClient, err := r.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId) + sshClient, err := r.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID) if err != nil { hlrItem["err"] = "ssh link fail" hlrList = append(hlrList, hlrItem) diff --git a/src/modules/ws/controller/ws_view.go b/src/modules/ws/controller/ws_view.go index 38b52997..046ec1a0 100644 --- a/src/modules/ws/controller/ws_view.go +++ b/src/modules/ws/controller/ws_view.go @@ -33,10 +33,10 @@ import ( func (s *WSController) ShellView(c *gin.Context) { language := reqctx.AcceptLanguage(c) var query struct { - NeType string `form:"neType" binding:"required"` // 网元类型 - NeId string `form:"neId" binding:"required"` // 网元标识id - Cols int `form:"cols"` // 终端单行字符数 - Rows int `form:"rows"` // 终端显示行数 + CoreUid string `form:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `form:"neUid" binding:"required"` // 网元唯一资源标识 + Cols int `form:"cols"` // 终端单行字符数 + Rows int `form:"rows"` // 终端显示行数 } if err := c.ShouldBindQuery(&query); err != nil { errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err)) @@ -58,7 +58,7 @@ func (s *WSController) ShellView(c *gin.Context) { } // 网元主机的SSH客户端 - sshClient, err := neService.NewNeInfo.NeRunSSHClient(query.NeType, query.NeId) + sshClient, err := neService.NewNeInfo.NeRunSSHClient(query.CoreUid, query.NeUid) if err != nil { c.JSON(200, resp.ErrMsg(err.Error())) return diff --git a/src/modules/ws/processor/cdr_connect.go b/src/modules/ws/processor/cdr_connect.go index a3848860..c63fc10f 100644 --- a/src/modules/ws/processor/cdr_connect.go +++ b/src/modules/ws/processor/cdr_connect.go @@ -8,7 +8,6 @@ import ( "be.ems/src/framework/resp" neDataModel "be.ems/src/modules/network_data/model" neDataService "be.ems/src/modules/network_data/service" - neInfoService "be.ems/src/modules/network_element/service" ) // GetCDRConnectByIMS 获取CDR会话事件-IMS @@ -21,12 +20,9 @@ func GetCDRConnectByIMS(requestID string, data any) ([]byte, error) { return nil, fmt.Errorf("query data structure error") } - // 查询网元信息 rmUID - neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID) - if neInfo.NeId != query.NeID || neInfo.IP == "" { - return nil, fmt.Errorf("query neinfo not found") + if query.CoreUID == "" || query.NeUID == "" { + return nil, fmt.Errorf("query coreUid/neUid is empty") } - query.RmUID = neInfo.RmUID rows, total := neDataService.NewCDREventIMS.FindByPage(query) resultByte, err := json.Marshal(resp.Ok(map[string]any{ @@ -46,13 +42,6 @@ func GetCDRConnectBySMF(requestID string, data any) ([]byte, error) { return nil, fmt.Errorf("query data structure error") } - // 查询网元信息 rmUID - neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID) - if neInfo.NeId != query.NeID || neInfo.IP == "" { - return nil, fmt.Errorf("query neinfo not found") - } - query.RmUID = neInfo.RmUID - rows, total := neDataService.NewCDREventSMF.FindByPage(query) resultByte, err := json.Marshal(resp.Ok(map[string]any{ "requestId": requestID, @@ -71,13 +60,6 @@ func GetCDRConnectBySMSC(requestID string, data any) ([]byte, error) { return nil, fmt.Errorf("query data structure error") } - // 查询网元信息 rmUID - neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID) - if neInfo.NeId != query.NeID || neInfo.IP == "" { - return nil, fmt.Errorf("query neinfo not found") - } - query.RmUID = neInfo.RmUID - rows, total := neDataService.NewCDREventSMSC.FindByPage(query) resultByte, err := json.Marshal(resp.Ok(map[string]any{ "requestId": requestID, diff --git a/src/modules/ws/processor/ne_state.go b/src/modules/ws/processor/ne_state.go index fc606b33..15feff01 100644 --- a/src/modules/ws/processor/ne_state.go +++ b/src/modules/ws/processor/ne_state.go @@ -14,8 +14,8 @@ import ( func GetNeState(requestID string, data any) ([]byte, error) { msgByte, _ := json.Marshal(data) var querys struct { - NeType string `json:"neType" form:"neType" binding:"required"` - NeID string `json:"neId" form:"neId" binding:"required"` + CoreUid string `json:"coreUid" binding:"required"` // 核心网唯一资源标识 + NeUid string `json:"neUid" binding:"required"` // 网元唯一资源标识 } err := json.Unmarshal(msgByte, &querys) if err != nil { @@ -23,13 +23,13 @@ func GetNeState(requestID string, data any) ([]byte, error) { return nil, fmt.Errorf("query data structure error") } - if querys.NeType == "" || querys.NeID == "" { - return nil, fmt.Errorf("query neType any neId empty") + if querys.CoreUid == "" || querys.NeUid == "" { + return nil, fmt.Errorf("query coreUid/neUid empty") } // 查询网元获取IP - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { + neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(querys.CoreUid, querys.NeUid) + if neInfo.CoreUID != querys.CoreUid || neInfo.NeUID != querys.NeUid { return nil, fmt.Errorf("no matching network element information found") } @@ -39,11 +39,12 @@ func GetNeState(requestID string, data any) ([]byte, error) { resultByte, err := json.Marshal(resp.Ok(map[string]any{ "requestId": requestID, "data": map[string]any{ - "online": false, - "neId": neInfo.NeId, - "neName": neInfo.NeName, - "neType": neInfo.NeType, - "neIP": neInfo.IP, + "online": false, + "coreUid": neInfo.CoreUID, + "neUid": neInfo.NeUID, + "neName": neInfo.NeName, + "neType": neInfo.NeType, + "neIP": neInfo.IPAddr, }, })) return resultByte, err diff --git a/src/modules/ws/processor/ue_connect.go b/src/modules/ws/processor/ue_connect.go index 79d99952..262c748c 100644 --- a/src/modules/ws/processor/ue_connect.go +++ b/src/modules/ws/processor/ue_connect.go @@ -8,7 +8,6 @@ import ( "be.ems/src/framework/resp" neDataModel "be.ems/src/modules/network_data/model" neDataService "be.ems/src/modules/network_data/service" - neService "be.ems/src/modules/network_element/service" ) // GetUEConnectByAMF 获取UE会话事件-AMF @@ -21,12 +20,9 @@ func GetUEConnectByAMF(requestID string, data any) ([]byte, error) { return nil, fmt.Errorf("query data structure error") } - // 查询网元获取IP - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID("AMF", query.NeID) - if neInfo.NeId != query.NeID || neInfo.IP == "" { - return nil, fmt.Errorf("not fount neId info") + if query.CoreUID == "" || query.NeUID == "" { + return nil, fmt.Errorf("query coreUid/neUid is empty") } - query.RmUID = neInfo.RmUID rows, total := neDataService.NewUEEventAMF.FindByPage(query) resultByte, err := json.Marshal(resp.Ok(map[string]any{ @@ -46,12 +42,9 @@ func GetUEConnectByMME(requestID string, data any) ([]byte, error) { return nil, fmt.Errorf("query data structure error") } - // 查询网元获取IP - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID("MME", query.NeID) - if neInfo.NeId != query.NeID || neInfo.IP == "" { - return nil, fmt.Errorf("not fount neId info") + if query.CoreUID == "" || query.NeUID == "" { + return nil, fmt.Errorf("query coreUid/neUid is empty") } - query.RmUID = neInfo.RmUID rows, total := neDataService.NewUEEventMME.FindByPage(query) resultByte, err := json.Marshal(resp.Ok(map[string]any{ diff --git a/src/modules/ws/processor/upf_total_flow.go b/src/modules/ws/processor/upf_total_flow.go index 7d83ba79..ad28e905 100644 --- a/src/modules/ws/processor/upf_total_flow.go +++ b/src/modules/ws/processor/upf_total_flow.go @@ -7,16 +7,14 @@ import ( "be.ems/src/framework/logger" "be.ems/src/framework/resp" neDataService "be.ems/src/modules/network_data/service" - neService "be.ems/src/modules/network_element/service" ) // GetUPFTotalFlow 获取UPF-总流量数 N3上行 N6下行 单位比特(bit) func GetUPFTotalFlow(requestID string, data any) ([]byte, error) { msgByte, _ := json.Marshal(data) var querys struct { - NeType string `json:"neType" form:"neType" binding:"required"` - NeID string `json:"neId" form:"neId" binding:"required"` - Day int `json:"day" binding:"required"` + NeUID string `json:"neUid" form:"neUid" binding:"required"` // 网元唯一标识 + Day int `json:"day" binding:"required"` } err := json.Unmarshal(msgByte, &querys) if err != nil { @@ -24,17 +22,11 @@ func GetUPFTotalFlow(requestID string, data any) ([]byte, error) { return nil, fmt.Errorf("query data structure error") } - if querys.NeType == "" || querys.NeID == "" || querys.Day < 0 { - return nil, fmt.Errorf("query neType any neId empty or day less 0 ") + if querys.NeUID == "" || querys.Day < 0 { + return nil, fmt.Errorf("query rmUid empty or day less 0 ") } - // 查询网元获取IP - neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(querys.NeType, querys.NeID) - if neInfo.NeId != querys.NeID || neInfo.IP == "" { - return nil, fmt.Errorf("no matching network element information found") - } - - up, down := neDataService.NewKpiReport.UPFTodayFlowFind(neInfo.RmUID, querys.Day) + up, down := neDataService.NewKpiReport.UPFTodayFlowFind(querys.NeUID, querys.Day) resultByte, err := json.Marshal(resp.Ok(map[string]any{ "requestId": requestID,