fix: CDR数据对rmUID进行区分对应网元
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
"be.ems/src/framework/vo/result"
|
||||
neDataModel "be.ems/src/modules/network_data/model"
|
||||
neDataService "be.ems/src/modules/network_data/service"
|
||||
neInfoService "be.ems/src/modules/network_element/service"
|
||||
)
|
||||
|
||||
// GetCDRConnectByIMS 获取CDR会话事件-IMS
|
||||
@@ -20,6 +21,13 @@ func GetCDRConnectByIMS(requestID string, data any) ([]byte, error) {
|
||||
return nil, fmt.Errorf("query data structure error")
|
||||
}
|
||||
|
||||
// 查询网元信息 rmUID
|
||||
neInfo := neInfoService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
if neInfo.NeId != query.NeID || neInfo.IP == "" {
|
||||
return nil, fmt.Errorf("query neinfo not found")
|
||||
}
|
||||
query.RmUID = neInfo.RmUID
|
||||
|
||||
dataMap := neDataService.NewCDREventIMSImpl.SelectPage(query)
|
||||
resultByte, err := json.Marshal(result.Ok(map[string]any{
|
||||
"requestId": requestID,
|
||||
@@ -38,6 +46,13 @@ func GetCDRConnectBySMF(requestID string, data any) ([]byte, error) {
|
||||
return nil, fmt.Errorf("query data structure error")
|
||||
}
|
||||
|
||||
// 查询网元信息 rmUID
|
||||
neInfo := neInfoService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
if neInfo.NeId != query.NeID || neInfo.IP == "" {
|
||||
return nil, fmt.Errorf("query neinfo not found")
|
||||
}
|
||||
query.RmUID = neInfo.RmUID
|
||||
|
||||
dataMap := neDataService.NewCDREventSMFImpl.SelectPage(query)
|
||||
resultByte, err := json.Marshal(result.Ok(map[string]any{
|
||||
"requestId": requestID,
|
||||
@@ -45,3 +60,28 @@ func GetCDRConnectBySMF(requestID string, data any) ([]byte, error) {
|
||||
}))
|
||||
return resultByte, err
|
||||
}
|
||||
|
||||
// GetCDRConnectBySMSC 获取CDR会话事件-SMSC
|
||||
func GetCDRConnectBySMSC(requestID string, data any) ([]byte, error) {
|
||||
msgByte, _ := json.Marshal(data)
|
||||
var query neDataModel.CDREventSMSCQuery
|
||||
err := json.Unmarshal(msgByte, &query)
|
||||
if err != nil {
|
||||
logger.Warnf("ws processor GetCDRConnect err: %s", err.Error())
|
||||
return nil, fmt.Errorf("query data structure error")
|
||||
}
|
||||
|
||||
// 查询网元信息 rmUID
|
||||
neInfo := neInfoService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
if neInfo.NeId != query.NeID || neInfo.IP == "" {
|
||||
return nil, fmt.Errorf("query neinfo not found")
|
||||
}
|
||||
query.RmUID = neInfo.RmUID
|
||||
|
||||
dataMap := neDataService.NewCDREventSMSCImpl.SelectPage(query)
|
||||
resultByte, err := json.Marshal(result.Ok(map[string]any{
|
||||
"requestId": requestID,
|
||||
"data": dataMap,
|
||||
}))
|
||||
return resultByte, err
|
||||
}
|
||||
|
||||
@@ -56,6 +56,8 @@ func (s *WSReceiveImpl) Commont(client *model.WSClient, reqMsg model.WSRequest)
|
||||
resByte, err = processor.GetCDRConnectByIMS(reqMsg.RequestID, reqMsg.Data)
|
||||
case "smf_cdr":
|
||||
resByte, err = processor.GetCDRConnectBySMF(reqMsg.RequestID, reqMsg.Data)
|
||||
case "smsc_cdr":
|
||||
resByte, err = processor.GetCDRConnectBySMSC(reqMsg.RequestID, reqMsg.Data)
|
||||
case "amf_ue":
|
||||
resByte, err = processor.GetUEConnectByAMF(reqMsg.RequestID, reqMsg.Data)
|
||||
case "mme_ue":
|
||||
|
||||
Reference in New Issue
Block a user