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

fix: 增加ne_list字段的长度限制，修改相关SQL脚本

Browse Source
This commit is contained in:
TsMask
2025-05-29 15:01:35 +08:00
parent d080dcd367
commit ba45cd601c
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/database/lite/install/trace_task.sql
View File

@@ -17,7 +17,7 @@ CREATE TABLE "trace_task" (
"create_time" integer, "create_time" integer,
"title" text(255), "title" text(255),
"remark" text(500), "remark" text(500),
"ne_list" text(32) NOT NULL, "ne_list" text(255) NOT NULL,
"notify_url" text(128) NOT NULL, "notify_url" text(128) NOT NULL,
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );

11
build/database/lite/upgrade/upg_trace_task.sql
View File

@@ -1,6 +1,7 @@
-- ---------------------------- -- ----------------------------
-- Table structure for trace_task -- Table structure for trace_task
-- ---------------------------- -- ----------------------------
ALTER TABLE "trace_task" RENAME TO "trace_task_old";
CREATE TABLE IF NOT EXISTS "trace_task" ( CREATE TABLE IF NOT EXISTS "trace_task" (
"id" integer NOT NULL, "id" integer NOT NULL,
"trace_id" text(16) NOT NULL, "trace_id" text(16) NOT NULL,
@@ -16,7 +17,7 @@ CREATE TABLE IF NOT EXISTS "trace_task" (
"create_time" integer, "create_time" integer,
"title" text(255), "title" text(255),
"remark" text(500), "remark" text(500),
"ne_list" text(32) NOT NULL, "ne_list" text(255) NOT NULL,
"notify_url" text(128) NOT NULL, "notify_url" text(128) NOT NULL,
PRIMARY KEY ("id") PRIMARY KEY ("id")
); );
@@ -26,5 +27,9 @@ CREATE TABLE IF NOT EXISTS "trace_task" (
-- ---------------------------- -- ----------------------------
-- ADD COLUMN -- ----------------------------
ALTER TABLE trace_task ADD COLUMN title text(255); -- COLUMN for trace_task
-- ----------------------------
-- ALTER TABLE trace_task ADD COLUMN title text(255);
INSERT INTO "trace_task" ("id", "trace_id", "trace_type", "start_time", "end_time", "interfaces", "imsi", "msisdn", "src_ip", "dst_ip", "create_by", "create_time", "title", "remark", "ne_list", "notify_url") SELECT "id", "trace_id", "trace_type", "start_time", "end_time", "interfaces", "imsi", "msisdn", "src_ip", "dst_ip", "create_by", "create_time", "title", "remark", "ne_list", "notify_url" FROM "trace_task_old";
DROP TABLE IF EXISTS "trace_task_old";

2
build/database/std/install/trace_task.sql
View File

@@ -18,7 +18,7 @@ CREATE TABLE `trace_task` (
`create_time` bigint DEFAULT '0' COMMENT '创建时间', `create_time` bigint DEFAULT '0' COMMENT '创建时间',
`title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '任务标题', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '任务标题',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '备注', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '备注',
`ne_list` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001', `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001',
`notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033', `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 PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务';

5
build/database/std/upgrade/upg_trace_task.sql
View File

@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `trace_task` (
`create_time` bigint DEFAULT '0' COMMENT '创建时间', `create_time` bigint DEFAULT '0' COMMENT '创建时间',
`title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '任务标题', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '任务标题',
`remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '备注', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '备注',
`ne_list` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001', `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001',
`notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033', `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 PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务'; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务';
@@ -33,7 +33,8 @@ ALTER TABLE `trace_task` DROP COLUMN `ne_id`;
ALTER TABLE `trace_task` DROP COLUMN `fetch_msg`; ALTER TABLE `trace_task` DROP COLUMN `fetch_msg`;
ALTER TABLE `trace_task` MODIFY COLUMN `trace_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '1-Interface,2-Device,3-UE' AFTER `trace_id`; ALTER TABLE `trace_task` MODIFY COLUMN `trace_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '1-Interface,2-Device,3-UE' AFTER `trace_id`;
ALTER TABLE `trace_task` ADD COLUMN `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '任务标题' AFTER `create_time`; ALTER TABLE `trace_task` ADD COLUMN `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '任务标题' AFTER `create_time`;
ALTER TABLE `trace_task` ADD COLUMN `ne_list` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001' AFTER `remark`; ALTER TABLE `trace_task` ADD COLUMN `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001' AFTER `remark`;
ALTER TABLE `trace_task` MODIFY COLUMN `ne_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元列表 neType_neId 例如 UDM_001,AMF_001' AFTER `remark`;
ALTER TABLE `trace_task` MODIFY COLUMN `notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033' AFTER `ne_list`; ALTER TABLE `trace_task` MODIFY COLUMN `notify_url` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '信息数据通知回调地址UDP 例如udp:192.168.5.58:33033' AFTER `ne_list`;
-- Dump completed on 2025-04-14 14:26:59 -- Dump completed on 2025-04-14 14:26:59

2
src/modules/network_element/fetch_link/ne_trace.go
View File

@@ -18,8 +18,8 @@ func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) {
var resData map[string]any var resData map[string]any
if err != nil { if err != nil {
errStr := err.Error() errStr := err.Error()
logger.Warnf("NeTraceAdd POST \"%s\"", neUrl)
if !(strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "400")) { if !(strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "400")) {
logger.Warnf("NeTraceAdd POST \"%s\"", neUrl)
logger.Errorf("NeTraceAdd %s", errStr) logger.Errorf("NeTraceAdd %s", errStr)
return nil, fmt.Errorf("NeService Trace Add API Error") return nil, fmt.Errorf("NeService Trace Add API Error")
} }