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

fix: CDR/Event 查询时间格式统一时间戳int64

Browse Source
This commit is contained in:
TsMask
2025-02-25 14:41:56 +08:00
parent 4fd359add4
commit 88d6f36a18
12 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/network_data/model/cdr_event_ims.go
View File

@@ -26,8 +26,8 @@ type CDREventIMSQuery struct {
RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOC MTC RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOC MTC
CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码
CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码
StartTime string `json:"startTime" form:"startTime"` StartTime int64 `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"` EndTime int64 `json:"endTime" form:"endTime"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"`

4
src/modules/network_data/model/cdr_event_sgwc.go
View File

@@ -27,8 +27,8 @@ type CDREventSGWCQuery struct {
RmUID string `json:"rmUID" form:"rmUID"` RmUID string `json:"rmUID" form:"rmUID"`
IMSI string `json:"imsi" form:"imsi"` IMSI string `json:"imsi" form:"imsi"`
MSISDN string `json:"msisdn" form:"msisdn"` MSISDN string `json:"msisdn" form:"msisdn"`
StartTime string `json:"startTime" form:"startTime"` StartTime int64 `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"` EndTime int64 `json:"endTime" form:"endTime"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"`

4
src/modules/network_data/model/cdr_event_smf.go
View File

@@ -28,8 +28,8 @@ type CDREventSMFQuery struct {
RecordType string `json:"recordType" form:"recordType"` // 暂时没用到 RecordType string `json:"recordType" form:"recordType"` // 暂时没用到
SubscriberID string `json:"subscriberID" form:"subscriberID"` SubscriberID string `json:"subscriberID" form:"subscriberID"`
DNN string `json:"dnn" form:"dnn"` DNN string `json:"dnn" form:"dnn"`
StartTime string `json:"startTime" form:"startTime"` StartTime int64 `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"` EndTime int64 `json:"endTime" form:"endTime"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"`

4
src/modules/network_data/model/cdr_event_smsc.go
View File

@@ -26,8 +26,8 @@ type CDREventSMSCQuery struct {
RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOSM MTSM RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOSM MTSM
CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码
CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码
StartTime string `json:"startTime" form:"startTime"` StartTime int64 `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"` EndTime int64 `json:"endTime" form:"endTime"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"`

4
src/modules/network_data/model/ue_event_amf.go
View File

@@ -26,8 +26,8 @@ type UEEventAMFQuery struct {
RmUID string `json:"rmUID" form:"rmUID"` RmUID string `json:"rmUID" form:"rmUID"`
EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state
IMSI string `json:"imsi" form:"imsi"` // imsi IMSI string `json:"imsi" form:"imsi"` // imsi
StartTime string `json:"startTime" form:"startTime"` StartTime int64 `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"` EndTime int64 `json:"endTime" form:"endTime"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"`

4
src/modules/network_data/model/ue_event_mme.go
View File

@@ -26,8 +26,8 @@ type UEEventMMEQuery struct {
RmUID string `json:"rmUID" form:"rmUID"` RmUID string `json:"rmUID" form:"rmUID"`
EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state
IMSI string `json:"imsi" form:"imsi"` // imsi IMSI string `json:"imsi" form:"imsi"` // imsi
StartTime string `json:"startTime" form:"startTime"` StartTime int64 `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"` EndTime int64 `json:"endTime" form:"endTime"`
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段 SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"`

8
src/modules/network_data/repository/cdr_event_ims.go
View File

@@ -25,15 +25,15 @@ func (r CDREventIMS) SelectByPage(querys model.CDREventIMSQuery) ([]model.CDREve
if querys.RmUID != "" { if querys.RmUID != "" {
tx = tx.Where("rm_uid = ?", querys.RmUID) tx = tx.Where("rm_uid = ?", querys.RmUID)
} }
if querys.StartTime != "" { if querys.StartTime != 0 {
startTime := querys.StartTime startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 { if len(startTime) == 13 {
startTime = startTime[:10] startTime = startTime[:10]
} }
tx = tx.Where("timestamp >= ?", startTime) tx = tx.Where("timestamp >= ?", startTime)
} }
if querys.EndTime != "" { if querys.EndTime != 0 {
endTime := querys.EndTime endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 { if len(endTime) == 13 {
endTime = endTime[:10] endTime = endTime[:10]
} }

10
src/modules/network_data/repository/cdr_event_sgwc.go
View File

@@ -1,6 +1,8 @@
package repository package repository
import ( import (
"fmt"
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/modules/network_data/model" "be.ems/src/modules/network_data/model"
@@ -22,15 +24,15 @@ func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDRE
if querys.RmUID != "" { if querys.RmUID != "" {
tx = tx.Where("rm_uid = ?", querys.RmUID) tx = tx.Where("rm_uid = ?", querys.RmUID)
} }
if querys.StartTime != "" { if querys.StartTime != 0 {
startTime := querys.StartTime startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 { if len(startTime) == 13 {
startTime = startTime[:10] startTime = startTime[:10]
} }
tx = tx.Where("timestamp >= ?", startTime) tx = tx.Where("timestamp >= ?", startTime)
} }
if querys.EndTime != "" { if querys.EndTime != 0 {
endTime := querys.EndTime endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 { if len(endTime) == 13 {
endTime = endTime[:10] endTime = endTime[:10]
} }

10
src/modules/network_data/repository/cdr_event_smf.go
View File

@@ -1,6 +1,8 @@
package repository package repository
import ( import (
"fmt"
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
"be.ems/src/framework/logger" "be.ems/src/framework/logger"
"be.ems/src/modules/network_data/model" "be.ems/src/modules/network_data/model"
@@ -22,15 +24,15 @@ func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREve
if querys.RmUID != "" { if querys.RmUID != "" {
tx = tx.Where("rm_uid = ?", querys.RmUID) tx = tx.Where("rm_uid = ?", querys.RmUID)
} }
if querys.StartTime != "" { if querys.StartTime != 0 {
startTime := querys.StartTime startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 { if len(startTime) == 13 {
startTime = startTime[:10] startTime = startTime[:10]
} }
tx = tx.Where("timestamp >= ?", startTime) tx = tx.Where("timestamp >= ?", startTime)
} }
if querys.EndTime != "" { if querys.EndTime != 0 {
endTime := querys.EndTime endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 { if len(endTime) == 13 {
endTime = endTime[:10] endTime = endTime[:10]
} }

8
src/modules/network_data/repository/cdr_event_smsc.go
View File

@@ -25,15 +25,15 @@ func (r CDREventSMSC) SelectByPage(querys model.CDREventSMSCQuery) ([]model.CDRE
if querys.RmUID != "" { if querys.RmUID != "" {
tx = tx.Where("rm_uid = ?", querys.RmUID) tx = tx.Where("rm_uid = ?", querys.RmUID)
} }
if querys.StartTime != "" { if querys.StartTime != 0 {
startTime := querys.StartTime startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 { if len(startTime) == 13 {
startTime = startTime[:10] startTime = startTime[:10]
} }
tx = tx.Where("timestamp >= ?", startTime) tx = tx.Where("timestamp >= ?", startTime)
} }
if querys.EndTime != "" { if querys.EndTime != 0 {
endTime := querys.EndTime endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 { if len(endTime) == 13 {
endTime = endTime[:10] endTime = endTime[:10]
} }

9
src/modules/network_data/repository/ue_event_amf.go
View File

@@ -1,6 +1,7 @@
package repository package repository
import ( import (
"fmt"
"strings" "strings"
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
@@ -24,15 +25,15 @@ func (r UEEventAMF) SelectByPage(querys model.UEEventAMFQuery) ([]model.UEEventA
if querys.RmUID != "" { if querys.RmUID != "" {
tx = tx.Where("rm_uid = ?", querys.RmUID) tx = tx.Where("rm_uid = ?", querys.RmUID)
} }
if querys.StartTime != "" { if querys.StartTime != 0 {
startTime := querys.StartTime startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 { if len(startTime) == 13 {
startTime = startTime[:10] startTime = startTime[:10]
} }
tx = tx.Where("timestamp >= ?", startTime) tx = tx.Where("timestamp >= ?", startTime)
} }
if querys.EndTime != "" { if querys.EndTime != 0 {
endTime := querys.EndTime endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 { if len(endTime) == 13 {
endTime = endTime[:10] endTime = endTime[:10]
} }

9
src/modules/network_data/repository/ue_event_mme.go
View File

@@ -1,6 +1,7 @@
package repository package repository
import ( import (
"fmt"
"strings" "strings"
"be.ems/src/framework/datasource" "be.ems/src/framework/datasource"
@@ -24,15 +25,15 @@ func (r UEEventMME) SelectByPage(querys model.UEEventMMEQuery) ([]model.UEEventM
if querys.RmUID != "" { if querys.RmUID != "" {
tx = tx.Where("rm_uid = ?", querys.RmUID) tx = tx.Where("rm_uid = ?", querys.RmUID)
} }
if querys.StartTime != "" { if querys.StartTime != 0 {
startTime := querys.StartTime startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 { if len(startTime) == 13 {
startTime = startTime[:10] startTime = startTime[:10]
} }
tx = tx.Where("timestamp >= ?", startTime) tx = tx.Where("timestamp >= ?", startTime)
} }
if querys.EndTime != "" { if querys.EndTime != 0 {
endTime := querys.EndTime endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 { if len(endTime) == 13 {
endTime = endTime[:10] endTime = endTime[:10]
} }