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

fix: 网元类型HLR跟踪查询类型HLR

Browse Source
This commit is contained in:
TsMask
2024-12-13 18:21:36 +08:00
parent c40feee2bb
commit fb3c58b00f
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/network_element/fetch_link/hlr.go
View File

@@ -37,7 +37,7 @@ func HLRTraceStart(neInfo model.NeInfo, data map[string]any) (string, error) {
if v, ok := resData["code"]; ok && v == "0" { if v, ok := resData["code"]; ok && v == "0" {
return strings.TrimSpace(strings.ToLower(resData["message"])), nil return strings.TrimSpace(strings.ToLower(resData["message"])), nil
} }
return "", fmt.Errorf(resData["message"]) return "", fmt.Errorf("%s", resData["message"])
} }
// HLRTraceStop HLR跟踪任务停止 // 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" { if v, ok := resData["code"]; ok && v == "0" {
return strings.TrimSpace(strings.ToLower(resData["message"])), nil return strings.TrimSpace(strings.ToLower(resData["message"])), nil
} }
return "", fmt.Errorf(resData["message"]) return "", fmt.Errorf("%s", resData["message"])
} }

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

@@ -35,5 +35,5 @@ func UDMImportAuth(udmIP string, data map[string]any) (string, error) {
if v, ok := resData["code"]; ok && v == "00000" { if v, ok := resData["code"]; ok && v == "00000" {
return strings.TrimSpace(strings.ToLower(resData["message"])), nil return strings.TrimSpace(strings.ToLower(resData["message"])), nil
} }
return "", fmt.Errorf(resData["message"]) return "", fmt.Errorf("%s", resData["message"])
} }

1
src/modules/network_element/repository/ne_info.go
View File

@@ -34,6 +34,7 @@ var neListSort = []string{
"SMSF", "SMSF",
"CBC", "CBC",
"CHF", "CHF",
"HLR",
} }
// 实例化数据层 NeInfo 结构体 // 实例化数据层 NeInfo 结构体

8
src/modules/trace/service/trace_task_hlr.go
View File

@@ -60,7 +60,7 @@ func (r *TraceTaskHlr) DeleteByIds(ids []string) (int64, error) {
if len(rows) == len(ids) { 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 { for _, r := range rows {
if r.Status == "0" { if r.Status == "0" {
continue 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 { for _, neInfo := range neInfos {
hlrItem := map[string]any{ hlrItem := map[string]any{
"neType": neInfo.NeType, "neType": neInfo.NeType,
@@ -129,7 +129,7 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) {
func (r *TraceTaskHlr) Stop(task model.TraceTaskHlr) error { func (r *TraceTaskHlr) Stop(task model.TraceTaskHlr) error {
hlrList := []map[string]any{} 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 { for _, neInfo := range neInfos {
hlrItem := map[string]any{ hlrItem := map[string]any{
"neType": neInfo.NeType, "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) { func (r *TraceTaskHlr) File(traceId, dirPath string) ([]map[string]any, error) {
hlrList := []map[string]any{} 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 { if len(neInfos) == 0 {
return nil, fmt.Errorf("not found network element") return nil, fmt.Errorf("not found network element")
} }