OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

feat: add capability in ne_license

Browse Source
This commit is contained in:
simon
2025-04-29 15:30:12 +08:00
parent ff4e221e27
commit cec34122da
6 changed files with 77 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
database/install/ne_license.sql
View File

@@ -1,44 +1,59 @@
SET NAMES utf8mb4; /*
SET FOREIGN_KEY_CHECKS = 0; Navicat Premium Data Transfer
-- Source Server : omc@192.168.2.164
-- Table structure for table `ne_license` Source Server Type : MariaDB
-- Source Server Version : 100528 (10.5.28-MariaDB)
Source Host : 192.168.2.164:33066
Source Schema : omc_db
DROP TABLE IF EXISTS `ne_license`;
CREATE TABLE `ne_license` ( Target Server Type : MariaDB
`id` int NOT NULL AUTO_INCREMENT, Target Server Version : 100528 (10.5.28-MariaDB)
`ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型', File Encoding : 65001
`ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
`activation_request_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '激活申请代码', Date: 29/04/2025 14:45:48
`license_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '激活授权文件', */
`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 '许可证到期日期', SET NAMES utf8mb4;
`status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '状态 0无效 1有效', SET FOREIGN_KEY_CHECKS = 0;
`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 '创建时间', -- Table structure for ne_license
`update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '更新者', -- ----------------------------
`update_time` bigint DEFAULT '0' COMMENT '更新时间', DROP TABLE IF EXISTS `ne_license`;
PRIMARY KEY (`id`) USING BTREE, CREATE TABLE `ne_license` (
UNIQUE KEY `uk_type_id` (`ne_type`,`ne_id`) USING BTREE COMMENT '唯一网元类型和网元ID' `id` int(11) NOT NULL AUTO_INCREMENT,
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='网元授权激活信息'; `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型',
`ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID',
-- 初始数据对应网元 `activation_request_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '激活申请代码',
INSERT INTO `ne_license` VALUES (1, 'OMC', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `license_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '激活授权文件',
INSERT INTO `ne_license` VALUES (2, 'IMS', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `serial_num` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-' COMMENT '序列号',
INSERT INTO `ne_license` VALUES (3, 'AMF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `expiry_date` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-' COMMENT '许可证到期日期',
INSERT INTO `ne_license` VALUES (4, 'AUSF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `capability` int(11) NULL DEFAULT 0,
INSERT INTO `ne_license` VALUES (5, 'UDM', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态 0无效 1有效',
INSERT INTO `ne_license` VALUES (6, 'SMF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注',
INSERT INTO `ne_license` VALUES (7, 'PCF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
INSERT INTO `ne_license` VALUES (8, 'NSSF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `create_time` bigint(20) NULL DEFAULT 0 COMMENT '创建时间',
INSERT INTO `ne_license` VALUES (9, 'NRF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
INSERT INTO `ne_license` VALUES (10, 'UPF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); `update_time` bigint(20) NULL DEFAULT 0 COMMENT '更新时间',
INSERT INTO `ne_license` VALUES (11, 'LMF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); PRIMARY KEY (`id`) USING BTREE,
INSERT INTO `ne_license` VALUES (12, 'NEF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); UNIQUE INDEX `uk_type_id`(`ne_type`, `ne_id`) USING BTREE COMMENT '唯一网元类型和网元ID'
INSERT INTO `ne_license` VALUES (13, 'MME', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0); ) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网元授权激活信息' ROW_FORMAT = Dynamic;
INSERT INTO `ne_license` VALUES (14, 'N3IWF', '001', '', '', '', '', '0', '', 'supervisor', 1713928436971, '', 0);
-- 初始数据对应网元
SET FOREIGN_KEY_CHECKS=1; INSERT INTO `ne_license` VALUES (1, 'OMC', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (2, 'IMS', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (3, 'AMF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (4, 'AUSF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (5, 'UDM', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (6, 'SMF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (7, 'PCF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (8, 'NSSF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (9, 'NRF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (10, 'UPF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (11, 'LMF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (12, 'NEF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (13, 'MME', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
INSERT INTO `ne_license` VALUES (14, 'N3IWF', '001', '', '', '', '', 0, '0', '', 'supervisor', 1713928436971, '', 0);
SET FOREIGN_KEY_CHECKS=1;

2
database/upgrade/upg_ne_license.sql
View File

@@ -47,6 +47,6 @@ ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `created_at`;
ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `updated_at`; ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `updated_at`;
ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `deleted_at`; ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `deleted_at`;
ALTER TABLE `ne_license` ADD UNIQUE INDEX IF NOT EXISTS `uk_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE COMMENT '唯一网元类型和网元ID'; ALTER TABLE `ne_license` ADD UNIQUE INDEX IF NOT EXISTS `uk_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE COMMENT '唯一网元类型和网元ID';
ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `capability` int NULL DEFAULT 0 AFTER `expiry_date`;
SET FOREIGN_KEY_CHECKS=1; SET FOREIGN_KEY_CHECKS=1;

6
src/modules/network_element/controller/ne_info.go
View File

@@ -397,6 +397,9 @@ func (s *NeInfoController) Add(c *gin.Context) {
neLicense.ExpiryDate = v.(string) neLicense.ExpiryDate = v.(string)
neLicense.Status = "1" neLicense.Status = "1"
} }
if v, ok := body.ServerState["capability"]; ok && v != nil {
neLicense.Capability = v.(string)
}
} }
s.neVersionService.Insert(neVersion) s.neVersionService.Insert(neVersion)
@@ -492,6 +495,9 @@ func (s *NeInfoController) Edit(c *gin.Context) {
neLicense.Status = "1" neLicense.Status = "1"
neLicense.UpdateBy = loginUserName neLicense.UpdateBy = loginUserName
} }
if v, ok := body.ServerState["capability"]; ok && v != nil {
neLicense.Capability = v.(string)
}
} }
if neVersion.ID != "" { if neVersion.ID != "" {

1
src/modules/network_element/controller/ne_license.go
View File

@@ -255,6 +255,7 @@ func (s *NeLicenseController) State(c *gin.Context) {
neLicense.Status = "1" neLicense.Status = "1"
neLicense.SerialNum = fmt.Sprint(neState["sn"]) neLicense.SerialNum = fmt.Sprint(neState["sn"])
neLicense.ExpiryDate = fmt.Sprint(neState["expire"]) neLicense.ExpiryDate = fmt.Sprint(neState["expire"])
neLicense.Capability = fmt.Sprint(neState["capability"])
code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense) code, licensePath := s.neLicenseService.ReadLicenseInfo(neLicense)
neLicense.ActivationRequestCode = code neLicense.ActivationRequestCode = code
neLicense.LicensePath = licensePath neLicense.LicensePath = licensePath

1
src/modules/network_element/model/ne_license.go
View File

@@ -9,6 +9,7 @@ type NeLicense struct {
LicensePath string `json:"licensePath" gorm:"license_path"` // 激活授权文件 LicensePath string `json:"licensePath" gorm:"license_path"` // 激活授权文件
SerialNum string `json:"serialNum" gorm:"serial_num"` // 序列号 SerialNum string `json:"serialNum" gorm:"serial_num"` // 序列号
ExpiryDate string `json:"expiryDate" gorm:"expiry_date"` // 许可证到期日期 ExpiryDate string `json:"expiryDate" gorm:"expiry_date"` // 许可证到期日期
Capability string `json:"capability" gorm:"capability"` // 许可证用户容量
Status string `json:"status" gorm:"status"` // 状态 0无效 1有效 Status string `json:"status" gorm:"status"` // 状态 0无效 1有效
Remark string `json:"remark" gorm:"remark"` // 备注 Remark string `json:"remark" gorm:"remark"` // 备注
CreateBy string `json:"createBy" gorm:"create_by"` // 创建者 CreateBy string `json:"createBy" gorm:"create_by"` // 创建者

10
src/modules/network_element/repository/ne_license.go
View File

@@ -14,7 +14,8 @@ import (
// 实例化数据层 NeLicense 结构体 // 实例化数据层 NeLicense 结构体
var NewNeLicense = &NeLicense{ var NewNeLicense = &NeLicense{
selectSql: `select selectSql: `select
id, ne_type, ne_id, activation_request_code, license_path, serial_num, expiry_date, status, remark, create_by, create_time, update_by, update_time id, ne_type, ne_id, activation_request_code, license_path, serial_num,
expiry_date, capability, status, remark, create_by, create_time, update_by, update_time
from ne_license`, from ne_license`,
resultMap: map[string]string{ resultMap: map[string]string{
@@ -25,6 +26,7 @@ var NewNeLicense = &NeLicense{
"license_path": "LicensePath", "license_path": "LicensePath",
"serial_num": "SerialNum", "serial_num": "SerialNum",
"expiry_date": "ExpiryDate", "expiry_date": "ExpiryDate",
"capability": "Capability",
"status": "Status", "status": "Status",
"remark": "Remark", "remark": "Remark",
"create_by": "CreateBy", "create_by": "CreateBy",
@@ -202,6 +204,9 @@ func (r *NeLicense) Insert(neLicense model.NeLicense) string {
if neLicense.ExpiryDate != "" { if neLicense.ExpiryDate != "" {
params["expiry_date"] = neLicense.ExpiryDate params["expiry_date"] = neLicense.ExpiryDate
} }
if neLicense.Capability != "" {
params["capability"] = neLicense.Capability
}
if neLicense.Status != "" { if neLicense.Status != "" {
params["status"] = neLicense.Status params["status"] = neLicense.Status
} }
@@ -262,6 +267,9 @@ func (r *NeLicense) Update(neLicense model.NeLicense) int64 {
if neLicense.ExpiryDate != "" { if neLicense.ExpiryDate != "" {
params["expiry_date"] = neLicense.ExpiryDate params["expiry_date"] = neLicense.ExpiryDate
} }
if neLicense.Capability != "" {
params["capability"] = neLicense.Capability
}
if neLicense.Status != "" { if neLicense.Status != "" {
params["status"] = neLicense.Status params["status"] = neLicense.Status
} }