diff --git a/src/modules/network_data/model/cdr_event_ims.go b/src/modules/network_data/model/cdr_event_ims.go index e6f9e77d..351305a9 100644 --- a/src/modules/network_data/model/cdr_event_ims.go +++ b/src/modules/network_data/model/cdr_event_ims.go @@ -26,8 +26,8 @@ type CDREventIMSQuery struct { RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOC MTC CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 - StartTime string `json:"startTime" form:"startTime"` - EndTime string `json:"endTime" form:"endTime"` + StartTime int64 `json:"startTime" form:"startTime"` + EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段,填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序,asc desc PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` diff --git a/src/modules/network_data/model/cdr_event_sgwc.go b/src/modules/network_data/model/cdr_event_sgwc.go index fedf6a4d..5fa35498 100644 --- a/src/modules/network_data/model/cdr_event_sgwc.go +++ b/src/modules/network_data/model/cdr_event_sgwc.go @@ -27,8 +27,8 @@ type CDREventSGWCQuery struct { RmUID string `json:"rmUID" form:"rmUID"` IMSI string `json:"imsi" form:"imsi"` MSISDN string `json:"msisdn" form:"msisdn"` - StartTime string `json:"startTime" form:"startTime"` - EndTime string `json:"endTime" form:"endTime"` + StartTime int64 `json:"startTime" form:"startTime"` + EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段,填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序,asc desc PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` diff --git a/src/modules/network_data/model/cdr_event_smf.go b/src/modules/network_data/model/cdr_event_smf.go index b5926b25..64ec57fb 100644 --- a/src/modules/network_data/model/cdr_event_smf.go +++ b/src/modules/network_data/model/cdr_event_smf.go @@ -28,8 +28,8 @@ type CDREventSMFQuery struct { RecordType string `json:"recordType" form:"recordType"` // 暂时没用到 SubscriberID string `json:"subscriberID" form:"subscriberID"` DNN string `json:"dnn" form:"dnn"` - StartTime string `json:"startTime" form:"startTime"` - EndTime string `json:"endTime" form:"endTime"` + StartTime int64 `json:"startTime" form:"startTime"` + EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段,填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序,asc desc PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` diff --git a/src/modules/network_data/model/cdr_event_smsc.go b/src/modules/network_data/model/cdr_event_smsc.go index a27074f1..29888710 100644 --- a/src/modules/network_data/model/cdr_event_smsc.go +++ b/src/modules/network_data/model/cdr_event_smsc.go @@ -26,8 +26,8 @@ type CDREventSMSCQuery struct { RecordType string `json:"recordType" form:"recordType"` // 记录行为 MOSM MTSM CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码 CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码 - StartTime string `json:"startTime" form:"startTime"` - EndTime string `json:"endTime" form:"endTime"` + StartTime int64 `json:"startTime" form:"startTime"` + EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段,填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序,asc desc PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` diff --git a/src/modules/network_data/model/ue_event_amf.go b/src/modules/network_data/model/ue_event_amf.go index 7ba8944f..aa9a65f2 100644 --- a/src/modules/network_data/model/ue_event_amf.go +++ b/src/modules/network_data/model/ue_event_amf.go @@ -26,8 +26,8 @@ type UEEventAMFQuery struct { RmUID string `json:"rmUID" form:"rmUID"` EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state IMSI string `json:"imsi" form:"imsi"` // imsi - StartTime string `json:"startTime" form:"startTime"` - EndTime string `json:"endTime" form:"endTime"` + StartTime int64 `json:"startTime" form:"startTime"` + EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段,填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序,asc desc PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` diff --git a/src/modules/network_data/model/ue_event_mme.go b/src/modules/network_data/model/ue_event_mme.go index 28100786..b08157f2 100644 --- a/src/modules/network_data/model/ue_event_mme.go +++ b/src/modules/network_data/model/ue_event_mme.go @@ -26,8 +26,8 @@ type UEEventMMEQuery struct { RmUID string `json:"rmUID" form:"rmUID"` EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state IMSI string `json:"imsi" form:"imsi"` // imsi - StartTime string `json:"startTime" form:"startTime"` - EndTime string `json:"endTime" form:"endTime"` + StartTime int64 `json:"startTime" form:"startTime"` + EndTime int64 `json:"endTime" form:"endTime"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段,填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序,asc desc PageNum int64 `json:"pageNum" form:"pageNum" binding:"required"` diff --git a/src/modules/network_data/repository/cdr_event_ims.go b/src/modules/network_data/repository/cdr_event_ims.go index 31dc7293..6f86f6db 100644 --- a/src/modules/network_data/repository/cdr_event_ims.go +++ b/src/modules/network_data/repository/cdr_event_ims.go @@ -25,15 +25,15 @@ func (r CDREventIMS) SelectByPage(querys model.CDREventIMSQuery) ([]model.CDREve if querys.RmUID != "" { tx = tx.Where("rm_uid = ?", querys.RmUID) } - if querys.StartTime != "" { - startTime := querys.StartTime + if querys.StartTime != 0 { + startTime := fmt.Sprintf("%d", querys.StartTime) if len(startTime) == 13 { startTime = startTime[:10] } tx = tx.Where("timestamp >= ?", startTime) } - if querys.EndTime != "" { - endTime := querys.EndTime + if querys.EndTime != 0 { + endTime := fmt.Sprintf("%d", querys.EndTime) if len(endTime) == 13 { endTime = endTime[:10] } diff --git a/src/modules/network_data/repository/cdr_event_sgwc.go b/src/modules/network_data/repository/cdr_event_sgwc.go index cf87e9db..783a2cbb 100644 --- a/src/modules/network_data/repository/cdr_event_sgwc.go +++ b/src/modules/network_data/repository/cdr_event_sgwc.go @@ -1,6 +1,8 @@ package repository import ( + "fmt" + "be.ems/src/framework/datasource" "be.ems/src/framework/logger" "be.ems/src/modules/network_data/model" @@ -22,15 +24,15 @@ func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDRE if querys.RmUID != "" { tx = tx.Where("rm_uid = ?", querys.RmUID) } - if querys.StartTime != "" { - startTime := querys.StartTime + if querys.StartTime != 0 { + startTime := fmt.Sprintf("%d", querys.StartTime) if len(startTime) == 13 { startTime = startTime[:10] } tx = tx.Where("timestamp >= ?", startTime) } - if querys.EndTime != "" { - endTime := querys.EndTime + if querys.EndTime != 0 { + endTime := fmt.Sprintf("%d", querys.EndTime) if len(endTime) == 13 { endTime = endTime[:10] } diff --git a/src/modules/network_data/repository/cdr_event_smf.go b/src/modules/network_data/repository/cdr_event_smf.go index 5b46e5ff..bf16939b 100644 --- a/src/modules/network_data/repository/cdr_event_smf.go +++ b/src/modules/network_data/repository/cdr_event_smf.go @@ -1,6 +1,8 @@ package repository import ( + "fmt" + "be.ems/src/framework/datasource" "be.ems/src/framework/logger" "be.ems/src/modules/network_data/model" @@ -22,15 +24,15 @@ func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREve if querys.RmUID != "" { tx = tx.Where("rm_uid = ?", querys.RmUID) } - if querys.StartTime != "" { - startTime := querys.StartTime + if querys.StartTime != 0 { + startTime := fmt.Sprintf("%d", querys.StartTime) if len(startTime) == 13 { startTime = startTime[:10] } tx = tx.Where("timestamp >= ?", startTime) } - if querys.EndTime != "" { - endTime := querys.EndTime + if querys.EndTime != 0 { + endTime := fmt.Sprintf("%d", querys.EndTime) if len(endTime) == 13 { endTime = endTime[:10] } diff --git a/src/modules/network_data/repository/cdr_event_smsc.go b/src/modules/network_data/repository/cdr_event_smsc.go index 3b6542ce..2379ac8e 100644 --- a/src/modules/network_data/repository/cdr_event_smsc.go +++ b/src/modules/network_data/repository/cdr_event_smsc.go @@ -25,15 +25,15 @@ func (r CDREventSMSC) SelectByPage(querys model.CDREventSMSCQuery) ([]model.CDRE if querys.RmUID != "" { tx = tx.Where("rm_uid = ?", querys.RmUID) } - if querys.StartTime != "" { - startTime := querys.StartTime + if querys.StartTime != 0 { + startTime := fmt.Sprintf("%d", querys.StartTime) if len(startTime) == 13 { startTime = startTime[:10] } tx = tx.Where("timestamp >= ?", startTime) } - if querys.EndTime != "" { - endTime := querys.EndTime + if querys.EndTime != 0 { + endTime := fmt.Sprintf("%d", querys.EndTime) if len(endTime) == 13 { endTime = endTime[:10] } diff --git a/src/modules/network_data/repository/ue_event_amf.go b/src/modules/network_data/repository/ue_event_amf.go index 9542a6c7..1d878554 100644 --- a/src/modules/network_data/repository/ue_event_amf.go +++ b/src/modules/network_data/repository/ue_event_amf.go @@ -1,6 +1,7 @@ package repository import ( + "fmt" "strings" "be.ems/src/framework/datasource" @@ -24,15 +25,15 @@ func (r UEEventAMF) SelectByPage(querys model.UEEventAMFQuery) ([]model.UEEventA if querys.RmUID != "" { tx = tx.Where("rm_uid = ?", querys.RmUID) } - if querys.StartTime != "" { - startTime := querys.StartTime + if querys.StartTime != 0 { + startTime := fmt.Sprintf("%d", querys.StartTime) if len(startTime) == 13 { startTime = startTime[:10] } tx = tx.Where("timestamp >= ?", startTime) } - if querys.EndTime != "" { - endTime := querys.EndTime + if querys.EndTime != 0 { + endTime := fmt.Sprintf("%d", querys.EndTime) if len(endTime) == 13 { endTime = endTime[:10] } diff --git a/src/modules/network_data/repository/ue_event_mme.go b/src/modules/network_data/repository/ue_event_mme.go index 7da121d6..6b33319b 100644 --- a/src/modules/network_data/repository/ue_event_mme.go +++ b/src/modules/network_data/repository/ue_event_mme.go @@ -1,6 +1,7 @@ package repository import ( + "fmt" "strings" "be.ems/src/framework/datasource" @@ -24,15 +25,15 @@ func (r UEEventMME) SelectByPage(querys model.UEEventMMEQuery) ([]model.UEEventM if querys.RmUID != "" { tx = tx.Where("rm_uid = ?", querys.RmUID) } - if querys.StartTime != "" { - startTime := querys.StartTime + if querys.StartTime != 0 { + startTime := fmt.Sprintf("%d", querys.StartTime) if len(startTime) == 13 { startTime = startTime[:10] } tx = tx.Where("timestamp >= ?", startTime) } - if querys.EndTime != "" { - endTime := querys.EndTime + if querys.EndTime != 0 { + endTime := fmt.Sprintf("%d", querys.EndTime) if len(endTime) == 13 { endTime = endTime[:10] }