From fb3c58b00f539c41b22de6d4e3dc2569d63ebcb4 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 13 Dec 2024 18:21:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=B1=BB=E5=9E=8BHLR?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=9E=8BHLR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/fetch_link/hlr.go | 4 ++-- src/modules/network_element/fetch_link/udm.go | 2 +- src/modules/network_element/repository/ne_info.go | 1 + src/modules/trace/service/trace_task_hlr.go | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/modules/network_element/fetch_link/hlr.go b/src/modules/network_element/fetch_link/hlr.go index 8a4c1198..4d3cfe6d 100644 --- a/src/modules/network_element/fetch_link/hlr.go +++ b/src/modules/network_element/fetch_link/hlr.go @@ -37,7 +37,7 @@ func HLRTraceStart(neInfo model.NeInfo, data map[string]any) (string, error) { if v, ok := resData["code"]; ok && v == "0" { return strings.TrimSpace(strings.ToLower(resData["message"])), nil } - return "", fmt.Errorf(resData["message"]) + return "", fmt.Errorf("%s", resData["message"]) } // HLRTraceStop HLR跟踪任务停止 @@ -64,5 +64,5 @@ func HLRTraceStop(neInfo model.NeInfo, data map[string]any) (string, error) { if v, ok := resData["code"]; ok && v == "0" { return strings.TrimSpace(strings.ToLower(resData["message"])), nil } - return "", fmt.Errorf(resData["message"]) + return "", fmt.Errorf("%s", resData["message"]) } diff --git a/src/modules/network_element/fetch_link/udm.go b/src/modules/network_element/fetch_link/udm.go index d027f9f0..6ad1359f 100644 --- a/src/modules/network_element/fetch_link/udm.go +++ b/src/modules/network_element/fetch_link/udm.go @@ -35,5 +35,5 @@ func UDMImportAuth(udmIP string, data map[string]any) (string, error) { if v, ok := resData["code"]; ok && v == "00000" { return strings.TrimSpace(strings.ToLower(resData["message"])), nil } - return "", fmt.Errorf(resData["message"]) + return "", fmt.Errorf("%s", resData["message"]) } diff --git a/src/modules/network_element/repository/ne_info.go b/src/modules/network_element/repository/ne_info.go index 6e2a5ccd..ef9c3b3b 100644 --- a/src/modules/network_element/repository/ne_info.go +++ b/src/modules/network_element/repository/ne_info.go @@ -34,6 +34,7 @@ var neListSort = []string{ "SMSF", "CBC", "CHF", + "HLR", } // 实例化数据层 NeInfo 结构体 diff --git a/src/modules/trace/service/trace_task_hlr.go b/src/modules/trace/service/trace_task_hlr.go index 9eee3843..791cc12c 100644 --- a/src/modules/trace/service/trace_task_hlr.go +++ b/src/modules/trace/service/trace_task_hlr.go @@ -60,7 +60,7 @@ func (r *TraceTaskHlr) DeleteByIds(ids []string) (int64, error) { if len(rows) == len(ids) { // 停止任务 - neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "UDM"}, false, false) + neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false) for _, r := range rows { if r.Status == "0" { continue @@ -98,7 +98,7 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) { } // 发送创建任务 - neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "UDM"}, false, false) + neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false) for _, neInfo := range neInfos { hlrItem := map[string]any{ "neType": neInfo.NeType, @@ -129,7 +129,7 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) { func (r *TraceTaskHlr) Stop(task model.TraceTaskHlr) error { hlrList := []map[string]any{} // 发送停止任务 - neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "UDM"}, false, false) + neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false) for _, neInfo := range neInfos { hlrItem := map[string]any{ "neType": neInfo.NeType, @@ -161,7 +161,7 @@ func (r *TraceTaskHlr) Stop(task model.TraceTaskHlr) error { func (r *TraceTaskHlr) File(traceId, dirPath string) ([]map[string]any, error) { hlrList := []map[string]any{} // 查询所有匹配的网元类型 - neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "UDM"}, false, false) + neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false) if len(neInfos) == 0 { return nil, fmt.Errorf("not found network element") }