Merge branch 'main-v2' into lichang

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 '网元类型',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `ne_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元名称',
+  `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL 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 '网元标识虚拟化标识',
   `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,
+  UNIQUE KEY `uk_alarm_aid_aseq_atype` (`ne_uid`, `alarm_id`, `alarm_seq`, `alarm_type`) USING BTREE COMMENT '唯一网元资源产生的ID与序号与状态',
-  KEY `idx_status_severity_time` (`alarm_status`,`orig_severity`,`event_time`) USING BTREE
+  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

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 '网元类型',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
+  `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,
+  UNIQUE KEY `uk_aevent_aid_aseq` (`ne_uid`, `alarm_id`, `alarm_seq`) USING BTREE COMMENT '唯一网元资源产生的ID与序号与状态',
-  KEY `idx_astatus_etime` (`alarm_status`,`event_time`) USING BTREE
+  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

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+  `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

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

build/database/std/install/core_info.sql

@@ -0,0 +1,24 @@
+--
+-- 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 '核心网唯一标识',
+  `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网名称',
+  `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安装生成的唯一编码',
+  `time_zone` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '时区 Asia/Hong_Kong',
+  `longitude` float DEFAULT '0' COMMENT '经度 -180 to 180',
+  `latitude` float DEFAULT '0' COMMENT '纬度 -90 to 90',
+  `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '地址',
+  `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` (`name`,`sn`) USING BTREE COMMENT '唯一名称和序号定义'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='核心网_基础信息表';
+
+-- Dump completed on 2025-06-04 15:26:56

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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;
+) ENGINE=InnoDB AUTO_INCREMENT=1 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 */;
 
 -- Dump completed on 2024-03-06 17:26:56

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',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(128) 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

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 '网元类型',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
+  `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

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

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

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
+  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='网元_基础信息表 关联对应版本、授权、主机';
+) 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

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 '网元类型',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
+  `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

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

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `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;

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 '网元类型',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
+  `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

build/database/std/install/sys_menu.sql

@@ -5,208 +5,207 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- Table structure for sys_menu
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_menu`;
-CREATE TABLE  `sys_menu` (
+CREATE TABLE `sys_menu` (
   `menu_id` bigint NOT NULL AUTO_INCREMENT COMMENT '菜单ID',
   `menu_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单名称',
-  `parent_id` bigint NULL DEFAULT 0 COMMENT '父菜单ID 默认0',
+  `parent_id` bigint DEFAULT '0' COMMENT '父菜单ID 默认0',
-  `menu_sort` int NULL DEFAULT 0 COMMENT '显示顺序',
+  `menu_sort` int DEFAULT '0' COMMENT '显示顺序',
-  `menu_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '路由地址',
+  `menu_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '路由地址',
-  `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '组件路径',
+  `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '组件路径',
-  `frame_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '1' COMMENT '内部跳转标记（0否 1是）',
+  `frame_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '1' COMMENT '内部跳转标记（0否 1是）',
-  `cache_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '缓存标记（0不缓存 1缓存）',
+  `cache_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '缓存标记（0不缓存 1缓存）',
   `menu_type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单类型（D目录 M菜单 A访问权限）',
-  `visible_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否显示（0隐藏 1显示）',
+  `visible_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '是否显示（0隐藏 1显示）',
-  `status_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '菜单状态（0停用 1正常）',
+  `status_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '菜单状态（0停用 1正常）',
-  `perms` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '权限标识',
+  `perms` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '权限标识',
-  `icon` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '#' COMMENT '菜单图标（#无图标）',
+  `icon` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '#' COMMENT '菜单图标（#无图标）',
-  `del_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标记（0存在 1删除）',
+  `del_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记（0存在 1删除）',
-  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '创建者',
-  `create_time` bigint NULL DEFAULT 0 COMMENT '创建时间',
+  `create_time` bigint DEFAULT '0' COMMENT '创建时间',
-  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者',
-  `update_time` bigint NULL DEFAULT 0 COMMENT '更新时间',
+  `update_time` bigint DEFAULT '0' COMMENT '更新时间',
-  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注',
+  `tenant_flag` varchar(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '租户内部菜单标记（0否 1是）',
+  `core_flag` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '核心网内部菜单标记（0否 1是）',
+  `ne_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元限制 含有其中一个, 同时匹配用+号 nf,nf,nf+nf',
   PRIMARY KEY (`menu_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统_菜单权限表' ROW_FORMAT = Dynamic;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='系统_菜单权限表';
 
 -- ----------------------------
 -- Records of sys_menu
 -- ----------------------------
-INSERT INTO `sys_menu` VALUES (1, 'menu.system', 0, 16, 'system', '', '1', '1', 'D', '1', '1', '', 'icon-xiangmu', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.systemRemark');
+INSERT INTO `sys_menu` VALUES (1, 'menu.system', 0, 16, 'system', '', '1', '1', 'D', '1', '1', '', 'icon-xiangmu', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.systemRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (4, 'menu.ne', 0, 3, 'ne', '', '1', '0', 'D', '1', '1', '', 'icon-huizhiguize', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.configRemark');
+INSERT INTO `sys_menu` VALUES (4, 'menu.ne', 0, 3, 'ne', '', '1', '0', 'D', '1', '1', '', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.configRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (5, 'menu.ue', 0, 7, 'ue', '', '1', '0', 'D', '1', '1', '', 'icon-wocanyu', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.ueRemark');
+INSERT INTO `sys_menu` VALUES (5, 'menu.ue', 0, 7, 'ue', '', '1', '0', 'D', '1', '1', '', 'icon-wocanyu', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.ueRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (60, 'menu.tools', 0, 60, 'tool', '', '1', '1', 'D', '1', '1', '', 'icon-wenjian', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.toolsRemark');
+INSERT INTO `sys_menu` VALUES (60, 'menu.tools', 0, 60, 'tool', '', '1', '1', 'D', '1', '1', '', 'icon-wenjian', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.toolsRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (61, 'menu.tools.terminal', 60, 20, 'terminal', 'tool/terminal/index', '1', '1', 'M', '1', '1', 'tool:terminal:index', 'icon-suofang', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (61, 'menu.tools.terminal', 60, 20, 'terminal', 'tool/terminal/index', '1', '1', 'M', '1', '1', 'tool:terminal:index', 'icon-suofang', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (62, 'menu.tools.help', 60, 62, 'help', 'tool/help/index', '1', '1', 'M', '0', '1', 'tool:help:list', 'icon-shuoming', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.tools.helpRemark');
+INSERT INTO `sys_menu` VALUES (62, 'menu.tools.help', 60, 62, 'help', 'tool/help/index', '1', '1', 'M', '0', '1', 'tool:help:list', 'icon-shuoming', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.tools.helpRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (63, 'menu.tools.ps', 60, 8, 'ps', 'tool/ps/index', '1', '0', 'M', '1', '1', 'tool:ps:list', 'icon-zhizuoliucheng', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (63, 'menu.tools.ps', 60, 8, 'ps', 'tool/ps/index', '1', '0', 'M', '1', '1', 'tool:ps:list', 'icon-zhizuoliucheng', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (64, 'menu.tools.net', 60, 9, 'net', 'tool/net/index', '1', '0', 'M', '1', '1', 'tool:net:list', 'icon-zhizuoliucheng', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (64, 'menu.tools.net', 60, 9, 'net', 'tool/net/index', '1', '0', 'M', '1', '1', 'tool:net:list', 'icon-zhizuoliucheng', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (65, 'menu.tools.ping', 60, 4, 'ping', 'tool/ping/index', '1', '0', 'M', '1', '1', 'tool:ping:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (65, 'menu.tools.ping', 60, 4, 'ping', 'tool/ping/index', '1', '0', 'M', '1', '1', 'tool:ping:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (66, 'menu.tools.iperf', 60, 6, 'iperf', 'tool/iperf/index', '1', '0', 'M', '1', '1', 'tool:iperf:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (66, 'menu.tools.iperf', 60, 6, 'iperf', 'tool/iperf/index', '1', '0', 'M', '1', '1', 'tool:iperf:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (100, 'menu.security.user', 2113, 1, 'user', 'system/user/index', '1', '1', 'M', '1', '1', 'system:user:list', 'icon-wocanyu', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.security.userRemark');
+INSERT INTO `sys_menu` VALUES (100, 'menu.security.user', 2113, 1, 'user', 'system/user/index', '1', '1', 'M', '1', '1', 'system:user:list', 'icon-wocanyu', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.security.userRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (101, 'menu.security.role', 2113, 3, 'role', 'system/role/index', '1', '1', 'M', '1', '1', 'system:role:list', 'icon-anzhuo', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.security.roleRemark');
+INSERT INTO `sys_menu` VALUES (101, 'menu.security.role', 2113, 3, 'role', 'system/role/index', '1', '1', 'M', '1', '1', 'system:role:list', 'icon-anzhuo', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.security.roleRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (102, 'menu.security.roleUser', 2113, 3, 'role/inline/auth-user/:roleId', 'system/role/auth-user', '1', '1', 'M', '0', '1', 'system:role:auth', '#', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.security.roleUserRemark');
+INSERT INTO `sys_menu` VALUES (102, 'menu.security.roleUser', 2113, 3, 'role/inline/auth-user/:roleId', 'system/role/auth-user', '1', '1', 'M', '0', '1', 'system:role:auth', '#', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.security.roleUserRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (103, 'menu.system.menu', 1, 10, 'menu', 'system/menu/index', '1', '1', 'M', '1', '1', 'system:menu:list', 'icon-wofaqi', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.menuRemark');
+INSERT INTO `sys_menu` VALUES (103, 'menu.system.menu', 1, 10, 'menu', 'system/menu/index', '1', '1', 'M', '1', '1', 'system:menu:list', 'icon-wofaqi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.menuRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (104, 'menu.security.dept', 2113, 5, 'dept', 'system/dept/index', '1', '1', 'M', '1', '1', 'system:dept:list', 'icon-yuzhanghao1', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.security.deptRemark');
+INSERT INTO `sys_menu` VALUES (104, 'menu.security.dept', 2113, 5, 'dept', 'system/dept/index', '1', '1', 'M', '1', '1', 'system:dept:list', 'icon-yuzhanghao1', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.security.deptRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (105, 'menu.security.post', 2113, 6, 'post', 'system/post/index', '1', '1', 'M', '1', '1', 'system:post:list', 'icon-gonggaodayi', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.security.postRemark');
+INSERT INTO `sys_menu` VALUES (105, 'menu.security.post', 2113, 6, 'post', 'system/post/index', '1', '1', 'M', '1', '1', 'system:post:list', 'icon-gonggaodayi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.security.postRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (106, 'menu.system.dictType', 1, 30, 'dict', 'system/dict/index', '1', '1', 'M', '1', '1', 'system:dict:list', 'icon-tubiaoku', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.dictTypeRemark');
+INSERT INTO `sys_menu` VALUES (106, 'menu.system.dictType', 1, 30, 'dict', 'system/dict/index', '1', '1', 'M', '1', '1', 'system:dict:list', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.dictTypeRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (107, 'menu.system.dictData', 1, 31, 'dict/inline/data/:dictId', 'system/dict/data', '1', '1', 'M', '0', '1', 'system:dict:data', '#', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.dictDataRemark');
+INSERT INTO `sys_menu` VALUES (107, 'menu.system.dictData', 1, 31, 'dict/inline/data/:dictId', 'system/dict/data', '1', '1', 'M', '0', '1', 'system:dict:data', '#', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.dictDataRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (108, 'menu.system.paramSet', 1, 59, 'config', 'system/config/index', '1', '1', 'M', '1', '1', 'system:config:list', 'icon-gongnengjieshao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.paramSetRemark');
+INSERT INTO `sys_menu` VALUES (108, 'menu.system.paramSet', 1, 59, 'config', 'system/config/index', '1', '1', 'M', '1', '1', 'system:config:list', 'icon-gongnengjieshao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.paramSetRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (111, 'menu.system.systemLog', 1, 11, 'log', '', '1', '1', 'D', '0', '0', '', '#', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.systemLogRemark');
+INSERT INTO `sys_menu` VALUES (111, 'menu.system.systemLog', 1, 11, 'log', '', '1', '1', 'D', '0', '0', '', '#', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.systemLogRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (112, 'menu.system.systemInfo', 1, 5, 'system-info', 'monitor/system/info', '1', '1', 'M', '1', '1', 'monitor:system:info', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.systemInfoRemark');
+INSERT INTO `sys_menu` VALUES (112, 'menu.system.systemInfo', 1, 5, 'system-info', 'monitor/system/info', '1', '1', 'M', '1', '1', 'monitor:system:info', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.systemInfoRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (113, 'menu.system.cacheInfo', 1, 8, 'cache-info', 'monitor/cache/info', '1', '1', 'M', '1', '1', 'monitor:cache:info', 'icon-gongnengjieshao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.cacheInfoRemark');
+INSERT INTO `sys_menu` VALUES (113, 'menu.system.cacheInfo', 1, 8, 'cache-info', 'monitor/cache/info', '1', '1', 'M', '1', '1', 'monitor:cache:info', 'icon-gongnengjieshao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.cacheInfoRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (114, 'menu.system.cache', 1, 9, 'cache', 'monitor/cache/index', '1', '1', 'M', '1', '1', 'monitor:cache:list', 'icon-tubiaoku', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.cacheRemark');
+INSERT INTO `sys_menu` VALUES (114, 'menu.system.cache', 1, 9, 'cache', 'monitor/cache/index', '1', '1', 'M', '1', '1', 'monitor:cache:list', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.cacheRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (115, 'menu.security.onlineUser', 2113, 2, 'online', 'monitor/online/index', '1', '1', 'M', '1', '1', 'monitor:online:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.security.onlineUserRemark');
+INSERT INTO `sys_menu` VALUES (115, 'menu.security.onlineUser', 2113, 2, 'online', 'monitor/online/index', '1', '1', 'M', '1', '1', 'monitor:online:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.security.onlineUserRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (116, 'menu.system.job', 1, 20, 'job', 'monitor/job/index', '1', '1', 'M', '1', '1', 'monitor:job:list', 'icon-lishi', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.jobRemark');
+INSERT INTO `sys_menu` VALUES (116, 'menu.system.job', 1, 20, 'job', 'monitor/job/index', '1', '1', 'M', '1', '1', 'monitor:job:list', 'icon-lishi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.jobRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (117, 'menu.system.jobLog', 1, 21, '/system/job/inline/log/:jobId', 'monitor/job/log', '1', '1', 'M', '0', '1', 'monitor:job:log', '#', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.jobLogRemark');
+INSERT INTO `sys_menu` VALUES (117, 'menu.system.jobLog', 1, 21, '/system/job/inline/log/:jobId', 'monitor/job/log', '1', '1', 'M', '0', '1', 'monitor:job:log', '#', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.jobLogRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (500, 'menu.log.operat', 2089, 25, 'operate', 'system/log/operate/index', '1', '1', 'M', '1', '1', 'system:log:operate:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.log.operatRemark');
+INSERT INTO `sys_menu` VALUES (500, 'menu.log.operat', 2089, 25, 'operate', 'system/log/operate/index', '1', '1', 'M', '1', '1', 'system:log:operate:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.log.operatRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (501, 'menu.log.login', 2089, 26, 'login', 'system/log/login/index', '1', '1', 'M', '1', '1', 'system:log:login:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.log.loginRemark');
+INSERT INTO `sys_menu` VALUES (501, 'menu.log.login', 2089, 26, 'login', 'system/log/login/index', '1', '1', 'M', '1', '1', 'system:log:login:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.log.loginRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1000, 'menu.common.query', 100, 1, '', '', '1', '1', 'B', '1', '1', 'system:user:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1000, 'menu.common.query', 100, 1, '', '', '1', '1', 'B', '1', '1', 'system:user:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1001, 'menu.common.add', 100, 2, '', '', '1', '1', 'B', '1', '1', 'system:user:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1001, 'menu.common.add', 100, 2, '', '', '1', '1', 'B', '1', '1', 'system:user:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1002, 'menu.common.edit', 100, 3, '', '', '1', '1', 'B', '1', '1', 'system:user:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1002, 'menu.common.edit', 100, 3, '', '', '1', '1', 'B', '1', '1', 'system:user:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1003, 'menu.common.delete', 100, 4, '', '', '1', '1', 'B', '1', '1', 'system:user:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1003, 'menu.common.delete', 100, 4, '', '', '1', '1', 'B', '1', '1', 'system:user:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1004, 'menu.common.export', 100, 5, '', '', '1', '1', 'B', '1', '1', 'system:user:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1004, 'menu.common.export', 100, 5, '', '', '1', '1', 'B', '1', '1', 'system:user:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1005, 'menu.common.import', 100, 6, '', '', '1', '1', 'B', '1', '1', 'system:user:import', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1005, 'menu.common.import', 100, 6, '', '', '1', '1', 'B', '1', '1', 'system:user:import', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1006, 'menu.common.resetPwd', 100, 7, '', '', '1', '1', 'B', '1', '1', 'system:user:resetPwd', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1006, 'menu.common.resetPwd', 100, 7, '', '', '1', '1', 'B', '1', '1', 'system:user:resetPwd', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1007, 'menu.common.query', 101, 1, '', '', '1', '1', 'B', '1', '1', 'system:role:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1007, 'menu.common.query', 101, 1, '', '', '1', '1', 'B', '1', '1', 'system:role:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1008, 'menu.common.add', 101, 2, '', '', '1', '1', 'B', '1', '1', 'system:role:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1008, 'menu.common.add', 101, 2, '', '', '1', '1', 'B', '1', '1', 'system:role:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1009, 'menu.common.edit', 101, 3, '', '', '1', '1', 'B', '1', '1', 'system:role:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1009, 'menu.common.edit', 101, 3, '', '', '1', '1', 'B', '1', '1', 'system:role:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1010, 'menu.common.delete', 101, 4, '', '', '1', '1', 'B', '1', '1', 'system:role:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1010, 'menu.common.delete', 101, 4, '', '', '1', '1', 'B', '1', '1', 'system:role:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1011, 'menu.common.export', 101, 5, '', '', '1', '1', 'B', '1', '1', 'system:role:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1011, 'menu.common.export', 101, 5, '', '', '1', '1', 'B', '1', '1', 'system:role:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1012, 'menu.common.query', 103, 1, '', '', '1', '1', 'B', '1', '1', 'system:menu:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1012, 'menu.common.query', 103, 1, '', '', '1', '1', 'B', '1', '1', 'system:menu:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1013, 'menu.common.add', 103, 2, '', '', '1', '1', 'B', '1', '1', 'system:menu:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1013, 'menu.common.add', 103, 2, '', '', '1', '1', 'B', '1', '1', 'system:menu:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1014, 'menu.common.edit', 103, 3, '', '', '1', '1', 'B', '1', '1', 'system:menu:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1014, 'menu.common.edit', 103, 3, '', '', '1', '1', 'B', '1', '1', 'system:menu:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1015, 'menu.common.delete', 103, 4, '', '', '1', '1', 'B', '1', '1', 'system:menu:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1015, 'menu.common.delete', 103, 4, '', '', '1', '1', 'B', '1', '1', 'system:menu:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1016, 'menu.common.query', 104, 1, '', '', '1', '1', 'B', '1', '1', 'system:dept:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1016, 'menu.common.query', 104, 1, '', '', '1', '1', 'B', '1', '1', 'system:dept:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1017, 'menu.common.add', 104, 2, '', '', '1', '1', 'B', '1', '1', 'system:dept:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1017, 'menu.common.add', 104, 2, '', '', '1', '1', 'B', '1', '1', 'system:dept:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1018, 'menu.common.edit', 104, 3, '', '', '1', '1', 'B', '1', '1', 'system:dept:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1018, 'menu.common.edit', 104, 3, '', '', '1', '1', 'B', '1', '1', 'system:dept:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1019, 'menu.common.delete', 104, 4, '', '', '1', '1', 'B', '1', '1', 'system:dept:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1019, 'menu.common.delete', 104, 4, '', '', '1', '1', 'B', '1', '1', 'system:dept:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1020, 'menu.common.query', 105, 1, '', '', '1', '1', 'B', '1', '1', 'system:post:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1020, 'menu.common.query', 105, 1, '', '', '1', '1', 'B', '1', '1', 'system:post:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1021, 'menu.common.add', 105, 2, '', '', '1', '1', 'B', '1', '1', 'system:post:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1021, 'menu.common.add', 105, 2, '', '', '1', '1', 'B', '1', '1', 'system:post:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1022, 'menu.common.edit', 105, 3, '', '', '1', '1', 'B', '1', '1', 'system:post:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1022, 'menu.common.edit', 105, 3, '', '', '1', '1', 'B', '1', '1', 'system:post:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1023, 'menu.common.delete', 105, 4, '', '', '1', '1', 'B', '1', '1', 'system:post:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1023, 'menu.common.delete', 105, 4, '', '', '1', '1', 'B', '1', '1', 'system:post:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1024, 'menu.common.export', 105, 5, '', '', '1', '1', 'B', '1', '1', 'system:post:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1024, 'menu.common.export', 105, 5, '', '', '1', '1', 'B', '1', '1', 'system:post:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1025, 'menu.common.query', 106, 1, '#', '', '1', '1', 'B', '1', '1', 'system:dict:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1025, 'menu.common.query', 106, 1, '#', '', '1', '1', 'B', '1', '1', 'system:dict:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1026, 'menu.common.add', 106, 2, '#', '', '1', '1', 'B', '1', '1', 'system:dict:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1026, 'menu.common.add', 106, 2, '#', '', '1', '1', 'B', '1', '1', 'system:dict:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1027, 'menu.common.edit', 106, 3, '#', '', '1', '1', 'B', '1', '1', 'system:dict:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1027, 'menu.common.edit', 106, 3, '#', '', '1', '1', 'B', '1', '1', 'system:dict:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1028, 'menu.common.delete', 106, 4, '#', '', '1', '1', 'B', '1', '1', 'system:dict:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1028, 'menu.common.delete', 106, 4, '#', '', '1', '1', 'B', '1', '1', 'system:dict:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1029, 'menu.common.export', 106, 5, '#', '', '1', '1', 'B', '1', '1', 'system:dict:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1029, 'menu.common.export', 106, 5, '#', '', '1', '1', 'B', '1', '1', 'system:dict:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1030, 'menu.common.query', 108, 1, '#', '', '1', '1', 'B', '1', '1', 'system:config:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1030, 'menu.common.query', 108, 1, '#', '', '1', '1', 'B', '1', '1', 'system:config:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1031, 'menu.common.add', 108, 2, '#', '', '1', '1', 'B', '1', '1', 'system:config:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1031, 'menu.common.add', 108, 2, '#', '', '1', '1', 'B', '1', '1', 'system:config:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1032, 'menu.common.edit', 108, 3, '#', '', '1', '1', 'B', '1', '1', 'system:config:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1032, 'menu.common.edit', 108, 3, '#', '', '1', '1', 'B', '1', '1', 'system:config:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1033, 'menu.common.delete', 108, 4, '#', '', '1', '1', 'B', '1', '1', 'system:config:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1033, 'menu.common.delete', 108, 4, '#', '', '1', '1', 'B', '1', '1', 'system:config:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1034, 'menu.common.export', 108, 5, '#', '', '1', '1', 'B', '1', '1', 'system:config:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1034, 'menu.common.export', 108, 5, '#', '', '1', '1', 'B', '1', '1', 'system:config:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1039, 'menu.common.query', 500, 1, '#', '', '1', '1', 'B', '1', '1', 'system:log:operate:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1039, 'menu.common.query', 500, 1, '#', '', '1', '1', 'B', '1', '1', 'system:log:operate:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1040, 'menu.common.delete', 500, 2, '#', '', '1', '1', 'B', '1', '1', 'system:log:operate:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1040, 'menu.common.delete', 500, 2, '#', '', '1', '1', 'B', '1', '1', 'system:log:operate:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1041, 'menu.common.export', 500, 3, '#', '', '1', '1', 'B', '1', '1', 'system:log:operate:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1041, 'menu.common.export', 500, 3, '#', '', '1', '1', 'B', '1', '1', 'system:log:operate:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1042, 'menu.common.query', 501, 1, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1042, 'menu.common.query', 501, 1, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1043, 'menu.common.delete', 501, 2, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1043, 'menu.common.delete', 501, 2, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1044, 'menu.common.export', 501, 3, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1044, 'menu.common.export', 501, 3, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1045, 'menu.common.unlock', 501, 4, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:unlock', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1045, 'menu.common.unlock', 501, 4, '#', '', '1', '1', 'B', '1', '1', 'system:log:login:unlock', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1046, 'menu.common.query', 114, 1, '#', '', '1', '1', 'B', '1', '1', 'monitor:cache:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1046, 'menu.common.query', 114, 1, '#', '', '1', '1', 'B', '1', '1', 'monitor:cache:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1047, 'menu.common.delete', 114, 2, '#', '', '1', '1', 'B', '1', '1', 'monitor:cache:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1047, 'menu.common.delete', 114, 2, '#', '', '1', '1', 'B', '1', '1', 'monitor:cache:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1048, 'menu.common.query', 115, 1, '#', '', '1', '1', 'B', '1', '1', 'monitor:online:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1048, 'menu.common.query', 115, 1, '#', '', '1', '1', 'B', '1', '1', 'monitor:online:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1049, 'menu.forcedQuit.batch ', 115, 2, '#', '', '1', '1', 'B', '1', '1', 'monitor:online:batchLogout', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1049, 'menu.forcedQuit.batch ', 115, 2, '#', '', '1', '1', 'B', '1', '1', 'monitor:online:batchLogout', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1050, 'menu.forcedQuit.single', 115, 3, '#', '', '1', '1', 'B', '1', '1', 'monitor:online:forceLogout', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1050, 'menu.forcedQuit.single', 115, 3, '#', '', '1', '1', 'B', '1', '1', 'monitor:online:forceLogout', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1051, 'menu.common.query', 116, 1, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:query', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1051, 'menu.common.query', 116, 1, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:query', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1052, 'menu.common.add', 116, 2, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:add', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1052, 'menu.common.add', 116, 2, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:add', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1053, 'menu.common.edit', 116, 3, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1053, 'menu.common.edit', 116, 3, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1054, 'menu.common.delete', 116, 4, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1054, 'menu.common.delete', 116, 4, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1055, 'menu.common.edit', 116, 5, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:changeStatus', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1055, 'menu.common.edit', 116, 5, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:changeStatus', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (1056, 'menu.common.export', 116, 6, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:export', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (1056, 'menu.common.export', 116, 6, '#', '', '1', '1', 'B', '1', '1', 'monitor:job:export', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2000, 'menu.neData.udmAuth', 5, 1, 'udm-auth', 'neData/udm-auth/index', '1', '1', 'M', '1', '1', 'udm#auth:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2000, 'menu.neData.udmAuth', 5, 1, 'udm-auth', 'neData/udm-auth/index', '1', '1', 'M', '1', '1', 'udm:auth:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'udm');
-INSERT INTO `sys_menu` VALUES (2001, 'menu.neData.udmSub', 5, 3, 'udm-sub', 'neData/udm-sub/index', '1', '1', 'M', '1', '1', 'udm#sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2001, 'menu.neData.udmSub', 5, 3, 'udm-sub', 'neData/udm-sub/index', '1', '1', 'M', '1', '1', 'udm:sub:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'udm');
-INSERT INTO `sys_menu` VALUES (2002, 'menu.neData.udmVOIP', 5, 5, 'udm-voip', 'neData/udm-voip/index', '1', '0', 'M', '1', '1', 'udm#voip:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2002, 'menu.neData.udmVOIP', 5, 5, 'udm-voip', 'neData/udm-voip/index', '1', '0', 'M', '1', '1', 'udm:voip:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'udm');
-INSERT INTO `sys_menu` VALUES (2003, 'menu.neData.udmVolte', 5, 7, 'udm-volte', 'neData/udm-volte/index', '1', '0', 'M', '1', '1', 'udm+ims#volte:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2003, 'menu.neData.udmVolte', 5, 7, 'udm-volte', 'neData/udm-volte/index', '1', '0', 'M', '1', '1', 'udm:volte:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'udm+ims');
-INSERT INTO `sys_menu` VALUES (2004, 'menu.neData.imsSub', 5, 9, 'ims-sub', 'neData/ims-sub/index', '1', '0', 'M', '1', '1', 'ims#sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2004, 'menu.neData.imsSub', 5, 9, 'ims-sub', 'neData/ims-sub/index', '1', '0', 'M', '1', '1', 'ims:sub:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'ims');
-INSERT INTO `sys_menu` VALUES (2005, 'menu.neData.smfSub', 5, 12, 'smf-sub', 'neData/smf-sub/index', '1', '0', 'M', '1', '1', 'smf#sub:index', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2005, 'menu.neData.smfSub', 5, 12, 'smf-sub', 'neData/smf-sub/index', '1', '0', 'M', '1', '1', 'smf:sub:list', 'icon-xiangmuchengyuan', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'smf');
-INSERT INTO `sys_menu` VALUES (2006, 'menu.neData.baseOnline', 5, 15, 'base-online', 'neData/base-online/index', '1', '0', 'M', '0', '1', 'amf,mme#base-online:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2006, 'menu.neData.baseOnline', 5, 15, 'base-online', 'neData/base-online/index', '1', '0', 'M', '0', '1', 'nb:base-online:list', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'amf,mme');
-INSERT INTO `sys_menu` VALUES (2007, 'menu.neData.baseStation', 5, 18, 'base-station', 'neData/base-station/index', '1', '0', 'M', '1', '1', 'amf,mme#base-station:list', 'icon-fenxiang', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2007, 'menu.neData.baseStation', 5, 18, 'base-station', 'neData/base-station/index', '1', '0', 'M', '1', '1', 'nb:base-station:list', 'icon-fenxiang', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'amf,mme');
-INSERT INTO `sys_menu` VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '1', '1', 'n3iwf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2008, 'menu.ueUser.n3iwf', 5, 20, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '1', '1', 'n3iwf:sub:list', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'n3iwf');
-INSERT INTO `sys_menu` VALUES (2009, 'menu.neData.pcfSub', 5, 24, 'pcf-sub', 'neData/pcf-sub/index', '1', '0', 'M', '1', '1', 'pcf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2009, 'menu.neData.pcfSub', 5, 24, 'pcf-sub', 'neData/pcf-sub/index', '1', '0', 'M', '1', '1', 'pcf:sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'pcf');
-INSERT INTO `sys_menu` VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2010, 'menu.neUser.nssf', 5, 26, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '1', '1', 'nssf:sub:index', 'icon-daimayingyong', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'nssf');
-INSERT INTO `sys_menu` VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '1', '1', 'nssf#sub:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2011, 'menu.neUser.nssfAmf', 5, 28, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '1', '1', 'nssf:sub:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'nssf');
-INSERT INTO `sys_menu` VALUES (2083, 'menu.trace', 2087, 30, 'traceManage', '', '1', '0', 'D', '1', '1', '', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.traceRemark');
+INSERT INTO `sys_menu` VALUES (2083, 'menu.trace', 2087, 30, 'traceManage', '', '1', '0', 'D', '1', '1', '', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.traceRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2084, 'menu.trace.task', 2083, 1, 'task', 'traceManage/task/index', '1', '0', 'M', '1', '1', 'traceManage:task:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1744453890548, 'menu.trace.taskRemark');
+INSERT INTO `sys_menu` VALUES (2084, 'menu.trace.task', 2083, 1, 'task', 'traceManage/task/index', '1', '0', 'M', '1', '1', 'traceManage:task:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1744453890548, 'menu.trace.taskRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2085, 'menu.trace.taskData', 2083, 4, 'task/inline/data', 'traceManage/task/data', '1', '0', 'M', '0', '1', 'traceManage:task:data', '#', '0', 'system', 1728641403588, 'system', 1744453921381, '');
+INSERT INTO `sys_menu` VALUES (2085, 'menu.trace.taskData', 2083, 4, 'task/inline/data', 'traceManage/task/data', '1', '0', 'M', '0', '1', 'traceManage:task:data', '#', '0', 'system', 1728641403588, 'system', 1744453921381, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2086, 'menu.trace.pcap', 2083, 11, 'pcap', 'traceManage/pcap/index', '1', '1', 'M', '1', '1', 'traceManage:pcap:index', 'icon-soutubiao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.trace.pcapRemark');
+INSERT INTO `sys_menu` VALUES (2086, 'menu.trace.pcap', 2083, 11, 'pcap', 'traceManage/pcap/index', '1', '1', 'M', '1', '1', 'traceManage:pcap:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.trace.pcapRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2087, 'menu.fault', 0, 2, 'faultManage', '', '1', '0', 'D', '1', '1', '', 'icon-jinggao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.faultRemark');
+INSERT INTO `sys_menu` VALUES (2087, 'menu.fault', 0, 2, 'faultManage', '', '1', '0', 'D', '1', '1', '', 'icon-jinggao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.faultRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2088, 'menu.fault.active', 2129, 1, 'active-alarm', 'faultManage/active-alarm/index', '1', '1', 'M', '1', '1', 'faultManage:active-alarm:index', 'icon-wenjian', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.fault.activemRemark');
+INSERT INTO `sys_menu` VALUES (2088, 'menu.fault.active', 2129, 1, 'active-alarm', 'faultManage/active-alarm/index', '1', '1', 'M', '1', '1', 'faultManage:active-alarm:index', 'icon-wenjian', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.fault.activemRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2089, 'menu.log', 0, 9, 'logManage', '', '1', '0', 'D', '1', '1', '', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.logRemark');
+INSERT INTO `sys_menu` VALUES (2089, 'menu.log', 0, 9, 'logManage', '', '1', '0', 'D', '1', '1', '', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.logRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2091, 'menu.log.mml', 2089, 30, 'mml', 'logManage/mml/index', '1', '1', 'M', '1', '1', 'logManage:mml:index', 'icon-wocanyu', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.log.mmlRemark');
+INSERT INTO `sys_menu` VALUES (2091, 'menu.log.mml', 2089, 30, 'mml', 'logManage/mml/index', '1', '1', 'M', '1', '1', 'logManage:mml:index', 'icon-wocanyu', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.log.mmlRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2092, 'menu.log.alarm', 2089, 40, 'alarm-log', 'logManage/alarm/index', '1', '0', 'M', '1', '1', 'logManage:alarm:index', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.log.alarmRemark');
+INSERT INTO `sys_menu` VALUES (2092, 'menu.log.alarm', 2089, 40, 'alarm-log', 'logManage/alarm/index', '1', '0', 'M', '1', '1', 'logManage:alarm:index', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.log.alarmRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2094, 'menu.log.forwarding', 2089, 41, 'forwarding', 'logManage/forwarding/index', '1', '0', 'M', '1', '1', 'logManage:forwarding:index', 'icon-huizhiguize', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.log.forwardingRemark');
+INSERT INTO `sys_menu` VALUES (2094, 'menu.log.forwarding', 2089, 41, 'forwarding', 'logManage/forwarding/index', '1', '0', 'M', '1', '1', 'logManage:forwarding:index', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.log.forwardingRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2095, 'menu.log.set', 2089, 45, 'logSet', 'logManage/logSet/index', '1', '0', 'M', '0', '0', 'logManage:logSet:index', 'icon-you', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.log.setRemark');
+INSERT INTO `sys_menu` VALUES (2095, 'menu.log.set', 2089, 45, 'logSet', 'logManage/logSet/index', '1', '0', 'M', '0', '0', 'logManage:logSet:index', 'icon-you', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.log.setRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2096, 'menu.neData.backupData', 5, 40, 'backup-data', 'neData/backup-data/index', '1', '0', 'M', '1', '1', 'ne-data:backup-data:list', 'icon-wenjian', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2096, 'menu.neData.backupData', 5, 40, 'backup-data', 'neData/backup-data/index', '1', '0', 'M', '1', '1', 'ne-data:backup-data:list', 'icon-wenjian', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2097, 'menu.fault.history', 2129, 2, 'history-alarm', 'faultManage/history-alarm/index', '1', '1', 'M', '1', '1', 'faultManage/history-alarm/index', 'icon-huizhiguize', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.fault.historyRemark');
+INSERT INTO `sys_menu` VALUES (2097, 'menu.fault.history', 2129, 2, 'history-alarm', 'faultManage/history-alarm/index', '1', '1', 'M', '1', '1', 'faultManage/history-alarm/index', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.fault.historyRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2098, 'menu.fault.set', 2129, 100, 'fault-setting', 'faultManage/fault-setting/index', '1', '0', 'M', '0', '1', 'faultManage/fault-setting/index', 'icon-gonggaodayi', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.fault.setRemark');
+INSERT INTO `sys_menu` VALUES (2098, 'menu.fault.set', 2129, 100, 'fault-setting', 'faultManage/fault-setting/index', '1', '0', 'M', '0', '1', 'faultManage/fault-setting/index', 'icon-gonggaodayi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.fault.setRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2099, 'menu.perf', 0, 5, 'perfManage', '', '1', '0', 'D', '1', '1', '', 'icon-soutubiao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.perfRemark');
+INSERT INTO `sys_menu` VALUES (2099, 'menu.perf', 0, 5, 'perfManage', '', '1', '0', 'D', '1', '1', '', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perfRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2100, 'menu.perf.task', 2099, 1, 'taskManage', 'perfManage/taskManage/index', '1', '0', 'M', '0', '1', 'perfManage:taskManage:index', 'icon-wofaqi', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.perf.taskRemark');
+INSERT INTO `sys_menu` VALUES (2100, 'menu.perf.task', 2099, 1, 'taskManage', 'perfManage/taskManage/index', '1', '0', 'M', '0', '1', 'perfManage:taskManage:index', 'icon-wofaqi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.taskRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2101, 'menu.perf.data', 2099, 2, 'perfData', 'perfManage/perfData/index', '1', '0', 'M', '0', '1', 'perfManage:perfData:index', 'icon-soutubiao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.perf.dataRemark');
+INSERT INTO `sys_menu` VALUES (2101, 'menu.perf.data', 2099, 2, 'perfData', 'perfManage/perfData/index', '1', '0', 'M', '0', '1', 'perfManage:perfData:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.dataRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2102, 'menu.perf.kpiOverView', 2099, 10, 'kpiOverView', 'perfManage/kpiOverView/index', '1', '0', 'M', '1', '1', 'perfManage:perfReport:index', 'icon-gonggaodayi', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2102, 'menu.perf.kpiOverView', 2099, 10, 'kpiOverView', 'perfManage/kpiOverView/index', '1', '0', 'M', '1', '1', 'perfManage:perfReport:index', 'icon-gonggaodayi', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2103, 'menu.perf.threshold', 2099, 4, 'perfThreshold', 'perfManage/perfThreshold/index', '1', '0', 'M', '0', '0', 'perfManage:perfThreshold:index', 'icon-zhuanrang', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.perf.thresholdRemark');
+INSERT INTO `sys_menu` VALUES (2103, 'menu.perf.threshold', 2099, 4, 'perfThreshold', 'perfManage/perfThreshold/index', '1', '0', 'M', '0', '0', 'perfManage:perfThreshold:index', 'icon-zhuanrang', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.thresholdRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2104, 'menu.perf.kpi', 2099, 20, 'goldTarget', 'perfManage/goldTarget/index', '1', '1', 'M', '1', '1', 'perfManage:goldTarget:index', 'icon-soutubiao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.perf.kpiRemark');
+INSERT INTO `sys_menu` VALUES (2104, 'menu.perf.kpi', 2099, 20, 'goldTarget', 'perfManage/goldTarget/index', '1', '1', 'M', '1', '1', 'perfManage:goldTarget:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.kpiRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2105, 'menu.perf.customTarget', 2099, 99, 'customTarget', 'perfManage/customTarget/index', '1', '0', 'M', '1', '1', 'perfManage:customTarget:index', 'icon-fanhui1', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.perf.customTargetRemark');
+INSERT INTO `sys_menu` VALUES (2105, 'menu.perf.customTarget', 2099, 99, 'customTarget', 'perfManage/customTarget/index', '1', '0', 'M', '1', '1', 'perfManage:customTarget:index', 'icon-fanhui1', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.perf.customTargetRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2106, 'menu.perf.kpiKeyTarget', 2099, 12, 'kpiKeyTarget', 'perfManage/kpiKeyTarget/index', '1', '0', 'M', '1', '1', 'perfManage:kpiKeyTarget:index', 'icon-fuzhichenggong', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2106, 'menu.perf.kpiKeyTarget', 2099, 12, 'kpiKeyTarget', 'perfManage/kpiKeyTarget/index', '1', '0', 'M', '1', '1', 'perfManage:kpiKeyTarget:index', 'icon-fuzhichenggong', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2107, 'menu.mml', 0, 8, 'mmlManage', '', '1', '0', 'D', '1', '1', '', 'icon-zhizuoliucheng', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.mmlRemark');
+INSERT INTO `sys_menu` VALUES (2107, 'menu.mml', 0, 8, 'mmlManage', '', '1', '0', 'D', '1', '1', '', 'icon-zhizuoliucheng', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.mmlRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2108, 'menu.mml.ne', 2107, 1, 'neOperate', 'mmlManage/neOperate/index', '1', '1', 'M', '1', '1', 'mmlManage:neOperate:index', 'icon-huizhiguize', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.mml.neRemark');
+INSERT INTO `sys_menu` VALUES (2108, 'menu.mml.ne', 2107, 1, 'neOperate', 'mmlManage/neOperate/index', '1', '1', 'M', '1', '1', 'mmlManage:neOperate:index', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.mml.neRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2109, 'menu.mml.udm', 2107, 2, 'udmOperate', 'mmlManage/udmOperate/index', '1', '1', 'M', '1', '1', 'mmlManage:udmOperate:index', 'icon-gonggaodayi', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.mml.udmRemark');
+INSERT INTO `sys_menu` VALUES (2109, 'menu.mml.udm', 2107, 2, 'udmOperate', 'mmlManage/udmOperate/index', '1', '1', 'M', '1', '1', 'mmlManage:udmOperate:index', 'icon-gonggaodayi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.mml.udmRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2110, 'menu.mml.set', 2107, 4, 'mmlSet', 'mmlManage/mmlSet/index', '1', '0', 'M', '1', '1', 'mmlManage:mmlSet:index', 'icon-wofaqi', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.mml.setRemark');
+INSERT INTO `sys_menu` VALUES (2110, 'menu.mml.set', 2107, 4, 'mmlSet', 'mmlManage/mmlSet/index', '1', '0', 'M', '1', '1', 'mmlManage:mmlSet:index', 'icon-wofaqi', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.mml.setRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2111, 'menu.mml.omc', 2107, 3, 'omcOperate', 'mmlManage/omcOperate/index', '1', '1', 'M', '1', '1', 'mmlManage:omcOperate:index', 'icon-huizhiguize', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.mml.omcRemark');
+INSERT INTO `sys_menu` VALUES (2111, 'menu.mml.omc', 2107, 3, 'omcOperate', 'mmlManage/omcOperate/index', '1', '1', 'M', '1', '1', 'mmlManage:omcOperate:index', 'icon-huizhiguize', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.mml.omcRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2112, 'menu.dashboard.sgwcCDR', 2140, 12, 'sgwcCDR', 'dashboard/sgwcCDR/index', '1', '0', 'M', '1', '1', 'sgwc#cdr:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2112, 'menu.dashboard.sgwcCDR', 2140, 12, 'sgwcCDR', 'dashboard/sgwcCDR/index', '1', '0', 'M', '1', '1', 'sgwc:cdr:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'sgwc');
-INSERT INTO `sys_menu` VALUES (2113, 'menu.security', 0, 14, 'security', '', '1', '0', 'D', '1', '1', '', 'icon-suofang', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.securityRemark');
+INSERT INTO `sys_menu` VALUES (2113, 'menu.security', 0, 14, 'security', '', '1', '0', 'D', '1', '1', '', 'icon-suofang', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.securityRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2114, 'menu.system.systemSet', 1, 60, 'setting', 'system/setting/index', '1', '1', 'M', '1', '1', 'system:setting:index', 'icon-piliang', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.systemSetRemark');
+INSERT INTO `sys_menu` VALUES (2114, 'menu.system.systemSet', 1, 60, 'setting', 'system/setting/index', '1', '1', 'M', '1', '1', 'system:setting:index', 'icon-piliang', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.systemSetRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2115, 'menu.system.systemResource', 1, 6, 'monitor', 'monitor/monitor/index', '1', '1', 'M', '1', '1', 'monitor:monitor:info', 'icon-soutubiao', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.systemResourceRemark');
+INSERT INTO `sys_menu` VALUES (2115, 'menu.system.systemResource', 1, 6, 'monitor', 'monitor/monitor/index', '1', '1', 'M', '1', '1', 'monitor:monitor:info', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.systemResourceRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2116, 'menu.dashboard.smscCDR.content', 2157, 1, '', '', '1', '1', 'B', '1', '1', 'cdr:smsc:content', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2116, 'menu.dashboard.smscCDR.content', 2157, 1, '', '', '1', '1', 'B', '1', '1', 'cdr:smsc:content', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2117, 'menu.common.delete', 2140, 1, '', '', '1', '1', 'B', '1', '1', 'cdr:ne:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2117, 'menu.common.delete', 2140, 1, '', '', '1', '1', 'B', '1', '1', 'cdr:ne:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2118, 'menu.dashboard.smfCDRByIMSI', 2140, 7, 'smfCDRByIMSI', 'dashboard/smfCDRByIMSI/index', '1', '0', 'M', '1', '1', 'smf#cdr:index', 'icon-gerenzhanghu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2118, 'menu.dashboard.smfCDRByIMSI', 2140, 7, 'smfCDRByIMSI', 'dashboard/smfCDRByIMSI/index', '1', '0', 'M', '1', '1', 'smf:cdr:index', 'icon-gerenzhanghu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'smf');
--- INSERT INTO `sys_menu` VALUES (2119, 'menu.ueUser.n3iwf', 5, 8, 'n3iwf', 'neUser/n3iwf/index', '1', '0', 'M', '0', '1', 'neUser:n3iwf:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2121, 'menu.system.user.editRole', 100, 8, '', '', '1', '1', 'B', '1', '1', 'system:user:editRole', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
--- INSERT INTO `sys_menu` VALUES (2120, 'menu.ueUser.pcf', 5, 9, 'pcf', 'neUser/pcf/index', '1', '0', 'M', '1', '1', 'neUser:pcf:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2122, 'menu.system.setting.i18n', 2114, 1, '', '', '1', '1', 'B', '1', '1', 'system:setting:i18n', '#', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.system.setting.i18nRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2121, 'menu.system.user.editRole', 100, 8, '', '', '1', '1', 'B', '1', '1', 'system:user:editRole', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2123, 'menu.log.neFile', 2089, 9, 'neFile', 'ne/neFile/index', '1', '0', 'M', '1', '1', 'ne:neFile:index', 'icon-tubiaohuizhi', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2122, 'menu.system.setting.i18n', 2114, 1, '', '', '1', '1', 'B', '1', '1', 'system:setting:i18n', '#', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.system.setting.i18nRemark');
+INSERT INTO `sys_menu` VALUES (2126, 'menu.monitor.topology', 2130, 10, 'topology', 'monitor/topology/index', '1', '0', 'M', '1', '1', 'monitor:topology:index', 'icon-fangda', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2123, 'menu.log.neFile', 2089, 9, 'neFile', 'ne/neFile/index', '1', '0', 'M', '1', '1', 'ne:neFile:index', 'icon-tubiaohuizhi', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2127, 'menu.monitor.topologyBuild', 2130, 30, 'topologyBuild', 'monitor/topologyBuild/index', '1', '0', 'M', '1', '1', 'monitor:topologyBuild:index', 'icon-fangda', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
--- INSERT INTO `sys_menu` VALUES (2124, 'menu.neUser.nssf', 5, 10, 'nssf', 'neUser/nssf/index', '1', '0', 'M', '0', '1', 'neUser:nssf:index', 'icon-daimayingyong', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2128, 'menu.monitor.topologyArchitecture', 2130, 20, 'topologyArchitecture', 'monitor/topologyArchitecture/index', '1', '0', 'M', '1', '1', 'monitor:topologyArchitecture:index', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
--- INSERT INTO `sys_menu` VALUES (2125, 'menu.neUser.nssfAmf', 5, 11, 'nssfAmf', 'neUser/nssfAmf/index', '1', '0', 'M', '0', '1', 'neUser:nssfAmf:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2129, 'menu.alarm', 2087, 20, 'alarm', '', '1', '0', 'D', '1', '1', '', 'icon-jinggao', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2126, 'menu.monitor.topology', 2130, 10, 'topology', 'monitor/topology/index', '1', '0', 'M', '1', '1', 'monitor:topology:index', 'icon-fangda', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2130, 'menu.topology', 2087, 10, 'topology', '', '1', '0', 'D', '1', '1', '', 'icon-anzhuo', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2127, 'menu.monitor.topologyBuild', 2130, 30, 'topologyBuild', 'monitor/topologyBuild/index', '1', '0', 'M', '1', '1', 'monitor:topologyBuild:index', 'icon-fangda', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2131, 'menu.dashboard', 2087, 15, 'dashboard', '', '1', '0', 'D', '1', '1', '', 'icon-soutubiao', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2128, 'menu.monitor.topologyArchitecture', 2130, 20, 'topologyArchitecture', 'monitor/topologyArchitecture/index', '1', '0', 'M', '1', '1', 'monitor:topologyArchitecture:index', 'icon-soutubiao', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2132, 'menu.dashboard.overview', 2131, 1, 'overview', 'dashboard/overview/index', '1', '0', 'M', '1', '1', 'dashboard:overview:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2129, 'menu.alarm', 2087, 20, 'alarm', '', '1', '0', 'D', '1', '1', '', 'icon-jinggao', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2133, 'menu.dashboard.imsCDR', 2140, 3, 'imsCDR', 'dashboard/imsCDR/index', '1', '0', 'M', '1', '1', 'ims:cdr:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'ims');
-INSERT INTO `sys_menu` VALUES (2130, 'menu.topology', 2087, 10, 'topology', '', '1', '0', 'D', '1', '1', '', 'icon-anzhuo', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2135, 'menu.ne.neHost', 4, 15, 'neHost', 'ne/neHost/index', '1', '1', 'M', '1', '0', 'ne:neHost:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2131, 'menu.dashboard', 2087, 15, 'dashboard', '', '1', '0', 'D', '1', '1', '', 'icon-soutubiao', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2136, 'menu.ne.neHostCommand', 4, 18, 'neHostCommand', 'ne/neHostCommand/index', '1', '0', 'M', '1', '0', 'ne:neHostCommand:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2132, 'menu.dashboard.overview', 2131, 1, 'overview', 'dashboard/overview/index', '1', '0', 'M', '1', '1', 'dashboard:overview:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2137, 'menu.ne.neInfo', 4, 10, 'neInfo', 'ne/neInfo/index', '1', '0', 'M', '1', '1', 'ne:neInfo:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2133, 'menu.dashboard.imsCDR', 2140, 3, 'imsCDR', 'dashboard/imsCDR/index', '1', '0', 'M', '1', '1', 'ims#cdr:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2138, 'menu.dashboard.amfUE', 2141, 1, 'amfUE', 'dashboard/amfUE/index', '1', '0', 'M', '1', '1', 'amf:ue:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'amf');
-INSERT INTO `sys_menu` VALUES (2135, 'menu.ne.neHost', 4, 15, 'neHost', 'ne/neHost/index', '1', '1', 'M', '1', '0', 'ne:neHost:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2140, 'menu.monitor.cdr', 2089, 10, 'cdr', '', '1', '0', 'D', '1', '1', '', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2136, 'menu.ne.neHostCommand', 4, 18, 'neHostCommand', 'ne/neHostCommand/index', '1', '0', 'M', '1', '0', 'ne:neHostCommand:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2141, 'menu.monitor.event', 2089, 20, 'event', '', '1', '0', 'D', '1', '1', '', 'icon-gengduo', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2137, 'menu.ne.neInfo', 4, 10, 'neInfo', 'ne/neInfo/index', '1', '0', 'M', '1', '1', 'ne:neInfo:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2142, 'menu.ne.neQuickSetup', 4, 40, 'neQuickSetup', 'ne/neQuickSetup/index', '1', '1', 'M', '1', '1', 'ne:neQuickSetup:list', 'icon-wofaqi', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2138, 'menu.dashboard.amfUE', 2141, 1, 'amfUE', 'dashboard/amfUE/index', '1', '0', 'M', '1', '1', 'amf#ue:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2143, 'menu.ne.neLicense', 4, 20, 'neLicense', 'ne/neLicense/index', '1', '0', 'M', '1', '1', 'ne:neLicense:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2140, 'menu.monitor.cdr', 2089, 10, 'cdr', '', '1', '0', 'D', '1', '1', '', 'icon-tubiaoku', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2144, 'menu.ne.neSoftware', 4, 23, 'neSoftware', 'ne/neSoftware/index', '1', '0', 'M', '1', '1', 'ne:neSoftware:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2141, 'menu.monitor.event', 2089, 20, 'event', '', '1', '0', 'D', '1', '1', '', 'icon-gengduo', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2145, 'menu.ne.neVersion', 4, 26, 'neVersion', 'ne/neVersion/index', '1', '0', 'M', '1', '1', 'ne:neVersion:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2142, 'menu.ne.neQuickSetup', 4, 40, 'neQuickSetup', 'ne/neQuickSetup/index', '1', '1', 'M', '1', '1', 'ne:neQuickSetup:list', 'icon-wofaqi', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2146, 'menu.ne.neConfig', 4, 28, 'neConfig', 'ne/neConfig/index', '1', '0', 'M', '1', '1', 'ne:neConfig:list', 'icon-wofaqi', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2143, 'menu.ne.neLicense', 4, 20, 'neLicense', 'ne/neLicense/index', '1', '0', 'M', '1', '1', 'ne:neLicense:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2147, 'menu.fault.event', 2129, 3, 'event', 'faultManage/event/index', '1', '0', 'M', '1', '1', 'faultManage:event:index', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2144, 'menu.ne.neSoftware', 4, 23, 'neSoftware', 'ne/neSoftware/index', '1', '0', 'M', '1', '1', 'ne:neSoftware:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2148, 'menu.dashboard.smfCDR', 2140, 6, 'smfCDR', 'dashboard/smfCDR/index', '1', '0', 'M', '1', '1', 'smf:cdr:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'smf');
-INSERT INTO `sys_menu` VALUES (2145, 'menu.ne.neVersion', 4, 26, 'neVersion', 'ne/neVersion/index', '1', '0', 'M', '1', '1', 'ne:neVersion:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2149, 'menu.dashboard.mmeUE', 2141, 5, 'mmeUE', 'dashboard/mmeUE/index', '1', '0', 'M', '1', '1', 'mme:ue:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'mme');
-INSERT INTO `sys_menu` VALUES (2146, 'menu.ne.neConfig', 4, 28, 'neConfig', 'ne/neConfig/index', '1', '0', 'M', '1', '1', 'ne:neConfig:list', 'icon-wofaqi', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2150, 'menu.system.user.editPost', 100, 9, '', '', '1', '1', 'B', '1', '1', 'system:user:editPost', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2147, 'menu.fault.event', 2129, 3, 'event', 'faultManage/event/index', '1', '0', 'M', '1', '1', 'faultManage:event:index', 'icon-tubiaoku', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2151, 'menu.system.setting.doc', 2114, 2, '', '', '1', '1', 'B', '1', '1', 'system:setting:doc', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2148, 'menu.dashboard.smfCDR', 2140, 6, 'smfCDR', 'dashboard/smfCDR/index', '1', '0', 'M', '1', '1', 'smf#cdr:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2152, 'menu.system.setting.official', 2114, 3, '', '', '1', '1', 'B', '1', '1', 'system:setting:official', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2149, 'menu.dashboard.mmeUE', 2141, 5, 'mmeUE', 'dashboard/mmeUE/index', '1', '0', 'M', '1', '1', 'mme#ue:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2153, 'menu.system.setting.lock', 2114, 4, '', '', '1', '1', 'B', '1', '1', 'system:setting:lock', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2150, 'menu.system.user.editPost', 100, 9, '', '', '1', '1', 'B', '1', '1', 'system:user:editPost', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2154, 'menu.ne.neConfigBackup', 4, 29, 'neConfigBackup', 'ne/neConfigBackup/index', '1', '0', 'M', '1', '1', 'ne:neConfigBackup:list', 'icon-fuzhidaima', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2151, 'menu.system.setting.doc', 2114, 2, '', '', '1', '1', 'B', '1', '1', 'system:setting:doc', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2155, 'menu.common.delete', 2154, 1, '#', '', '1', '1', 'B', '1', '1', 'ne:neConfigBackup:remove', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2152, 'menu.system.setting.official', 2114, 3,'', '', '1', '1', 'B', '1', '1', 'system:setting:official', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2156, 'menu.common.edit', 2154, 2, '#', '', '1', '1', 'B', '1', '1', 'ne:neConfigBackup:edit', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2153, 'menu.system.setting.lock', 2114, 4, '', '', '1', '1', 'B', '1', '1', 'system:setting:lock', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2157, 'menu.dashboard.smscCDR', 2140, 9, 'smscCDR', 'dashboard/smscCDR/index', '1', '0', 'M', '1', '1', 'smsc:cdr:index', 'icon-paixu', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '1', 'smsc');
-INSERT INTO `sys_menu` VALUES (2154, 'menu.ne.neConfigBackup', 4, 29, 'neConfigBackup', 'ne/neConfigBackup/index', '1', '0', 'M', '1', '1', 'ne:neConfigBackup:list', 'icon-fuzhidaima', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2158, 'menu.trace.pcapFile', 2083, 12, 'pcap/inline/file', 'traceManage/pcap/file', '1', '0', 'M', '0', '1', 'traceManage:pcap:index', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2155, 'menu.common.delete', 2154, 1, '#', '', '1', '1', 'B', '1', '1', 'ne:neConfigBackup:remove', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2159, 'menu.log.exportFile', 2089, 100, 'exportFile', 'logManage/exportFile/index', '1', '0', 'M', '1', '1', 'logManage:exportFile:index', 'icon-wenjian', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2156, 'menu.common.edit', 2154, 2, '#', '', '1', '1', 'B', '1', '1', 'ne:neConfigBackup:edit', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2160, 'menu.perf.kpiCReport', 2099, 100, 'kpiCReport', 'perfManage/kpiCReport/index', '1', '0', 'M', '1', '1', 'perfManage:kpiCReport:index', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2157, 'menu.dashboard.smscCDR', 2140, 9, 'smscCDR', 'dashboard/smscCDR/index', '1', '0', 'M', '1', '1', 'smsc#cdr:index', 'icon-paixu', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2161, 'menu.trace.taskHLR', 2083, 6, 'taskHLR', 'traceManage/task-hlr/index', '1', '0', 'M', '0', '1', 'traceManage:taskHLR:index', 'icon-chexiao', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2158, 'menu.trace.pcapFile', 2083, 12, 'pcap/inline/file', 'traceManage/pcap/file', '1', '0', 'M', '0', '1', 'traceManage:pcap:index', '#', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2162, 'menu.trace.taskAnalyze', 2083, 2, 'task/inline/analyze', 'traceManage/task/analyze', '1', '0', 'M', '0', '1', 'traceManage:task:analyze', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2159, 'menu.log.exportFile', 2089, 100, 'exportFile', 'logManage/exportFile/index', '1', '0', 'M', '1', '1', 'logManage:exportFile:index', 'icon-wenjian', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2163, 'menu.trace.tshark', 2083, 14, 'tshark', 'traceManage/tshark/index', '1', '0', 'M', '1', '1', 'traceManage:tshark:index', 'icon-gengduo', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2160, 'menu.perf.kpiCReport', 2099, 100, 'kpiCReport', 'perfManage/kpiCReport/index', '1', '0', 'M', '1', '1', 'perfManage:kpiCReport:index', 'icon-tubiaoku', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2164, 'menu.trace.wireshark', 2083, 16, 'wireshark', 'traceManage/wireshark/index', '1', '0', 'M', '1', '1', 'traceManage:wireshark:index', 'icon-gengduo', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2161, 'menu.trace.taskHLR', 2083, 6, 'taskHLR', 'traceManage/task-hlr/index', '1', '0', 'M', '0', '1', 'traceManage:taskHLR:index', 'icon-chexiao', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2165, 'menu.ne.neOverview', 4, 1, 'neOverview', 'configManage/neOverview/index', '1', '0', 'M', '1', '1', 'configManage:neOverview:index', 'icon-tubiaoku', '0', 'system', 1728641403588, 'system', 1728641403588, 'menu.ne.neOverviewRemark', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2162, 'menu.trace.taskAnalyze', 2083, 2, 'task/inline/analyze', 'traceManage/task/analyze', '1', '0', 'M', '0', '1', 'traceManage:task:analyze', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2166, 'menu.dashboard.overview.smfUeNum', 2132, 4, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:smfUeNum', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2163, 'menu.trace.tshark', 2083, 14, 'tshark', 'traceManage/tshark/index', '1', '0', 'M', '1', '1', 'traceManage:tshark:index', 'icon-gengduo', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2167, 'menu.dashboard.overview.imsUeNum', 2132, 2, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:imsUeNum', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2164, 'menu.trace.wireshark', 2083, 16, 'wireshark', 'traceManage/wireshark/index', '1', '0', 'M', '1', '1', 'traceManage:wireshark:index', 'icon-gengduo', '0', 'system', 1728641403588,'system', 1728641403588, '');
+INSERT INTO `sys_menu` VALUES (2168, 'menu.dashboard.overview.gnbBase', 2132, 6, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:gnbBase', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2165, 'menu.ne.neOverview', 4, 1, 'neOverview', 'configManage/neOverview/index', '1', '0', 'M', '1', '1', 'configManage:neOverview:index', 'icon-tubiaoku', '0', 'system', 1728641403588,'system', 1728641403588, 'menu.ne.neOverviewRemark');
+INSERT INTO `sys_menu` VALUES (2169, 'menu.dashboard.overview.enbBase', 2132, 8, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:enbBase', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '', '0', '0', '');
-INSERT INTO `sys_menu` VALUES (2166, 'menu.dashboard.overview.smfUeNum', 2132, 4, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:smfUeNum', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '');
-INSERT INTO `sys_menu` VALUES (2167, 'menu.dashboard.overview.imsUeNum', 2132, 2, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:imsUeNum', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '');
-INSERT INTO `sys_menu` VALUES (2168, 'menu.dashboard.overview.gnbBase', 2132, 6, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:gnbBase', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '');
-INSERT INTO `sys_menu` VALUES (2169, 'menu.dashboard.overview.enbBase', 2132, 8, '', '', '1', '1', 'B', '1', '1', 'dashboard:overview:enbBase', '#', '0', 'system', 1728641403588, 'system', 1728641403588, '');
 
 SET FOREIGN_KEY_CHECKS = 1;
 

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

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

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

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

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

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唯一主键',
+  UNIQUE KEY `uk_volte_imsi_ne` (`ne_uid`,`imsi`,`msisdn`) USING BTREE COMMENT 'imsi_msisdn_neid唯一主键',
-  KEY `idx_volte_tag` (`tag`) USING BTREE COMMENT 'tag索引'
+  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

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) 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

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) 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

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 '',
+  `core_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '核心网唯一标识',
-  `ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
+  `ne_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '网元唯一标识',
-  `rm_uid` varchar(32) 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

features/cdr/cdrevent.go

@@ -47,8 +47,8 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// 是否存在网元
-	neInfo := neService.NewNeInfo.FindByRmuid(body.RmUID)
+	neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", body.RmUID)
-	if neInfo.NeType != body.NeType || neInfo.RmUID != 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)

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... ")
 

features/cm/param.go

@@ -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)
-}

features/event/event.go

@@ -80,8 +80,8 @@ func PostUEEventFromAMF(c *gin.Context) {
 	}
 
 	// 是否存在网元
-	neInfo := neService.NewNeInfo.FindByRmuid(data.RmUID)
+	neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", data.RmUID)
-	if neInfo.NeType != "AMF" || neInfo.RmUID != 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)
+	neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", body.RmUID)
-	if neInfo.NeType != body.NeType || neInfo.RmUID != 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)

features/fm/alarm.go

@@ -18,9 +18,9 @@ import (
 	"be.ems/src/framework/utils/date"
 	neDataModel "be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
-	neFetchlink "be.ems/src/modules/network_element/fetch_link"
 	neModel "be.ems/src/modules/network_element/model"
 	neService "be.ems/src/modules/network_element/service"
+	neFetchlink "be.ems/src/modules/network_link/fetch_link"
 	traceService "be.ems/src/modules/trace/service"
 	wsService "be.ems/src/modules/ws/service"
 )
@@ -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

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,

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,

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,
+		NeUID:       taskNe.RmUID,
-		RmUid:       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,
+			"coreUid":    kpiData.CoreUID,
-			"rmUID":      kpiData.RmUid,
+			"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)
+		neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.NeUID)
-		if neInfo.RmUID == kpiData.RmUid {
+		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)
 			}
 		}
 	}
@@ -254,8 +253,8 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 {
 	KpiValuesByte, _ := json.Marshal(KpiValues)
 	kpiData := neDataModel.KpiCReport{
 		NeType:      taskNe.NeType,
-		NeName:      taskNe.NEName,
+		CoreUID:     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"),
@@ -269,8 +268,8 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 {
 		// 指标事件对象
 		kpiEvent := map[string]any{
 			"neType":     kpiData.NeType,
-			"neName":     kpiData.NeName,
+			"neName":     kpiData.NeUID,
-			"rmUID":      kpiData.RmUid,
+			"rmUID":      kpiData.NeUID,
 			"startIndex": kpiData.Index,
 			"timeGroup":  kpiData.CreatedAt,
 			// kip_id ...
@@ -280,10 +279,10 @@ func saveKPIDataC(kpiReport KpiReport, index int64) int64 {
 		}
 
 		// 发送到匹配的网元
-		neInfo := neService.NewNeInfo.FindByRmuid(kpiData.RmUid)
+		neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", kpiData.NeUID)
-		if neInfo.RmUID == kpiData.RmUid {
+		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
@@ -385,12 +384,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,
@@ -419,11 +418,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)

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 != "" {
+	if neInfo.NeUID == neId && neInfo.NeUID != "" {
-		requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
+		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)
+	neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("*", body.RmUID)
-	if neInfo.RmUID != 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,
+			CoreUID:  neInfo.CoreUID,
-			RmUid:    neInfo.RmUID,
+			NeUID:    neInfo.NeUID,
 			Address:  v.Address,
 			Name:     v.Name,
 			Position: v.Position,

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

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

local/omc.yaml

@@ -51,7 +51,7 @@ database:
       port: 13306
       username: "root"
       password: "1000omc@kp!"
-      database: "omc_db_mainv2"
+      database: "omc_db_core"
       logging: true
     # SQLite database instance
     lite:

src/app.go

@@ -11,10 +11,12 @@ import (
 	"be.ems/src/modules/auth"
 	"be.ems/src/modules/chart"
 	"be.ems/src/modules/common"
+	"be.ems/src/modules/core"
 	"be.ems/src/modules/crontask"
 	"be.ems/src/modules/monitor"
 	networkdata "be.ems/src/modules/network_data"
 	networkelement "be.ems/src/modules/network_element"
+	networklink "be.ems/src/modules/network_link"
 	"be.ems/src/modules/oauth2"
 	"be.ems/src/modules/system"
 	"be.ems/src/modules/tool"
@@ -89,10 +91,15 @@ func ModulesRoute(app *gin.Engine) {
 	// 通用模块
 	common.Setup(app)
 
+	// 核心网模块
+	core.Setup(app)
+
 	// 网元功能模块
 	networkelement.Setup(app)
 	// 网元数据模块
 	networkdata.Setup(app)
+	// 网元直连模块
+	networklink.Setup(app)
 
 	// 跟踪模块
 	trace.Setup(app)

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()
+	interfaces, _ := net.Interfaces()
-	if err != nil {
+	for _, iface := range interfaces {
-		panic(err)
+		// 检查接口是否有 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)
+	appKey := config.Get("aes.appKey").(string)
-	contentDe, err := crypto.AESDecryptBase64(content, hostKey)
+	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)
+	appKey := config.Get("aes.appKey").(string)
-	contentEn, err := crypto.AESEncryptBase64(string(jsonByte), hostKey)
+	contentEn, err := crypto.AESEncryptBase64(string(jsonByte), appKey)
 	if err != nil {
 		logger.Errorf("insert encrypt: %v", err.Error())
 		return fmt.Errorf("encrypt fail")

src/modules/core/controller/core_info.go

@@ -0,0 +1,197 @@
+package controller
+
+import (
+	"fmt"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/modules/core/model"
+	"be.ems/src/modules/core/service"
+
+	"github.com/gin-gonic/gin"
+)
+
+// 实例化控制层 CoreInfoController 结构体
+var NewCoreInfo = &CoreInfoController{
+	coreInfoService: service.NewCoreInfo,
+}
+
+// 核心网信息请求
+//
+// PATH /core
+type CoreInfoController struct {
+	coreInfoService *service.CoreInfo //核心网信息服务
+}
+
+// 核心网信息列表全部无分页
+//
+// GET /list/all
+//
+//	@Tags			core/info
+//	@Accept			json
+//	@Produce		json
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
+//	@Param			name	query		string	true	"name"		default(5AKF59BZ)
+//	@Param			sn		query		string	true	"sn"
+//	@Success		200			{object}	object	"Response Results"
+//	@Security		TokenAuth
+//	@Summary		The list of network element information is all unpaginated
+//	@Description	The list of network element information is all unpaginated
+//	@Router			/core/info/list/all [get]
+func (s CoreInfoController) ListAll(c *gin.Context) {
+	language := reqctx.AcceptLanguage(c)
+	var querys struct {
+		CoreUID string `form:"coreUid"` // 核心网唯一标识
+		Name    string `form:"name"`    // 名称
+		SN      string `form:"sn"`
+	}
+	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
+	}
+
+	// 查询实体参数
+	core := model.CoreInfo{}
+	if querys.CoreUID != "" {
+		core.CoreUID = querys.CoreUID
+	}
+	if querys.Name != "" {
+		core.Name = querys.Name
+	}
+	if querys.SN != "" {
+		core.SN = querys.SN
+	}
+	neList := s.coreInfoService.Find(core)
+	if len(neList) == 0 {
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	c.JSON(200, resp.OkData(neList))
+}
+
+// 核心网信息列表
+//
+// GET /list
+func (s CoreInfoController) List(c *gin.Context) {
+	query := reqctx.QueryMap(c)
+	rows, total := s.coreInfoService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
+}
+
+// 核心网信息信息
+//
+// GET /:id
+func (s CoreInfoController) Info(c *gin.Context) {
+	id := parse.Number(c.Param("id"))
+	if id <= 0 {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+		return
+	}
+
+	neHost := s.coreInfoService.FindById(id)
+	if neHost.ID != id {
+		c.JSON(200, resp.ErrMsg("not found data"))
+		return
+	}
+
+	c.JSON(200, resp.OkData(neHost))
+}
+
+// 核心网信息新增
+//
+// POST /
+func (s CoreInfoController) Add(c *gin.Context) {
+	var body model.CoreInfo
+	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
+	}
+
+	// 检查属性值唯一
+	uniqueInfo := s.coreInfoService.CheckUniqueGroupTitle(body.Name, body.SN, 0)
+	if !uniqueInfo {
+		c.JSON(200, resp.ErrMsg("name/SN already exists"))
+		return
+	}
+
+	body.CreateBy = reqctx.LoginUserToUserName(c)
+	insertId := s.coreInfoService.Insert(body)
+	if insertId > 0 {
+		c.JSON(200, resp.Ok(nil))
+		return
+	}
+	c.JSON(200, resp.Err(nil))
+}
+
+// 核心网信息修改
+//
+// PUT /
+func (s CoreInfoController) Edit(c *gin.Context) {
+	var body model.CoreInfo
+	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
+	}
+
+	// 检查属性值唯一
+	uniqueHostCmd := s.coreInfoService.CheckUniqueGroupTitle(body.Name, body.SN, body.ID)
+	if !uniqueHostCmd {
+		c.JSON(200, resp.ErrMsg("name/SN already exists"))
+		return
+	}
+
+	// 检查是否存在
+	coreInfo := s.coreInfoService.FindById(body.ID)
+	if coreInfo.ID != body.ID {
+		c.JSON(200, resp.ErrMsg("not found data"))
+		return
+	}
+
+	coreInfo.Name = body.Name
+	coreInfo.SN = body.SN
+	coreInfo.TimeZone = body.TimeZone
+	coreInfo.Longitude = body.Longitude
+	coreInfo.Latitude = body.Latitude
+	coreInfo.Address = body.Address
+	coreInfo.Remark = body.Remark
+	body.UpdateBy = reqctx.LoginUserToUserName(c)
+	rows := s.coreInfoService.Update(coreInfo)
+	if rows > 0 {
+		c.JSON(200, resp.Ok(nil))
+		return
+	}
+	c.JSON(200, resp.Err(nil))
+}
+
+// 核心网信息删除
+//
+// DELETE /:id
+func (s CoreInfoController) Remove(c *gin.Context) {
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+		return
+	}
+
+	// 处理字符转id数组后去重
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
+	}
+
+	rows, err := s.coreInfoService.DeleteByIds(ids)
+	if err != nil {
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, resp.OkMsg(msg))
+}

src/modules/core/core.go

@@ -0,0 +1,51 @@
+package core
+
+import (
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/middleware"
+	"be.ems/src/framework/middleware/collectlogs"
+	"be.ems/src/modules/core/controller"
+
+	"github.com/gin-gonic/gin"
+)
+
+// 模块路由注册
+func Setup(router *gin.Engine) {
+	logger.Infof("开始加载 ====> core 模块路由")
+
+	// 核心网信息
+	coreInfoGroup := router.Group("/core/info")
+	{
+		coreInfoGroup.GET("/list/all",
+			middleware.AuthorizeUser(nil),
+			controller.NewCoreInfo.ListAll,
+		)
+		coreInfoGroup.GET("/list",
+			middleware.AuthorizeUser(nil),
+			controller.NewCoreInfo.List,
+		)
+		coreInfoGroup.GET("/:id",
+			middleware.CryptoApi(false, true),
+			middleware.AuthorizeUser(nil),
+			controller.NewCoreInfo.Info,
+		)
+		coreInfoGroup.POST("",
+			middleware.CryptoApi(true, true),
+			middleware.AuthorizeUser(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.coreInfo", collectlogs.BUSINESS_TYPE_INSERT)),
+			controller.NewCoreInfo.Add,
+		)
+		coreInfoGroup.PUT("",
+			middleware.CryptoApi(true, true),
+			middleware.AuthorizeUser(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.coreInfo", collectlogs.BUSINESS_TYPE_UPDATE)),
+			controller.NewCoreInfo.Edit,
+		)
+		coreInfoGroup.DELETE("/:id",
+			middleware.AuthorizeUser(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.coreInfo", collectlogs.BUSINESS_TYPE_DELETE)),
+			controller.NewCoreInfo.Remove,
+		)
+	}
+
+}

src/modules/core/model/core_info.go

@@ -0,0 +1,24 @@
+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"`               // 核心网唯一标识
+	Name       string  `json:"name" gorm:"column:name"`                      // 核心网名称
+	SN         string  `json:"sn" gorm:"column:sn"`                          // 核心网序列号
+	OmcId      string  `json:"omcId" gorm:"column:omc_id"`                   // OMC安装生成的唯一编码
+	TimeZone   string  `json:"timeZone" gorm:"column:time_zone"`             // 时区 Asia/Hong_Kong
+	Longitude  float64 `json:"longitude" gorm:"column:longitude"`            // 经度 -180 to 180
+	Latitude   float64 `json:"latitude" gorm:"column:latitude"`              // 纬度 -90 to 90
+	Address    string  `json:"address" gorm:"column:address"`                // 地址
+	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"
+}

src/modules/core/repository/core_info.go

@@ -0,0 +1,157 @@
+package repository
+
+import (
+	"fmt"
+	"time"
+
+	"be.ems/src/framework/database/db"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/core/model"
+)
+
+// 实例化数据层 CoreInfo 结构体
+var NewCoreInfo = &CoreInfo{}
+
+// CoreInfo 核心网信息 数据层处理
+type CoreInfo struct{}
+
+// SelectByPage 分页查询集合
+func (r CoreInfo) SelectByPage(query map[string]string) ([]model.CoreInfo, int64) {
+	tx := db.DB("").Model(&model.CoreInfo{})
+	// 查询条件拼接
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
+	}
+	if v, ok := query["sn"]; ok && v != "" {
+		tx = tx.Where("sn = ?", v)
+	}
+	if v, ok := query["name"]; ok && v != "" {
+		tx = tx.Where("name like ?", fmt.Sprintf("%s%%", v))
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.CoreInfo{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// Select 查询集合
+func (r CoreInfo) Select(param model.CoreInfo) []model.CoreInfo {
+	tx := db.DB("").Model(&model.CoreInfo{})
+	// 查询条件拼接
+	if param.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", param.CoreUID)
+	}
+	if param.Name != "" {
+		tx = tx.Where("name = ?", param.Name)
+	}
+	if param.SN != "" {
+		tx = tx.Where("sn = ?", param.SN)
+	}
+
+	// 查询数据
+	rows := []model.CoreInfo{}
+	if err := tx.Order("id asc").Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// SelectByIds 通过ID查询
+func (r CoreInfo) SelectByIds(ids []int64) []model.CoreInfo {
+	rows := []model.CoreInfo{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := db.DB("").Model(&model.CoreInfo{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// Insert 新增信息
+func (r CoreInfo) Insert(param model.CoreInfo) int64 {
+	if param.CreateBy != "" {
+		ms := time.Now().UnixMilli()
+		param.CreateTime = ms
+		param.UpdateTime = ms
+		param.UpdateBy = param.CreateBy
+	}
+	// 执行插入
+	if err := db.DB("").Create(&param).Error; err != nil {
+		logger.Errorf("insert err => %v", err.Error())
+		return 0
+	}
+	return param.ID
+}
+
+// Update 修改信息
+func (r CoreInfo) Update(param model.CoreInfo) int64 {
+	if param.ID == 0 {
+		return 0
+	}
+	param.UpdateTime = time.Now().UnixMilli()
+	tx := db.DB("").Model(&model.CoreInfo{})
+	// 构建查询条件
+	tx = tx.Where("id = ?", param.ID)
+	tx = tx.Omit("id")
+	// 执行更新
+	if err := tx.Updates(param).Error; err != nil {
+		logger.Errorf("update err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// DeleteByIds 批量删除信息
+func (r CoreInfo) DeleteByIds(ids []int64) int64 {
+	if len(ids) <= 0 {
+		return 0
+	}
+	tx := db.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.CoreInfo{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// CheckUnique 检查信息是否唯一 返回数据ID
+func (r CoreInfo) CheckUnique(param model.CoreInfo) int64 {
+	tx := db.DB("").Model(&model.CoreInfo{})
+	// 查询条件拼接
+	if param.Name != "" {
+		tx = tx.Where("name = ?", param.Name)
+	}
+	if param.SN != "" {
+		tx = tx.Where("sn = ?", param.SN)
+	}
+
+	// 查询数据
+	var id int64 = 0
+	if err := tx.Select("id").Limit(1).Find(&id).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return id
+	}
+	return id
+}

src/modules/core/service/core_info.go

@@ -0,0 +1,86 @@
+package service
+
+import (
+	"fmt"
+	"strings"
+
+	"be.ems/src/framework/utils/generate"
+	"be.ems/src/framework/utils/machine"
+	"be.ems/src/modules/core/model"
+	"be.ems/src/modules/core/repository"
+)
+
+// 实例化服务层 CoreInfo 结构体
+var NewCoreInfo = &CoreInfo{
+	coreInfoRepository: repository.NewCoreInfo,
+}
+
+// CoreInfo 核心网信息 服务层处理
+type CoreInfo struct {
+	coreInfoRepository *repository.CoreInfo // 核心网信息表
+}
+
+// FindByPage 分页查询列表数据
+func (r CoreInfo) FindByPage(query map[string]string) ([]model.CoreInfo, int64) {
+	return r.coreInfoRepository.SelectByPage(query)
+}
+
+// Find 查询列表
+func (r CoreInfo) Find(core model.CoreInfo) []model.CoreInfo {
+	return r.coreInfoRepository.Select(core)
+}
+
+// FindById 通过ID查询
+func (r CoreInfo) FindById(id int64) model.CoreInfo {
+	if id <= 0 {
+		return model.CoreInfo{}
+	}
+	rows := r.coreInfoRepository.SelectByIds([]int64{id})
+	if len(rows) > 0 {
+		return rows[0]
+	}
+	return model.CoreInfo{}
+}
+
+// Insert 新增信息
+func (r CoreInfo) Insert(param model.CoreInfo) int64 {
+	param.CoreUID = strings.ToUpper(generate.Code(8))
+	if param.OmcId == "" {
+		param.OmcId = machine.Code
+	}
+
+	return r.coreInfoRepository.Insert(param)
+}
+
+// Update 修改信息
+func (r CoreInfo) Update(param model.CoreInfo) int64 {
+	return r.coreInfoRepository.Update(param)
+}
+
+// DeleteByIds 批量删除信息
+func (r CoreInfo) DeleteByIds(ids []int64) (int64, error) {
+	// 检查是否存在
+	rows := r.coreInfoRepository.SelectByIds(ids)
+	if len(rows) <= 0 {
+		return 0, fmt.Errorf("coreInfo.noData")
+	}
+
+	if len(rows) == len(ids) {
+		rows := r.coreInfoRepository.DeleteByIds(ids)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
+}
+
+// CheckUniqueGroupTitle 校验唯一名称和序号
+func (r CoreInfo) CheckUniqueGroupTitle(name, sn string, id int64) bool {
+	uniqueId := r.coreInfoRepository.CheckUnique(model.CoreInfo{
+		Name: name,
+		SN:   sn,
+	})
+	if uniqueId == id {
+		return true
+	}
+	return uniqueId == 0
+}

src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go

@@ -15,10 +15,11 @@ import (
 	"be.ems/src/framework/utils/date"
 	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
-	neDataModel "be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
 	neModel "be.ems/src/modules/network_element/model"
 	neService "be.ems/src/modules/network_element/service"
+	neLinkModel "be.ems/src/modules/network_link/model"
+	neLinkService "be.ems/src/modules/network_link/service"
 	systemService "be.ems/src/modules/system/service"
 )
 
@@ -27,10 +28,10 @@ var NewProcessor = &BackupExportCDRProcessor{
 	backupService:       neDataService.NewBackup,
 	sysDictService:      systemService.NewSysDictData,
 	neInfoService:       neService.NewNeInfo,
-	imsCDREventService:  neDataService.NewCDREventIMS,
+	imsCDREventService:  neLinkService.NewCDREventIMS,
-	smscCDREventService: neDataService.NewCDREventSMSC,
+	smscCDREventService: neLinkService.NewCDREventSMSC,
-	smfCDREventService:  neDataService.NewCDREventSMF,
+	smfCDREventService:  neLinkService.NewCDREventSMF,
-	sgwcCDREventService: neDataService.NewCDREventSGWC,
+	sgwcCDREventService: neLinkService.NewCDREventSGWC,
 }
 
 // BackupExportCDR 队列任务处理
@@ -39,10 +40,10 @@ type BackupExportCDRProcessor struct {
 	backupService       *neDataService.Backup       // 备份相关服务
 	sysDictService      *systemService.SysDictData  // 字典类型数据服务
 	neInfoService       *neService.NeInfo           // 网元信息服务
-	imsCDREventService  *neDataService.CDREventIMS  // IMS-CDR会话事件服务
+	imsCDREventService  *neLinkService.CDREventIMS  // IMS-CDR会话事件服务
-	smscCDREventService *neDataService.CDREventSMSC // SMSC-CDR会话事件服务
+	smscCDREventService *neLinkService.CDREventSMSC // SMSC-CDR会话事件服务
-	smfCDREventService  *neDataService.CDREventSMF  // SMF-CDR会话事件服务
+	smfCDREventService  *neLinkService.CDREventSMF  // SMF-CDR会话事件服务
-	sgwcCDREventService *neDataService.CDREventSGWC // SGWC-CDR会话事件服务
+	sgwcCDREventService *neLinkService.CDREventSGWC // SGWC-CDR会话事件服务
 }
 
 func (s *BackupExportCDRProcessor) Execute(data any) (any, error) {
@@ -72,22 +73,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,17 +98,18 @@ 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())
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
 	language := "en"
-	query := neDataModel.CDREventIMSQuery{
+	query := neLinkModel.CDREventIMSQuery{
 		SortField: "timestamp",
 		SortOrder: "asc",
-		RmUID:     rmUID,
+		CoreUID:   coreUid,
+		NeUID:     neUid,
 		BeginTime: start.UnixMilli(),
 		EndTime:   end.UnixMilli(),
 		PageNum:   1,
@@ -232,7 +234,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 +361,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,17 +388,18 @@ 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())
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
 	language := "en"
-	query := neDataModel.CDREventSMSCQuery{
+	query := neLinkModel.CDREventSMSCQuery{
 		SortField: "timestamp",
 		SortOrder: "asc",
-		RmUID:     rmUID,
+		CoreUID:   coreUid,
+		NeUID:     neUid,
 		BeginTime: start.UnixMilli(),
 		EndTime:   end.UnixMilli(),
 		PageNum:   1,
@@ -488,7 +491,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 +582,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,16 +606,17 @@ 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())
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
-	query := neDataModel.CDREventSMFQuery{
+	query := neLinkModel.CDREventSMFQuery{
 		SortField: "timestamp",
 		SortOrder: "asc",
-		RmUID:     rmUID,
+		CoreUID:   coreUid,
+		NeUID:     neUid,
 		BeginTime: start.UnixMilli(),
 		EndTime:   end.UnixMilli(),
 		PageNum:   1,
@@ -787,8 +791,8 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st
 			data = append(data, []string{
 				fmt.Sprint(row.ID),
 				chargingID,
-				row.NeName,
+				row.NeType,
-				row.RmUid,
+				row.NeUID,
 				subscriptionIDData,
 				subscriptionIDType,
 				fmt.Sprint(dataVolumeUplink),
@@ -974,8 +978,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,
+				"C" + idx: row.NeType,
-				"D" + idx: row.RmUid,
+				"D" + idx: row.NeUID,
 				"E" + idx: subscriptionIDData,
 				"F" + idx: subscriptionIDType,
 				"G" + idx: dataVolumeUplink,
@@ -1011,16 +1015,17 @@ 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())
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
-	query := neDataModel.CDREventSGWCQuery{
+	query := neLinkModel.CDREventSGWCQuery{
 		SortField: "timestamp",
 		SortOrder: "asc",
-		RmUID:     rmUID,
+		CoreUID:   coreUid,
+		NeUID:     neUid,
 		BeginTime: start.UnixMilli(),
 		EndTime:   end.UnixMilli(),
 		PageNum:   1,
@@ -1197,8 +1202,8 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s
 
 			data = append(data, []string{
 				fmt.Sprint(row.ID),
-				row.NeName,
+				row.NeType,
-				row.RmUid,
+				row.NeUID,
 				chargingID,
 				servedIMSI,
 				servedMSISDN,
@@ -1388,8 +1393,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,
+				"B" + idx: row.NeType,
-				"C" + idx: row.RmUid,
+				"C" + idx: row.NeUID,
 				"D" + idx: chargingID,
 				"E" + idx: servedIMSI,
 				"F" + idx: servedMSISDN,

src/modules/crontask/processor/backup_export_table/backup_export_table.go

@@ -15,8 +15,8 @@ import (
 	"be.ems/src/framework/utils/date"
 	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
-	neDataModel "be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
+	neLinkModel "be.ems/src/modules/network_link/model"
 	systemModel "be.ems/src/modules/system/model"
 	systemService "be.ems/src/modules/system/service"
 )
@@ -197,8 +197,8 @@ func (s BackupExportTableProcessor) exportSMF(hour int, columns []string, filePa
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
 	// 查询数据
-	rows := []neDataModel.CDREventSMF{}
+	rows := []neLinkModel.CDREventSMF{}
-	tx := db.DB("").Model(&neDataModel.CDREventSMF{})
+	tx := db.DB("").Model(&neLinkModel.CDREventSMF{})
 	tx = tx.Where("created_at >= ? and created_at <= ?", start.UnixMilli(), end.UnixMilli())
 	if err := tx.Find(&rows).Error; err != nil {
 		return 0, err
@@ -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" {
+			if col == "neType" || col == "ne_type" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", col) {
@@ -428,8 +428,8 @@ func (s BackupExportTableProcessor) exportIMS(hour int, columns []string, filePa
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
 	// 查询数据
-	rows := []neDataModel.CDREventIMS{}
+	rows := []neLinkModel.CDREventIMS{}
-	tx := db.DB("").Model(&neDataModel.CDREventIMS{})
+	tx := db.DB("").Model(&neLinkModel.CDREventIMS{})
 	tx = tx.Where("created_at >= ? and created_at <= ?", start.UnixMilli(), end.UnixMilli())
 	if err := tx.Find(&rows).Error; err != nil {
 		return 0, err
@@ -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" {
+			if col == "neType" || col == "ne_type" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", col) {
@@ -572,8 +572,8 @@ func (s BackupExportTableProcessor) exportSMSC(hour int, columns []string, fileP
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
 	// 查询数据
-	rows := []neDataModel.CDREventSMSC{}
+	rows := []neLinkModel.CDREventSMSC{}
-	tx := db.DB("").Model(&neDataModel.CDREventSMSC{})
+	tx := db.DB("").Model(&neLinkModel.CDREventSMSC{})
 	tx = tx.Where("created_at >= ? and created_at <= ?", start.UnixMilli(), end.UnixMilli())
 	if err := tx.Find(&rows).Error; err != nil {
 		return 0, err
@@ -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" {
+			if v == "neType" || v == "ne_type" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", v) {
@@ -697,8 +697,8 @@ func (s BackupExportTableProcessor) exportSGWC(hour int, columns []string, fileP
 	start := end.Add(-time.Duration(hour) * time.Hour)
 
 	// 查询数据
-	rows := []neDataModel.CDREventSMSC{}
+	rows := []neLinkModel.CDREventSMSC{}
-	tx := db.DB("").Model(&neDataModel.CDREventSMSC{})
+	tx := db.DB("").Model(&neLinkModel.CDREventSMSC{})
 	tx = tx.Where("created_at >= ? and created_at <= ?", start.UnixMilli(), end.UnixMilli())
 	if err := tx.Find(&rows).Error; err != nil {
 		return 0, err
@@ -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" {
+			if v == "neType" || v == "ne_type" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", v) {

src/modules/crontask/processor/backup_export_udm/backup_export_udm.go

@@ -10,20 +10,21 @@ import (
 	"be.ems/src/framework/cron"
 	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/file"
-	neDataModel "be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
 	neModel "be.ems/src/modules/network_element/model"
 	neService "be.ems/src/modules/network_element/service"
+	neLinkModel "be.ems/src/modules/network_link/model"
+	neLinkService "be.ems/src/modules/network_link/service"
 )
 
 var NewProcessor = &BackupExportUDMProcessor{
 	count:              0,
 	neInfoService:      neService.NewNeInfo,
 	backupService:      neDataService.NewBackup,
-	udmAuthService:     neDataService.NewUDMAuthUser,
+	udmAuthService:     neLinkService.NewUDMAuthUser,
-	udmSubService:      neDataService.NewUDMSubUser,
+	udmSubService:      neLinkService.NewUDMSubUser,
-	udmVOIPService:     neDataService.NewUDMVOIPUser,
+	udmVOIPService:     neLinkService.NewUDMVOIPUser,
-	udmVolteIMSService: neDataService.NewUDMVolteIMSUser,
+	udmVolteIMSService: neLinkService.NewUDMVolteIMSUser,
 }
 
 // BackupExportUDM 队列任务处理
@@ -31,10 +32,10 @@ type BackupExportUDMProcessor struct {
 	count              int                            // 执行次数
 	neInfoService      *neService.NeInfo              // 网元信息服务
 	backupService      *neDataService.Backup          // 备份相关服务
-	udmAuthService     *neDataService.UDMAuthUser     // UDM鉴权信息服务
+	udmAuthService     *neLinkService.UDMAuthUser     // UDM鉴权信息服务
-	udmSubService      *neDataService.UDMSubUser      // UDM签约信息服务
+	udmSubService      *neLinkService.UDMSubUser      // UDM签约信息服务
-	udmVOIPService     *neDataService.UDMVOIPUser     // UDMVOIP信息服务
+	udmVOIPService     *neLinkService.UDMVOIPUser     // UDMVOIP信息服务
-	udmVolteIMSService *neDataService.UDMVolteIMSUser // UDMVolteIMS信息服务
+	udmVolteIMSService *neLinkService.UDMVolteIMSUser // UDMVolteIMS信息服务
 }
 
 func (s *BackupExportUDMProcessor) Execute(data any) (any, error) {
@@ -63,13 +64,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 +80,14 @@ func (s *BackupExportUDMProcessor) Execute(data any) (any, error) {
 }
 
 // exportAuth 导出鉴权用户数据
-func (s BackupExportUDMProcessor) exportAuth(neId, fileType string) string {
+func (s BackupExportUDMProcessor) exportAuth(coreUid, neUid, fileType string) string {
-	rows := s.udmAuthService.Find(neDataModel.UDMAuthUser{NeId: neId})
+	rows := s.udmAuthService.Find(neLinkModel.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 +134,14 @@ func (s BackupExportUDMProcessor) exportAuth(neId, fileType string) string {
 }
 
 // exportSub 导出签约用户数据
-func (s BackupExportUDMProcessor) exportSub(neId, fileType string) string {
+func (s BackupExportUDMProcessor) exportSub(coreUid, neUid, fileType string) string {
-	rows := s.udmSubService.Find(neDataModel.UDMSubUser{NeId: neId})
+	rows := s.udmSubService.Find(neLinkModel.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 +182,14 @@ func (s BackupExportUDMProcessor) exportSub(neId, fileType string) string {
 }
 
 // exportVOIP 导出VOIP用户数据
-func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string {
+func (s BackupExportUDMProcessor) exportVOIP(coreUid, neUid, fileType string) string {
-	rows := s.udmVOIPService.Find(neDataModel.UDMVOIPUser{NeId: neId})
+	rows := s.udmVOIPService.Find(neLinkModel.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 +228,14 @@ func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string {
 }
 
 // exportVolte 导出Volte用户数据
-func (s BackupExportUDMProcessor) exportVolte(neId, fileType string) string {
+func (s BackupExportUDMProcessor) exportVolte(coreUid, neUid, fileType string) string {
-	rows := s.udmVolteIMSService.Find(neDataModel.UDMVolteIMSUser{NeId: neId})
+	rows := s.udmVolteIMSService.Find(neLinkModel.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)

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
 		}

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",

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,9 @@ func (s NeAlarmStateCheckCMDProcessor) serverState(state map[string]any, cpuUseG
 
 	// 插入网元状态记录
 	neState := neDataModel.NEState{
+		CoreUID:      fmt.Sprint(state["coreUid"]),
+		NeUID:        fmt.Sprint(state["neUid"]),
 		NeType:       fmt.Sprint(state["neType"]),
-		NeId:         fmt.Sprint(state["neId"]),
 		Version:      fmt.Sprint(state["version"]),
 		Capability:   parse.Number(state["capability"]),
 		SerialNum:    fmt.Sprint(state["sn"]),
@@ -221,7 +224,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 +240,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 +250,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 +282,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 +299,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",

src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go

@@ -93,13 +93,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,
 		})
 		// 告警状态, 存在的需要手动清除
@@ -111,12 +111,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 = "" // 标记为未记录再次发起新告警
 		}
 		// 未记录
@@ -131,12 +131,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"
 		}
 	}
 
@@ -188,17 +188,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,
@@ -207,7 +205,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",

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.NeUID)
 		// 将网元文件备份到本地
 		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",

src/modules/crontask/processor/ne_data_udm/ne_data_udm.go

@@ -5,22 +5,22 @@ import (
 
 	"be.ems/src/framework/cron"
 	"be.ems/src/framework/logger"
-	neDataService "be.ems/src/modules/network_data/service"
 	neModel "be.ems/src/modules/network_element/model"
 	neService "be.ems/src/modules/network_element/service"
+	neLinkService "be.ems/src/modules/network_link/service"
 )
 
 var NewProcessor = &NeDataUDM{
-	udmAuthService: neDataService.NewUDMAuthUser,
+	udmAuthService: neLinkService.NewUDMAuthUser,
-	udmSubService:  neDataService.NewUDMSubUser,
+	udmSubService:  neLinkService.NewUDMSubUser,
 	neInfoService:  neService.NewNeInfo,
 	count:          0,
 }
 
 // NeDataUDM 网元配置文件定期备份
 type NeDataUDM struct {
-	udmAuthService *neDataService.UDMAuthUser // UDM鉴权信息
+	udmAuthService *neLinkService.UDMAuthUser // UDM鉴权信息
-	udmSubService  *neDataService.UDMSubUser  // UDM签约信息
+	udmSubService  *neLinkService.UDMSubUser  // UDM签约信息
 	neInfoService  *neService.NeInfo          // 网元信息服务
 	count          int                        // 执行次数
 }
@@ -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("AuthNumber_%s", neInfo.NeUID)] = s.udmAuthService.ResetData(neInfo.CoreUID, neInfo.NeUID)
-		result[fmt.Sprintf("SubNumber_%s", neInfo.NeId)] = s.udmSubService.ResetData(neInfo.NeId)
+		result[fmt.Sprintf("SubNumber_%s", neInfo.NeUID)] = s.udmSubService.ResetData(neInfo.CoreUID, neInfo.NeUID)
 	}
 
 	return result, nil

src/modules/network_data/controller/alarm.go

@@ -52,7 +52,7 @@ type AlarmController struct {
 //	@Security		TokenAuth
 //	@Summary		Alarm List
 //	@Description	Alarm List
-//	@Router			/neData/alarm/list [get]
+//	@Router			/ne/data/alarm/list [get]
 func (s AlarmController) List(c *gin.Context) {
 	var query model.AlarmQuery
 	if err := c.ShouldBindQuery(&query); err != nil {
@@ -161,7 +161,7 @@ func (s AlarmController) Ack(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Alarm List Export
 //	@Description	Alarm List Export
-//	@Router			/neData/alarm/export [get]
+//	@Router			/ne/data/alarm/export [get]
 func (s AlarmController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制

src/modules/network_data/controller/alarm_forward.go

@@ -38,7 +38,7 @@ type AlarmForwardController struct {
 //	@Security		TokenAuth
 //	@Summary		Alarm Forward Log List
 //	@Description	Alarm Forward Log List
-//	@Router			/neData/alarm/forward/log/list [get]
+//	@Router			/ne/data/alarm/forward/log/list [get]
 func (s AlarmForwardController) List(c *gin.Context) {
 	var query model.AlarmForwardLogQuery
 	if err := c.ShouldBindQuery(&query); err != nil {

src/modules/network_data/controller/alarm_log.go

@@ -44,7 +44,7 @@ type AlarmLogController struct {
 //	@Security		TokenAuth
 //	@Summary		AlarmLog List
 //	@Description	AlarmLog List
-//	@Router			/neData/alarm/log/list [get]
+//	@Router			/ne/data/alarm/log/list [get]
 func (s AlarmLogController) List(c *gin.Context) {
 	var query model.AlarmLogQuery
 	if err := c.ShouldBindQuery(&query); err != nil {
@@ -77,7 +77,7 @@ func (s AlarmLogController) List(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Alarm Event Log List
 //	@Description	Alarm Event Log List
-//	@Router			/neData/alarm/log/event [get]
+//	@Router			/ne/data/alarm/log/event [get]
 func (s AlarmLogController) Event(c *gin.Context) {
 	var query model.AlarmEventQuery
 	if err := c.ShouldBindQuery(&query); err != nil {

src/modules/network_data/controller/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"
@@ -43,9 +41,8 @@ type KPIController struct {
 //	@Security		TokenAuth
 //	@Summary		Access to statistical data
 //	@Description	Access to statistical data
-//	@Router			/neData/kpi/data [get]
+//	@Router			/ne/data/kpi/data [get]
 func (s KPIController) KPIData(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
 	var querys model.KPIQuery
 	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))
@@ -78,7 +67,7 @@ func (s KPIController) KPIData(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Get Statistical Headings
 //	@Description	Get Statistical Headings
-//	@Router			/neData/kpi/title [get]
+//	@Router			/ne/data/kpi/title [get]
 func (s KPIController) KPITitle(c *gin.Context) {
 	neType := c.Query("neType")
 	if neType == "" {

src/modules/network_data/controller/nb_state.go

@@ -22,7 +22,7 @@ var NewNBState = &NBStateController{
 
 // 基站状态历史记录 AMF/MME
 //
-// PATH /nb-state
+// PATH /state/nb
 type NBStateController struct {
 	neInfoService  *neService.NeInfo      // 网元信息服务
 	nbStateService *neDataService.NBState // 基站状态服务
@@ -35,8 +35,8 @@ type NBStateController struct {
 //	@Tags			network_data/amf,network_data/mme
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType		query		string	true	"NE Type only AMF/MME"					Enums(AMF,MME)	default(AMF)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
-//	@Param			neId		query		string	true	"NE ID"									default(001)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Param			pageNum		query		number	true	"pageNum"								default(1)
 //	@Param			pageSize	query		number	true	"pageSize"								default(10)
 //	@Param			startTime	query		number	false	"Start time (timestamped milliseconds)"	default(1729162507596)
@@ -47,9 +47,8 @@ type NBStateController struct {
 //	@Security		TokenAuth
 //	@Summary		Base Station Status List
 //	@Description	Base Station Status List
-//	@Router			/nb-state/list [get]
+//	@Router			/state/nb/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}))
@@ -72,7 +63,7 @@ func (s NBStateController) List(c *gin.Context) {
 
 // 历史记录列表导出
 //
-// POST /export
+// GET /export
 //
 //	@Tags			network_data/amf,network_data/mme
 //	@Accept			json
@@ -82,12 +73,12 @@ func (s NBStateController) List(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Base Station Status List Export
 //	@Description	Base Station Status List Export
-//	@Router			/nb-state/export [post]
+//	@Router			/state/nb/export [get]
 func (s NBStateController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.NBStateQuery
-	if err := c.ShouldBindBodyWithJSON(&querys); 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
@@ -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 {
 		// 导出数据记录为空

src/modules/network_data/controller/ne_state.go

@@ -17,23 +17,23 @@ var NewNEState = &NEStateController{
 	neStateService: neDataService.NewNEState,
 }
 
-// 网元状态记录
+// 网元状态历史记录
 //
-// PATH /ne-state
+// PATH /state/ne
 type NEStateController struct {
 	neInfoService  *neService.NeInfo      // 网元信息服务
 	neStateService *neDataService.NEState // 网元状态服务
 }
 
-// 网元状态记录-内存/CPU/磁盘列表
+// 网元状态历史记录-内存/CPU/磁盘列表
 //
 // GET /list
 //
 //	@Tags			network_data
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType		query		string	true	"NE Type"								Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC) default(AMF)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
-//	@Param			neId		query		string	true	"NE ID"									default(001)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Param			pageNum		query		number	true	"pageNum"								default(1)
 //	@Param			pageSize	query		number	true	"pageSize"								default(10)
 //	@Param			startTime	query		number	false	"Start time (timestamped milliseconds)"	default(1729162507596)
@@ -44,7 +44,7 @@ type NEStateController struct {
 //	@Security		TokenAuth
 //	@Summary		NE Status Record - Memory/CPU/Disk List
 //	@Description	NE Status Record - Memory/CPU/Disk List
-//	@Router			/ne-state/list [get]
+//	@Router			/state/ne/list [get]
 func (s NEStateController) List(c *gin.Context) {
 	var query model.NEStateQuery
 	if err := c.ShouldBindQuery(&query); err != nil {

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"` // 网元类型
+	CoreUID      string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
-	NeID         string `json:"neId" form:"neId"`     // 网元ID
+	NeUID        string `json:"neUid" form:"neUid"`                        // 网元唯一标识
-	NeName       string `json:"neName" form:"neName"`
+	NeType       string `json:"neType" form:"neType"`                      // 网元类型
-	PvFlag       string `json:"pvFlag" form:"pvFlag"`
 	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

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 {
-	NeType      string `json:"neType" form:"neType"` // 网元类型
+	CoreUID     string `json:"coreId" form:"coreId" binding:"required"` // 核心网唯一标识
-	NeID        string `json:"neId" form:"neId"`     // 网元ID
+	NeUID       string `json:"neUid" form:"neUid"`                      // 网元唯一标识
+	NeType      string `json:"neType" form:"neType"`                    // 网元类型
 	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

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"`
+	CoreUID      string `json:"coreUid" gorm:"column:core_uid"`           // 核心网唯一标识
-	NeId         string `json:"neId" gorm:"column:ne_id"`
+	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,9 +27,10 @@ func (*AlarmForwardLog) TableName() string {
 
 // AlarmForwardLogQuery 告警转发日志数据查询参数结构体
 type AlarmForwardLogQuery struct {
-	NeType    string `json:"neType" form:"neType"`       // 网元类型
+	CoreUID   string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
-	NeID      string `json:"neId" form:"neId"`           // 网元ID
+	NeUID     string `json:"neUid" form:"neUid"`                        // 网元唯一标识
-	BeginTime int64  `json:"beginTime" form:"beginTime"` // 开始时间 查event_time
+	NeType    string `json:"neType" form:"neType"`                      // 网元类型
+	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"` // 排序字段，填写结果字段
 	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`      // 排序升降序，asc desc

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"`
+	CoreUID      string `json:"coreUid" gorm:"column:core_uid"`           // 核心网唯一标识
-	NeId         string `json:"neId" gorm:"column:ne_id"`
+	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" binding:"required"`                    // 核心网唯一标识
+	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

src/modules/network_data/model/cdr_event_ims.go

@@ -1,33 +0,0 @@
-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"`
-	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"` // 记录创建存储毫秒
-}
-
-// TableName 表名称
-func (*CDREventIMS) TableName() string {
-	return "cdr_event_ims"
-}
-
-// CDREventIMSQuery CDR会话对象IMS查询参数结构体
-type CDREventIMSQuery struct {
-	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
-	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
-	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`
-	PageSize    int64  `json:"pageSize" form:"pageSize" binding:"required"`
-}

src/modules/network_data/model/cdr_event_smsc.go

@@ -1,33 +0,0 @@
-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"`         // 可能没有
-	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"` // 记录创建存储毫秒
-}
-
-// TableName 表名称
-func (*CDREventSMSC) TableName() string {
-	return "cdr_event_smsc"
-}
-
-// CDREventSMSCQuery CDR会话对象SMSC查询参数结构体
-type CDREventSMSCQuery struct {
-	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
-	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
-	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`
-	PageSize    int64  `json:"pageSize" form:"pageSize" binding:"required"`
-}

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"`
+	CoreUID     string `json:"coreUid" gorm:"column:core_uid"`        // 核心网唯一标识
-	NeName      string `json:"neName" gorm:"column:ne_name"`
+	NeUID       string `json:"neUid" gorm:"column:ne_uid"`            // 网元唯一标识
-	RmUid       string `json:"rmUid" gorm:"column:rm_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"`
+	CoreUID   string `form:"coreUid" binding:"required"`
-	NeID      string `form:"neId" 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"`