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

fix: 更新cdr/ue时间查询字段为created_at，优化时间处理逻辑

Browse Source
This commit is contained in:
TsMask
2025-09-19 18:59:53 +08:00
parent ced1477938
commit e377ddf584
11 changed files with 96 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/network_data/controller/amf.go
View File

@@ -20,7 +20,6 @@ import (
neService "be.ems/src/modules/network_element/service"
sysService "be.ems/src/modules/system/service"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
)
// 实例化控制层 AMFController 结构体
@@ -130,7 +129,7 @@ func (s *AMFController) UEExport(c *gin.Context) {
language := ctx.AcceptLanguage(c)
// 查询结果，根据查询条件结果，单页最大值限制
var querys model.UEEventAMFQuery
if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}

3
src/modules/network_data/controller/ims.go
View File

@@ -22,7 +22,6 @@ import (
neService "be.ems/src/modules/network_element/service"
sysService "be.ems/src/modules/system/service"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
)
// 实例化控制层 IMSController 结构体
@@ -135,7 +134,7 @@ func (s *IMSController) CDRExport(c *gin.Context) {
language := ctx.AcceptLanguage(c)
// 查询结果，根据查询条件结果，单页最大值限制
var querys model.CDREventIMSQuery
if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}

3
src/modules/network_data/controller/mme.go
View File

@@ -21,7 +21,6 @@ import (
neService "be.ems/src/modules/network_element/service"
sysService "be.ems/src/modules/system/service"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
)
// 实例化控制层 MMEController 结构体
@@ -131,7 +130,7 @@ func (s *MMEController) UEExport(c *gin.Context) {
language := ctx.AcceptLanguage(c)
// 查询结果，根据查询条件结果，单页最大值限制
var querys model.UEEventMMEQuery
if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}

3
src/modules/network_data/controller/smf.go
View File

@@ -18,7 +18,6 @@ import (
neFetchlink "be.ems/src/modules/network_element/fetch_link"
neService "be.ems/src/modules/network_element/service"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
)
// 实例化控制层 SMFController 结构体
@@ -130,7 +129,7 @@ func (s *SMFController) CDRExport(c *gin.Context) {
language := ctx.AcceptLanguage(c)
// 查询结果，根据查询条件结果，单页最大值限制
var querys model.CDREventSMFQuery
if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}

3
src/modules/network_data/controller/smsc.go
View File

@@ -19,7 +19,6 @@ import (
neService "be.ems/src/modules/network_element/service"
sysService "be.ems/src/modules/system/service"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
)
// 实例化控制层 SMSCController 结构体
@@ -130,7 +129,7 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
language := ctx.AcceptLanguage(c)
// 查询结果，根据查询条件结果，单页最大值限制
var querys model.CDREventSMSCQuery
if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return
}

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

@@ -9,6 +9,7 @@ import (
"be.ems/lib/log"
"be.ems/src/framework/datasource"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo"
"be.ems/src/modules/network_data/model"
@@ -71,20 +72,16 @@ func (r *CDREventIMS) SelectPage(querys model.CDREventIMSQuery) map[string]any {
params = append(params, querys.RmUID)
}
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, startTime)
conditions = append(conditions, "created_at >= ?")
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, startTimeStr)
}
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, endTime)
conditions = append(conditions, "created_at <= ?")
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, endTimeStr)
}
if querys.CallerParty != "" {
conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') like concat(concat('%', ?), '%')")
@@ -234,18 +231,14 @@ func (r CDREventIMS) SelectByPage(querys model.CDREventIMSQuery) ([]model.CDREve
tx = tx.Where("rm_uid = ?", querys.RmUID)
}
if querys.StartTime != 0 {
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
tx = tx.Where("timestamp >= ?", startTime)
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at >= ?", startTimeStr)
}
if querys.EndTime != 0 {
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
tx = tx.Where("timestamp <= ?", endTime)
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at <= ?", endTimeStr)
}
if querys.CallerParty != "" {
tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", querys.CallerParty)
@@ -362,11 +355,15 @@ func (r *CDREventIMS) Select(querys model.CDREventIMSQuery) []model.CDREventIMS
if querys.RmUID != "" {
tx = tx.Where("rm_uid = ?", querys.RmUID)
}
if querys.StartTime > 0 {
tx = tx.Where("timestamp >= ?", querys.StartTime)
if querys.StartTime != 0 {
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at >= ?", startTimeStr)
}
if querys.EndTime > 0 {
tx = tx.Where("timestamp <= ?", querys.EndTime)
if querys.EndTime != 0 {
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at <= ?", endTimeStr)
}
if querys.RecordType != "" {
tx = tx.Where("JSON_EXTRACT(cdr_json, '$.recordType') = ?", querys.RecordType)

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

@@ -1,11 +1,12 @@
package repository
import (
"fmt"
"sort"
"be.ems/src/framework/datasource"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
"be.ems/src/modules/network_data/model"
)
@@ -26,18 +27,14 @@ func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDRE
tx = tx.Where("rm_uid = ?", querys.RmUID)
}
if querys.StartTime != 0 {
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
tx = tx.Where("timestamp >= ?", startTime)
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at >= ?", startTimeStr)
}
if querys.EndTime != 0 {
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
tx = tx.Where("timestamp <= ?", endTime)
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at <= ?", endTimeStr)
}
if querys.IMSI != "" {
tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedIMSI') like concat(concat('%', ?), '%')", querys.IMSI)

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

@@ -1,7 +1,6 @@
package repository
import (
"fmt"
"sort"
"strings"
@@ -10,6 +9,7 @@ import (
"be.ems/src/framework/datasource"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo"
"be.ems/src/modules/network_data/model"
@@ -72,20 +72,16 @@ func (r *CDREventSMF) SelectPage(querys model.CDREventSMFQuery) map[string]any {
params = append(params, querys.RmUID)
}
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, startTime)
conditions = append(conditions, "created_at >= ?")
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, startTimeStr)
}
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, endTime)
conditions = append(conditions, "created_at <= ?")
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, endTimeStr)
}
if querys.RecordType != "" {
conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
@@ -221,18 +217,14 @@ func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREve
tx = tx.Where("rm_uid = ?", querys.RmUID)
}
if querys.StartTime != 0 {
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
tx = tx.Where("timestamp >= ?", startTime)
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at >= ?", startTimeStr)
}
if querys.EndTime != 0 {
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
tx = tx.Where("timestamp <= ?", endTime)
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at <= ?", endTimeStr)
}
if querys.RecordType != "" {
tx = tx.Where("JSON_EXTRACT(cdr_json, '$.recordType') = ?", querys.RecordType)

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

@@ -9,6 +9,7 @@ import (
"be.ems/lib/log"
"be.ems/src/framework/datasource"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo"
"be.ems/src/modules/network_data/model"
@@ -71,20 +72,16 @@ func (r *CDREventSMSC) SelectPage(querys model.CDREventSMSCQuery) map[string]any
params = append(params, querys.RmUID)
}
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, startTime)
conditions = append(conditions, "created_at >= ?")
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, startTimeStr)
}
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, endTime)
conditions = append(conditions, "created_at <= ?")
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, endTimeStr)
}
if querys.CallerParty != "" {
conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') like concat(concat('%', ?), '%')")
@@ -238,18 +235,14 @@ func (r CDREventSMSC) SelectByPage(querys model.CDREventSMSCQuery) ([]model.CDRE
tx = tx.Where("rm_uid = ?", querys.RmUID)
}
if querys.StartTime != 0 {
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
tx = tx.Where("timestamp >= ?", startTime)
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at >= ?", startTimeStr)
}
if querys.EndTime != 0 {
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
tx = tx.Where("timestamp <= ?", endTime)
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at <= ?", endTimeStr)
}
if querys.CallerParty != "" {
tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", querys.CallerParty)

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

@@ -9,6 +9,7 @@ import (
"be.ems/lib/log"
"be.ems/src/framework/datasource"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo"
"be.ems/src/modules/network_data/model"
@@ -72,20 +73,16 @@ func (r *UEEventAMF) SelectPage(querys model.UEEventAMFQuery) map[string]any {
params = append(params, querys.RmUID)
}
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, startTime)
conditions = append(conditions, "created_at >= ?")
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, startTimeStr)
}
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, endTime)
conditions = append(conditions, "created_at <= ?")
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, endTimeStr)
}
if querys.EventType != "" {
eventTypes := strings.Split(querys.EventType, ",")
@@ -221,18 +218,14 @@ func (r UEEventAMF) SelectByPage(querys model.UEEventAMFQuery) ([]model.UEEventA
tx = tx.Where("rm_uid = ?", querys.RmUID)
}
if querys.StartTime != 0 {
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
tx = tx.Where("timestamp >= ?", startTime)
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at >= ?", startTimeStr)
}
if querys.EndTime != 0 {
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
tx = tx.Where("timestamp <= ?", endTime)
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at <= ?", endTimeStr)
}
if querys.EventType != "" {
eventTypes := strings.Split(querys.EventType, ",")

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

@@ -9,6 +9,7 @@ import (
"be.ems/lib/log"
"be.ems/src/framework/datasource"
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
"be.ems/src/framework/utils/repo"
"be.ems/src/modules/network_data/model"
@@ -72,20 +73,16 @@ func (r *UEEventMME) SelectPage(querys model.UEEventMMEQuery) map[string]any {
params = append(params, querys.RmUID)
}
if querys.StartTime != 0 {
conditions = append(conditions, "timestamp >= ?")
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
params = append(params, startTime)
conditions = append(conditions, "created_at >= ?")
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, startTimeStr)
}
if querys.EndTime != 0 {
conditions = append(conditions, "timestamp <= ?")
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
params = append(params, endTime)
conditions = append(conditions, "created_at <= ?")
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
params = append(params, endTimeStr)
}
if querys.EventType != "" {
eventTypes := strings.Split(querys.EventType, ",")
@@ -222,18 +219,14 @@ func (r UEEventMME) SelectByPage(querys model.UEEventMMEQuery) ([]model.UEEventM
tx = tx.Where("rm_uid = ?", querys.RmUID)
}
if querys.StartTime != 0 {
startTime := fmt.Sprintf("%d", querys.StartTime)
if len(startTime) == 13 {
startTime = startTime[:10]
}
tx = tx.Where("timestamp >= ?", startTime)
startTime := parse.Number(querys.StartTime)
startTimeStr := date.ParseDateToStr(startTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at >= ?", startTimeStr)
}
if querys.EndTime != 0 {
endTime := fmt.Sprintf("%d", querys.EndTime)
if len(endTime) == 13 {
endTime = endTime[:10]
}
tx = tx.Where("timestamp <= ?", endTime)
endTime := parse.Number(querys.EndTime)
endTimeStr := date.ParseDateToStr(endTime, date.YYYY_MM_DD_HH_MM_SS)
tx = tx.Where("created_at <= ?", endTimeStr)
}
if querys.EventType != "" {
eventTypes := strings.Split(querys.EventType, ",")