feat: 更新多个模块以支持新的数据结构和日志格式
This commit is contained in:
1 parent
045a2b6b01
commit
f3c33b31ac
272 files changed
+13153
-15792
No files matched your search
@@ -5,7 +5,7 @@ import (
|
||||
"fmt"
|
||||
|
||||
"be.ems/src/framework/logger"
|
||||
"be.ems/src/framework/vo/result"
|
||||
"be.ems/src/framework/resp"
|
||||
neDataModel "be.ems/src/modules/network_data/model"
|
||||
neDataService "be.ems/src/modules/network_data/service"
|
||||
neInfoService "be.ems/src/modules/network_element/service"
|
||||
@@ -22,14 +22,14 @@ func GetCDRConnectByIMS(requestID string, data any) ([]byte, error) {
|
||||
}
|
||||
|
||||
// 查询网元信息 rmUID
|
||||
neInfo := neInfoService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
if neInfo.NeId != query.NeID || neInfo.IP == "" {
|
||||
return nil, fmt.Errorf("query neinfo not found")
|
||||
}
|
||||
query.RmUID = neInfo.RmUID
|
||||
|
||||
rows, total := neDataService.NewCDREventIMS.SelectPage(query)
|
||||
resultByte, err := json.Marshal(result.Ok(map[string]any{
|
||||
rows, total := neDataService.NewCDREventIMS.FindByPage(query)
|
||||
resultByte, err := json.Marshal(resp.Ok(map[string]any{
|
||||
"requestId": requestID,
|
||||
"data": map[string]any{"rows": rows, "total": total},
|
||||
}))
|
||||
@@ -47,14 +47,14 @@ func GetCDRConnectBySMF(requestID string, data any) ([]byte, error) {
|
||||
}
|
||||
|
||||
// 查询网元信息 rmUID
|
||||
neInfo := neInfoService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
if neInfo.NeId != query.NeID || neInfo.IP == "" {
|
||||
return nil, fmt.Errorf("query neinfo not found")
|
||||
}
|
||||
query.RmUID = neInfo.RmUID
|
||||
|
||||
rows, total := neDataService.NewCDREventSMF.SelectPage(query)
|
||||
resultByte, err := json.Marshal(result.Ok(map[string]any{
|
||||
rows, total := neDataService.NewCDREventSMF.FindByPage(query)
|
||||
resultByte, err := json.Marshal(resp.Ok(map[string]any{
|
||||
"requestId": requestID,
|
||||
"data": map[string]any{"rows": rows, "total": total},
|
||||
}))
|
||||
@@ -72,14 +72,14 @@ func GetCDRConnectBySMSC(requestID string, data any) ([]byte, error) {
|
||||
}
|
||||
|
||||
// 查询网元信息 rmUID
|
||||
neInfo := neInfoService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
neInfo := neInfoService.NewNeInfo.FindByNeTypeAndNeID(query.NeType, query.NeID)
|
||||
if neInfo.NeId != query.NeID || neInfo.IP == "" {
|
||||
return nil, fmt.Errorf("query neinfo not found")
|
||||
}
|
||||
query.RmUID = neInfo.RmUID
|
||||
|
||||
rows, total := neDataService.NewCDREventSMSC.SelectPage(query)
|
||||
resultByte, err := json.Marshal(result.Ok(map[string]any{
|
||||
rows, total := neDataService.NewCDREventSMSC.FindByPage(query)
|
||||
resultByte, err := json.Marshal(resp.Ok(map[string]any{
|
||||
"requestId": requestID,
|
||||
"data": map[string]any{"rows": rows, "total": total},
|
||||
}))
|
||||
|
||||
Reference in new issue
Block a user