merge: 合并代码20241228

This commit is contained in:
TsMask committed 2024-12-28 15:36:47 +08:00
1 parent 6b4633fa5e
commit 33cbaeb1cd
69 files changed
+2546 -1951

No files matched your search

+6 -6
View File
@@ -28,10 +28,10 @@ func GetCDRConnectByIMS(requestID string, data any) ([]byte, error) {
}
query.RmUID = neInfo.RmUID
dataMap := neDataService.NewCDREventIMS.SelectPage(query)
rows, total := neDataService.NewCDREventIMS.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
"requestId": requestID,
"data": dataMap,
"data": map[string]any{"rows": rows, "total": total},
}))
return resultByte, err
}
@@ -53,10 +53,10 @@ func GetCDRConnectBySMF(requestID string, data any) ([]byte, error) {
}
query.RmUID = neInfo.RmUID
dataMap := neDataService.NewCDREventSMF.SelectPage(query)
rows, total := neDataService.NewCDREventSMF.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
"requestId": requestID,
"data": dataMap,
"data": map[string]any{"rows": rows, "total": total},
}))
return resultByte, err
}
@@ -78,10 +78,10 @@ func GetCDRConnectBySMSC(requestID string, data any) ([]byte, error) {
}
query.RmUID = neInfo.RmUID
dataMap := neDataService.NewCDREventSMSC.SelectPage(query)
rows, total := neDataService.NewCDREventSMSC.SelectPage(query)
resultByte, err := json.Marshal(result.Ok(map[string]any{
"requestId": requestID,
"data": dataMap,
"data": map[string]any{"rows": rows, "total": total},
}))
return resultByte, err
}