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

Merge remote-tracking branch 'origin/main' into multi-tenant

Browse Source
This commit is contained in:
TsMask
2025-02-25 16:21:41 +08:00
parent 0bcfa5aef9 dcf513bcfd
commit e2199e00a1
26 changed files with 164 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,19 +69,21 @@ func (r *CDREventIMS) SelectPage(querys model.CDREventIMSQuery) map[string]any {
conditions = append(conditions, "rm_uid = ?")
params = append(params, querys.RmUID)
}
if querys.StartTime != "" {
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
if len(querys.StartTime) == 13 {
querys.StartTime = querys.StartTime[:10]
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, querys.StartTime)
params = append(params, startTime)
}
if querys.EndTime != "" {
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
if len(querys.EndTime) == 13 {
querys.EndTime = querys.EndTime[:10]
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, querys.EndTime)
params = append(params, endTime)
}
if querys.CallerParty != "" {
conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
@@ -204,15 +206,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]
}

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

@@ -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]
}

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

@@ -6,6 +6,7 @@ import (
dborm "be.ems/lib/core/datasource"
"be.ems/lib/log"
"be.ems/src/framework/datasource"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/parse"
@@ -69,19 +70,21 @@ func (r *CDREventSMF) SelectPage(querys model.CDREventSMFQuery) map[string]any {
conditions = append(conditions, "rm_uid = ?")
params = append(params, querys.RmUID)
}
if querys.StartTime != "" {
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
if len(querys.StartTime) == 13 {
querys.StartTime = querys.StartTime[:10]
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, querys.StartTime)
params = append(params, startTime)
}
if querys.EndTime != "" {
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
if len(querys.EndTime) == 13 {
querys.EndTime = querys.EndTime[:10]
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, querys.EndTime)
params = append(params, endTime)
}
if querys.RecordType != "" {
conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
@@ -190,15 +193,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]
}

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

@@ -69,19 +69,21 @@ func (r *CDREventSMSC) SelectPage(querys model.CDREventSMSCQuery) map[string]any
conditions = append(conditions, "rm_uid = ?")
params = append(params, querys.RmUID)
}
if querys.StartTime != "" {
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
if len(querys.StartTime) == 13 {
querys.StartTime = querys.StartTime[:10]
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, querys.StartTime)
params = append(params, startTime)
}
if querys.EndTime != "" {
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
if len(querys.EndTime) == 13 {
querys.EndTime = querys.EndTime[:10]
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, querys.EndTime)
params = append(params, endTime)
}
if querys.CallerParty != "" {
conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
@@ -205,15 +207,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]
}

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

@@ -70,19 +70,21 @@ func (r *UEEventAMF) SelectPage(querys model.UEEventAMFQuery) map[string]any {
conditions = append(conditions, "rm_uid = ?")
params = append(params, querys.RmUID)
}
if querys.StartTime != "" {
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
if len(querys.StartTime) == 13 {
querys.StartTime = querys.StartTime[:10]
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, querys.StartTime)
params = append(params, startTime)
}
if querys.EndTime != "" {
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
if len(querys.EndTime) == 13 {
querys.EndTime = querys.EndTime[:10]
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, querys.EndTime)
params = append(params, endTime)
}
if querys.EventType != "" {
eventTypes := strings.Split(querys.EventType, ",")
@@ -191,15 +193,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]
}

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

@@ -70,19 +70,21 @@ func (r *UEEventMME) SelectPage(querys model.UEEventMMEQuery) map[string]any {
conditions = append(conditions, "rm_uid = ?")
params = append(params, querys.RmUID)
}
if querys.StartTime != "" {
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
if len(querys.StartTime) == 13 {
querys.StartTime = querys.StartTime[:10]
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, querys.StartTime)
params = append(params, startTime)
}
if querys.EndTime != "" {
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
if len(querys.EndTime) == 13 {
querys.EndTime = querys.EndTime[:10]
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, querys.EndTime)
params = append(params, endTime)
}
if querys.EventType != "" {
eventTypes := strings.Split(querys.EventType, ",")
@@ -191,15 +193,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]
}