diff --git a/database/install/kpi_c_report.sql b/database/install/kpi_c_report.sql index 7c538aec..36afbd9b 100644 --- a/database/install/kpi_c_report.sql +++ b/database/install/kpi_c_report.sql @@ -1,19 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : local_mariadb - Source Server Type : MariaDB - Source Server Version : 100338 (10.3.38-MariaDB) - Source Host : localhost:33066 - Source Schema : tenants_db - - Target Server Type : MariaDB - Target Server Version : 100338 (10.3.38-MariaDB) - File Encoding : 65001 - - Date: 29/08/2024 14:53:38 -*/ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -36,6 +20,6 @@ CREATE TABLE `kpi_c_report` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_timestamp`(`created_at`) USING BTREE, INDEX `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 654904 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/install/kpi_c_title.sql b/database/install/kpi_c_title.sql index 9430160b..d7413ea1 100644 --- a/database/install/kpi_c_title.sql +++ b/database/install/kpi_c_title.sql @@ -1,19 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : local_mariadb - Source Server Type : MariaDB - Source Server Version : 100338 (10.3.38-MariaDB) - Source Host : localhost:33066 - Source Schema : omc_db - - Target Server Type : MariaDB - Target Server Version : 100338 (10.3.38-MariaDB) - File Encoding : 65001 - - Date: 29/08/2024 17:21:06 -*/ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -21,19 +5,39 @@ SET FOREIGN_KEY_CHECKS = 0; -- Table structure for kpi_c_title -- ---------------------------- DROP TABLE IF EXISTS `kpi_c_title`; -CREATE TABLE `kpi_c_title` ( +CREATE TABLE `kpi_c_title` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `kpi_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `expression` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `unit` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `status` enum('Active','Inactive','Deleted') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT 'enum:Active/Inactive/Deleted', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `created_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `updated_at` datetime NULL DEFAULT current_timestamp(), + `ne_type` varchar(16) DEFAULT NULL, + `kpi_id` varchar(16) DEFAULT NULL, + `title` varchar(255) DEFAULT NULL, + `expression` varchar(1024) DEFAULT NULL, + `unit` varchar(16) DEFAULT NULL, + `status` enum('Active','Inactive','Deleted') DEFAULT 'Active' COMMENT 'enum:Active/Inactive/Deleted', + `description` varchar(255) DEFAULT NULL, + `created_by` varchar(32) DEFAULT NULL, + `updated_at` datetime DEFAULT current_timestamp(), PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `idx_ne_kpi_id`(`ne_type`, `kpi_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + UNIQUE KEY `idx_ne_kpi_id` (`ne_type`,`kpi_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; + +INSERT INTO `kpi_c_title` VALUES (1, 'AMF', 'AMF.C.01', 'Regstration Success Rate', '(\'AMF.03\'/\'AMF.02\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:27:32'); +INSERT INTO `kpi_c_title` VALUES (2, 'AMF', 'AMF.C.02', 'Paging Success Rate', '((\'AMF.15\'+\'AMF.16\')/\'AMF.17\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:28:34'); +INSERT INTO `kpi_c_title` VALUES (3, 'AMF', 'AMF.C.03', 'Service Request Success Rate', '((1-\'AMF.18\')/\'AMF.19\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:31:31'); +INSERT INTO `kpi_c_title` VALUES (4, 'AMF', 'AMF.C.04', '5G Register Subscriber', '\'AMF.01\'', ' ', 'Active', '', 'admin', '2024-12-12 19:32:16'); +INSERT INTO `kpi_c_title` VALUES (5, 'SMF', 'SMF.C.01', 'SA_MeanPduSession', '\'SMF.01\'', ' ', 'Active', '', 'admin', '2024-12-12 19:32:45'); +INSERT INTO `kpi_c_title` VALUES (6, 'SMF', 'SMF.C.02', 'PDU Session Establishment Success Rate', '(\'SMF.02\'/\'SMF.03\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:33:27'); +INSERT INTO `kpi_c_title` VALUES (7, 'SMF', 'SMF.C.03', 'IMS Session Establishment Success Rate', '(\'SMF.04\'/\'SMF.05\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:34:07'); +INSERT INTO `kpi_c_title` VALUES (8, 'MME', 'MME.C.01', 'Attach Success Rate ', '(\'MME.A.02\'/\'MME.A.01\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:26:09'); +INSERT INTO `kpi_c_title` VALUES (9, 'UPF', 'UPF.C.01', 'PFCP Establish Success Rate ', '(\'UPF.01\'/\'UPF.02\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:26:40'); +INSERT INTO `kpi_c_title` VALUES (10, 'UPF', 'UPF.C.02', 'N6_Throughout', '(\'UPF.03\')*8/5/1000/1000', 'Mbps', 'Active', '', 'admin', '2024-12-12 20:27:24'); +INSERT INTO `kpi_c_title` VALUES (11, 'UPF', 'UPF.C.03', 'N3_Throughout', '(\'UPF.06\')*8/5/1000/1000', 'Mbps', 'Active', '', 'admin', '2024-12-12 20:27:56'); +INSERT INTO `kpi_c_title` VALUES (12, 'UDM', 'UDM.C.01', 'AMF_UECM_Success_Rate ', '(\'UDM.03\'/\'UDM.02\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:28:47'); +INSERT INTO `kpi_c_title` VALUES (13, 'UDM', 'UDM.C.02', 'SMF_UECM_Success_Rate ', '(\'UDM.04\'/\'UDM.05\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:29:06'); +INSERT INTO `kpi_c_title` VALUES (14, 'IMS', 'IMS.C.01', 'InitReg_Success_Rate', '(\'SCSCF.03\'/\'SCSCF.04\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:29:44'); +INSERT INTO `kpi_c_title` VALUES (15, 'IMS', 'IMS.C.02', 'MO_Success_Rate', '(\'SCSCF.05\'/\'SCSCF.06\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:30:14'); +INSERT INTO `kpi_c_title` VALUES (16, 'IMS', 'IMS.C.03', 'MT_Success_Rate', '(\'SCSCF.07\'/\'SCSCF.08\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:30:49'); +INSERT INTO `kpi_c_title` VALUES (17, 'IMS', 'IMS.C.04', 'Service_Success_Rate ', '((\'SCSCF.05\'+\'SCSCF.07\')/(\'SCSCF.06\'+\'SCSCF.08\'))*100', '%', 'Active', '', 'admin', '2024-12-12 20:31:41'); +INSERT INTO `kpi_c_title` VALUES (18, 'SMF', 'SMF.C.06', 'IMS_DefaultBear_Success_Rate ', '(\'SMF.13\'/\'SMF.14\')*100', '%', 'Active', '', 'admin', '2024-12-13 10:49:00'); +INSERT INTO `kpi_c_title` VALUES (19, 'SMF', 'SMF.C.07', 'Bear_Success_Rate_new', '((\'SMF.09\'+\'SMF.11\')/(\'SMF.10\'+\'SMF.12\') )*100', '%', 'Active', '', 'admin', '2024-12-13 11:16:04'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/install/kpi_report.sql b/database/install/kpi_report.sql index 2b294692..4a0e50ea 100644 --- a/database/install/kpi_report.sql +++ b/database/install/kpi_report.sql @@ -1,19 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : root@192.168.2.166 - Source Server Type : MariaDB - Source Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1) - Source Host : 192.168.2.166:33066 - Source Schema : omc_db - - Target Server Type : MariaDB - Target Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1) - File Encoding : 65001 - - Date: 26/04/2024 17:20:10 -*/ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -36,6 +20,6 @@ CREATE TABLE `kpi_report` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_timestamp`(`created_at`) USING BTREE, INDEX `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 10660 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_kpi_c_report.sql b/database/upgrade/upg_kpi_c_report.sql index d4166f33..7fe1b133 100644 --- a/database/upgrade/upg_kpi_c_report.sql +++ b/database/upgrade/upg_kpi_c_report.sql @@ -1,19 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : local_mariadb - Source Server Type : MariaDB - Source Server Version : 100338 (10.3.38-MariaDB) - Source Host : localhost:33066 - Source Schema : tenants_db - - Target Server Type : MariaDB - Target Server Version : 100338 (10.3.38-MariaDB) - File Encoding : 65001 - - Date: 29/08/2024 14:53:38 -*/ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -35,6 +19,6 @@ CREATE TABLE IF NOT EXISTS `kpi_c_report` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_timestamp`(`created_at`) USING BTREE, INDEX `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 654904 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_kpi_c_title.sql b/database/upgrade/upg_kpi_c_title.sql index a3f3158a..e317f0ee 100644 --- a/database/upgrade/upg_kpi_c_title.sql +++ b/database/upgrade/upg_kpi_c_title.sql @@ -1,19 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : local_mariadb - Source Server Type : MariaDB - Source Server Version : 100338 (10.3.38-MariaDB) - Source Host : localhost:33066 - Source Schema : omc_db - - Target Server Type : MariaDB - Target Server Version : 100338 (10.3.38-MariaDB) - File Encoding : 65001 - - Date: 29/08/2024 17:21:06 -*/ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -22,17 +6,37 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- CREATE TABLE IF NOT EXISTS `kpi_c_title` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `kpi_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `expression` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `unit` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `status` enum('Active','Inactive','Deleted') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT 'enum:Active/Inactive/Deleted', - `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `created_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `updated_at` datetime NULL DEFAULT current_timestamp(), + `ne_type` varchar(16) DEFAULT NULL, + `kpi_id` varchar(16) DEFAULT NULL, + `title` varchar(255) DEFAULT NULL, + `expression` varchar(1024) DEFAULT NULL, + `unit` varchar(16) DEFAULT NULL, + `status` enum('Active','Inactive','Deleted') DEFAULT 'Active' COMMENT 'enum:Active/Inactive/Deleted', + `description` varchar(255) DEFAULT NULL, + `created_by` varchar(32) DEFAULT NULL, + `updated_at` datetime DEFAULT current_timestamp(), PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `idx_ne_kpi_id`(`ne_type`, `kpi_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + UNIQUE KEY `idx_ne_kpi_id` (`ne_type`,`kpi_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC; + +REPLACE INTO `kpi_c_title` VALUES (1, 'AMF', 'AMF.C.01', 'Regstration Success Rate', '(\'AMF.03\'/\'AMF.02\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:27:32'); +REPLACE INTO `kpi_c_title` VALUES (2, 'AMF', 'AMF.C.02', 'Paging Success Rate', '((\'AMF.15\'+\'AMF.16\')/\'AMF.17\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:28:34'); +REPLACE INTO `kpi_c_title` VALUES (3, 'AMF', 'AMF.C.03', 'Service Request Success Rate', '((1-\'AMF.18\')/\'AMF.19\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:31:31'); +REPLACE INTO `kpi_c_title` VALUES (4, 'AMF', 'AMF.C.04', '5G Register Subscriber', '\'AMF.01\'', ' ', 'Active', '', 'admin', '2024-12-12 19:32:16'); +REPLACE INTO `kpi_c_title` VALUES (5, 'SMF', 'SMF.C.01', 'SA_MeanPduSession', '\'SMF.01\'', ' ', 'Active', '', 'admin', '2024-12-12 19:32:45'); +REPLACE INTO `kpi_c_title` VALUES (6, 'SMF', 'SMF.C.02', 'PDU Session Establishment Success Rate', '(\'SMF.02\'/\'SMF.03\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:33:27'); +REPLACE INTO `kpi_c_title` VALUES (7, 'SMF', 'SMF.C.03', 'IMS Session Establishment Success Rate', '(\'SMF.04\'/\'SMF.05\')*100', '%', 'Active', '', 'admin', '2024-12-12 19:34:07'); +REPLACE INTO `kpi_c_title` VALUES (8, 'MME', 'MME.C.01', 'Attach Success Rate ', '(\'MME.A.02\'/\'MME.A.01\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:26:09'); +REPLACE INTO `kpi_c_title` VALUES (9, 'UPF', 'UPF.C.01', 'PFCP Establish Success Rate ', '(\'UPF.01\'/\'UPF.02\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:26:40'); +REPLACE INTO `kpi_c_title` VALUES (10, 'UPF', 'UPF.C.02', 'N6_Throughout', '(\'UPF.03\')*8/5/1000/1000', 'Mbps', 'Active', '', 'admin', '2024-12-12 20:27:24'); +REPLACE INTO `kpi_c_title` VALUES (11, 'UPF', 'UPF.C.03', 'N3_Throughout', '(\'UPF.06\')*8/5/1000/1000', 'Mbps', 'Active', '', 'admin', '2024-12-12 20:27:56'); +REPLACE INTO `kpi_c_title` VALUES (12, 'UDM', 'UDM.C.01', 'AMF_UECM_Success_Rate ', '(\'UDM.03\'/\'UDM.02\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:28:47'); +REPLACE INTO `kpi_c_title` VALUES (13, 'UDM', 'UDM.C.02', 'SMF_UECM_Success_Rate ', '(\'UDM.04\'/\'UDM.05\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:29:06'); +REPLACE INTO `kpi_c_title` VALUES (14, 'IMS', 'IMS.C.01', 'InitReg_Success_Rate', '(\'SCSCF.03\'/\'SCSCF.04\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:29:44'); +REPLACE INTO `kpi_c_title` VALUES (15, 'IMS', 'IMS.C.02', 'MO_Success_Rate', '(\'SCSCF.05\'/\'SCSCF.06\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:30:14'); +REPLACE INTO `kpi_c_title` VALUES (16, 'IMS', 'IMS.C.03', 'MT_Success_Rate', '(\'SCSCF.07\'/\'SCSCF.08\')*100', '%', 'Active', '', 'admin', '2024-12-12 20:30:49'); +REPLACE INTO `kpi_c_title` VALUES (17, 'IMS', 'IMS.C.04', 'Service_Success_Rate ', '((\'SCSCF.05\'+\'SCSCF.07\')/(\'SCSCF.06\'+\'SCSCF.08\'))*100', '%', 'Active', '', 'admin', '2024-12-12 20:31:41'); +REPLACE INTO `kpi_c_title` VALUES (18, 'SMF', 'SMF.C.06', 'IMS_DefaultBear_Success_Rate ', '(\'SMF.13\'/\'SMF.14\')*100', '%', 'Active', '', 'admin', '2024-12-13 10:49:00'); +REPLACE INTO `kpi_c_title` VALUES (19, 'SMF', 'SMF.C.07', 'Bear_Success_Rate_new', '((\'SMF.09\'+\'SMF.11\')/(\'SMF.10\'+\'SMF.12\') )*100', '%', 'Active', '', 'admin', '2024-12-13 11:16:04'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upg_kpi_report.sql b/database/upgrade/upg_kpi_report.sql index cad7a49b..ca99043d 100644 --- a/database/upgrade/upg_kpi_report.sql +++ b/database/upgrade/upg_kpi_report.sql @@ -1,19 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : root@192.168.2.166 - Source Server Type : MariaDB - Source Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1) - Source Host : 192.168.2.166:33066 - Source Schema : omc_db - - Target Server Type : MariaDB - Target Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1) - File Encoding : 65001 - - Date: 26/04/2024 17:20:44 -*/ - SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; @@ -35,6 +19,6 @@ CREATE TABLE IF NOT EXISTS `kpi_report` ( PRIMARY KEY (`id`) USING BTREE, INDEX `idx_timestamp`(`created_at`) USING BTREE, INDEX `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 10660 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/zupgrade.sql b/database/upgrade/zupgrade.sql index c52bdb92..f7cdc98a 100644 --- a/database/upgrade/zupgrade.sql +++ b/database/upgrade/zupgrade.sql @@ -1,57 +1,5 @@ -DROP TRIGGER IF EXISTS `tg_account_menu`; +SET FOREIGN_KEY_CHECKS=0; -ALTER TABLE `nbi_operation_log` -MODIFY COLUMN `created_at` datetime NULL DEFAULT NULL AFTER `log_time`; - -ALTER TABLE `alarm_log` -ADD COLUMN IF NOT EXISTS `alarm_seq` int NULL AFTER `ne_id`; +-- -ALTER TABLE `nbi_alarm_log` -ADD COLUMN IF NOT EXISTS `alarm_status` int NULL COMMENT '0/1: 清除告警/活动告警' AFTER `alarm_code`; - -ALTER TABLE `cert_info` DROP INDEX IF EXISTS `idx_netype_neid`; - -ALTER TABLE `measure_threshold` -CHANGE COLUMN IF EXISTS `alarm_id` `alarm_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '10200' AFTER `orig_severity`; - -ALTER TABLE `measure_task` -ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`, -ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; - -ALTER TABLE `mml_command` -ADD - COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`; - -UPDATE `mml_command` -SET `status` = 'Inactive' -WHERE - `category` = 'licenseManagement'; - -ALTER TABLE `mml_subscriber` -ADD - COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`; - -ALTER TABLE `mml_system` -ADD - COLUMN IF NOT EXISTS `status` enum('Active', 'Inactive') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Active' COMMENT '激活: Active 未激活: Inactive' AFTER `param_json`; - -ALTER TABLE `system_log` -ADD - COLUMN IF NOT EXISTS `operation` varchar(16) NULL AFTER `process_id`; - -ALTER TABLE `alarm` -ADD UNIQUE INDEX IF NOT EXISTS `idx_pk_id` (`id`) USING BTREE; - -ALTER TABLE `alarm` -ADD INDEX IF NOT EXISTS `idx_severity_status` ( - `alarm_status`, `orig_severity` -) USING BTREE; - -ALTER TABLE `mml_system` -ADD COLUMN IF NOT EXISTS `object_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'mml' AFTER `mml_display`; - -ALTER TABLE `ne_state` -MODIFY COLUMN `expiry_date` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-' AFTER `serial_num`; - -ALTER TABLE `alarm_forward_log` -ADD COLUMN IF NOT EXISTS `interface` varchar(16) NULL AFTER `event_time`; \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/lib/core/conf/conf.go b/lib/core/conf/conf.go index 7e22479a..e43d3454 100644 --- a/lib/core/conf/conf.go +++ b/lib/core/conf/conf.go @@ -18,7 +18,7 @@ func InitConfig(configFile string) { // 读取配置文件 err := v.ReadInConfig() if err != nil { - fmt.Printf("读取配置文件失败: %v \n", err) + fmt.Printf("failure to read configuration file: %v \n", err) return } } diff --git a/src/framework/config/config/config.default.yaml b/src/framework/config/config/config.default.yaml index 13b1fffc..afda8e35 100644 --- a/src/framework/config/config/config.default.yaml +++ b/src/framework/config/config/config.default.yaml @@ -149,9 +149,9 @@ gorm: type: "mysql" host: "127.0.0.1" port: 3306 - username: "<用户名>" - password: "<密码>" - database: "<数据库>" + username: "" + password: "" + database: "" logging: false # 多个数据源时可以用这个指定默认的数据源 defaultDataSourceName: "default" @@ -162,7 +162,7 @@ redis: default: port: 6379 # Redis port host: "127.0.0.1" # Redis host - password: "<密码>" + password: "" db: 0 # Redis db_num # 多个数据源时可以用这个指定默认的数据源 defaultDataSourceName: "default" diff --git a/src/framework/config/config/config.prod.yaml b/src/framework/config/config/config.prod.yaml index 3125e341..7915c59f 100644 --- a/src/framework/config/config/config.prod.yaml +++ b/src/framework/config/config/config.prod.yaml @@ -6,27 +6,27 @@ server: # security 安全 security: csrf: - # 允许调用的域名地址的，例如：http:/// + # 允许调用的域名地址的，例如：http:/// refererWhiteList: - "127.0.0.1" - - "" + - "" # GORM 数据源 gorm: dataSource: default: type: "mysql" - host: "" + host: "" port: 3306 - username: "<用户名>" - password: "<密码>" - database: "<数据库>" + username: "" + password: "" + database: "" # Redis 缓存数据 redis: dataSource: default: port: 6379 # Redis port - host: "" - password: "<密码>" + host: "" + password: "" db: 0 # Redis db_num diff --git a/src/modules/network_data/repository/udm_user_info.go b/src/modules/network_data/repository/udm_user_info.go index 1c274373..259dd0ba 100644 --- a/src/modules/network_data/repository/udm_user_info.go +++ b/src/modules/network_data/repository/udm_user_info.go @@ -72,11 +72,15 @@ func (r *UDMUserInfo) SelectList(u model.UDMUserInfo) []model.UDMUserInfo { return rows } -// SelectByIMSIAndNeID 通过imsi和ne_id查询 +// SelectByIMSIAndNeID 通过imsi和ne_id查询 neId为%时模糊imsi查询 func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo { tx := datasource.DB("").Model(&model.UDMUserInfo{}) // 构建查询条件 - tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + if neId == "%" { + tx = tx.Where("imsi like concat(?, '%')", imsi) + } else { + tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + } // 查询数据 rows := []model.UDMUserInfo{} if err := tx.Limit(1).Find(&rows).Error; err != nil { @@ -97,20 +101,17 @@ func (r *UDMUserInfo) Inserts(uArr []model.UDMUserInfo) int64 { return tx.RowsAffected } -// Delete 删除实体 +// Delete 删除实体 neId为%时模糊imsi前缀 func (r *UDMUserInfo) Delete(imsi, neId string) int64 { - tx := datasource.DefaultDB().Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMUserInfo{}) + tx := datasource.DefaultDB() + if neId == "%" { + tx = tx.Where("imsi like concat(?, '%')", imsi) + } else { + tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + } + tx = tx.Delete(&model.UDMUserInfo{}) if err := tx.Error; err != nil { logger.Errorf("Delete err => %v", err) } return tx.RowsAffected } - -// DeletePrefixByIMSI 删除前缀匹配的实体 -func (r *UDMUserInfo) DeletePrefixByIMSI(imsiPrefix, neId string) int64 { - tx := datasource.DefaultDB().Where("imsi like concat(?, '%') and ne_id = ?", imsiPrefix, neId).Delete(&model.UDMUserInfo{}) - if err := tx.Error; err != nil { - logger.Errorf("DeletePrefixByIMSI err => %v", err) - } - return tx.RowsAffected -} diff --git a/src/modules/network_data/service/udm_sub.go b/src/modules/network_data/service/udm_sub.go index ba9b37d4..28c78fff 100644 --- a/src/modules/network_data/service/udm_sub.go +++ b/src/modules/network_data/service/udm_sub.go @@ -197,7 +197,7 @@ func (r *UDMSubUser) Insert(neId string, u model.UDMSubUser) int64 { r.udmSubRepository.Delete(u.IMSI, neId) // 新增到拓展信息 if u.Remark != "" { - r.udmUserInfoRepository.Delete(u.IMSI, neId) + r.udmUserInfoRepository.Delete(u.IMSI, "%") r.udmUserInfoRepository.Inserts([]model.UDMUserInfo{{ IMSI: u.IMSI, MSISDN: u.MSISDN, @@ -267,9 +267,9 @@ func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) { // 删除原数据 r.udmSubRepository.Delete(keyIMSI, neId) if remark == "-(Deleted)-" { - r.udmUserInfoRepository.Delete(keyIMSI, neId) + r.udmUserInfoRepository.Delete(keyIMSI, "%") } - // 加载数据 + // 加载数据，删除标记为-(Deleted)-加载为空不插入 arr := r.dataByRedis(keyIMSI, neId) if len(arr) < 1 { continue diff --git a/src/modules/network_data/service/udm_user_info.go b/src/modules/network_data/service/udm_user_info.go index da610724..0c53a7df 100644 --- a/src/modules/network_data/service/udm_user_info.go +++ b/src/modules/network_data/service/udm_user_info.go @@ -16,7 +16,7 @@ type UDMUserInfo struct { udmUserInfoRepository *repository.UDMUserInfo } -// SelectByIMSIAndNeID 通过IMSI和网元标识查询信息 +// SelectByIMSIAndNeID 通过IMSI和网元标识查询信息 neId为%时模糊imsi查询 func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo { return r.udmUserInfoRepository.SelectByIMSIAndNeID(imsi, neId) } @@ -27,7 +27,7 @@ func (r *UDMUserInfo) Save(u model.UDMUserInfo) bool { return r.udmUserInfoRepository.Inserts([]model.UDMUserInfo{u}) > 0 } -// Delete 删除信息 +// Delete 删除信息 neId为%时模糊imsi查询 func (r *UDMUserInfo) Delete(imsi, neId string) int64 { return r.udmUserInfoRepository.Delete(imsi, neId) }