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

fix: SMF在线订阅用户列表接口地址错误

Browse Source
This commit is contained in:
TsMask
2024-09-24 10:35:47 +08:00
parent 0c053bb382
commit 0287852470
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/modules/network_data/controller/smf.go
View File

@@ -293,7 +293,7 @@ func (s *SMFController) SubUserList(c *gin.Context) {
} }
// 网元直连 // 网元直连
data, err := neFetchlink.SMFSubInfo(neInfo, map[string]string{ data, err := neFetchlink.SMFSubInfoList(neInfo, map[string]string{
"imsi": query.IMSI, "imsi": query.IMSI,
"msisdn": query.MSISDN, "msisdn": query.MSISDN,
"upstate": query.Upstate, "upstate": query.Upstate,
@@ -306,24 +306,23 @@ func (s *SMFController) SubUserList(c *gin.Context) {
// 对数据进行处理，去掉前缀，并加入imsi拓展信息 // 对数据进行处理，去掉前缀，并加入imsi拓展信息
rows := data["rows"].([]any) rows := data["rows"].([]any)
arr := &rows if len(rows) > 0 {
for i := range *arr { arr := &rows
item := (*arr)[i].(map[string]any) for i := range *arr {
if v, ok := item["imsi"]; ok && v != nil { item := (*arr)[i].(map[string]any)
imsiStr := v.(string) if v, ok := item["imsi"]; ok && v != nil {
imsiStr = strings.TrimPrefix(imsiStr, "imsi-") imsiStr := v.(string)
item["imsi"] = imsiStr imsiStr = strings.TrimPrefix(imsiStr, "imsi-")
// 查UDM拓展信息 item["imsi"] = imsiStr
info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "") // 查UDM拓展信息
item["remark"] = info.Remark info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "")
} item["remark"] = info.Remark
if v, ok := item["msisdn"]; ok && v != nil { }
item["msisdn"] = strings.TrimPrefix(v.(string), "msisdn-") if v, ok := item["msisdn"]; ok && v != nil {
item["msisdn"] = strings.TrimPrefix(v.(string), "msisdn-")
}
} }
} }
c.JSON(200, result.Ok(map[string]any{ c.JSON(200, result.Ok(data))
"total": data["total"],
"rows": data["rows"],
}))
} }

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

@@ -10,12 +10,12 @@ import (
"be.ems/src/modules/network_element/model" "be.ems/src/modules/network_element/model"
) )
// SMFSubInfo SMF在线订阅用户列表信息 // SMFSubInfoList SMF在线订阅用户列表信息
// //
// 查询参数 {"imsi":"360000100000130","msisdn":"8612300000130","upstate":"Inactive","pageNum":"1"} // 查询参数 {"imsi":"360000100000130","msisdn":"8612300000130","upstate":"Inactive","pageNum":"1"}
// //
// 返回结果 {"rows":[],"total":0} // 返回结果 {"rows":[],"total":0}
func SMFSubInfo(neInfo model.NeInfo, data map[string]string) (map[string]any, error) { func SMFSubInfoList(neInfo model.NeInfo, data map[string]string) (map[string]any, error) {
neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo", neInfo.IP, neInfo.Port) neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo", neInfo.IP, neInfo.Port)
// 查询参数拼接 // 查询参数拼接
query := []string{} query := []string{}