diff --git a/build/database/lite/install/trace_task.sql b/build/database/lite/install/trace_task.sql index b6d4dbaf..5b11b415 100644 --- a/build/database/lite/install/trace_task.sql +++ b/build/database/lite/install/trace_task.sql @@ -17,7 +17,7 @@ CREATE TABLE "trace_task" ( "create_time" integer, "title" text(255), "remark" text(500), - "ne_list" text(32) NOT NULL, + "ne_list" text(255) NOT NULL, "notify_url" text(128) NOT NULL, PRIMARY KEY ("id") ); diff --git a/build/database/lite/upgrade/upg_trace_task.sql b/build/database/lite/upgrade/upg_trace_task.sql index 7eb078c6..5f2d45a7 100644 --- a/build/database/lite/upgrade/upg_trace_task.sql +++ b/build/database/lite/upgrade/upg_trace_task.sql @@ -1,6 +1,7 @@ -- ---------------------------- -- Table structure for trace_task -- ---------------------------- +ALTER TABLE "trace_task" RENAME TO "trace_task_old"; CREATE TABLE IF NOT EXISTS "trace_task" ( "id" integer NOT NULL, "trace_id" text(16) NOT NULL, @@ -16,7 +17,7 @@ CREATE TABLE IF NOT EXISTS "trace_task" ( "create_time" integer, "title" text(255), "remark" text(500), - "ne_list" text(32) NOT NULL, + "ne_list" text(255) NOT NULL, "notify_url" text(128) NOT NULL, 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"; diff --git a/build/database/std/install/trace_task.sql b/build/database/std/install/trace_task.sql index 58a5af84..11083ce0 100644 --- a/build/database/std/install/trace_task.sql +++ b/build/database/std/install/trace_task.sql @@ -18,7 +18,7 @@ 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(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', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='跟踪_任务'; diff --git a/build/database/std/upgrade/upg_trace_task.sql b/build/database/std/upgrade/upg_trace_task.sql index bcbc58f3..3f5ce2d3 100644 --- a/build/database/std/upgrade/upg_trace_task.sql +++ b/build/database/std/upgrade/upg_trace_task.sql @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `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(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', PRIMARY KEY (`id`) USING BTREE ) 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` 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 `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`; -- Dump completed on 2025-04-14 14:26:59 diff --git a/src/modules/network_element/fetch_link/ne_trace.go b/src/modules/network_element/fetch_link/ne_trace.go index b31117ae..fe708348 100644 --- a/src/modules/network_element/fetch_link/ne_trace.go +++ b/src/modules/network_element/fetch_link/ne_trace.go @@ -18,8 +18,8 @@ func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) { var resData map[string]any if err != nil { errStr := err.Error() - logger.Warnf("NeTraceAdd POST \"%s\"", neUrl) if !(strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "400")) { + logger.Warnf("NeTraceAdd POST \"%s\"", neUrl) logger.Errorf("NeTraceAdd %s", errStr) return nil, fmt.Errorf("NeService Trace Add API Error") }