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

fix: export file time format set to 2025-05-13 13:59:59 GMT+08:00

Browse Source
This commit is contained in:
zhangsz
2025-05-13 20:12:12 +08:00
parent 18dea169a3
commit 8abb70c24a
14 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/utils/date/date.go
View File

@@ -19,6 +19,8 @@ const (
YYYY_MM_DD_HH_MM_SS = "2006-01-02 15:04:05" YYYY_MM_DD_HH_MM_SS = "2006-01-02 15:04:05"
// 年-月-日T时:分:秒Z时区 列如：2022-12-30T01:01:59+08:00 // 年-月-日T时:分:秒Z时区 列如：2022-12-30T01:01:59+08:00
YYYY_MM_DDTHH_MM_SSZ = time.RFC3339 YYYY_MM_DDTHH_MM_SSZ = time.RFC3339
// 年-月-日 时:分:秒 GMT时区 列如：2022-12-30 01:01:59 GMT+08:00
YYYY_MM_DD_HH_MM_SS_GMT_TZ = "2006-01-02 15:04:05 GMT-07:00"
) )
// 格式时间字符串 // 格式时间字符串

12
src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go
View File

@@ -216,7 +216,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
seizureTimeStr := "" seizureTimeStr := ""
if v, ok := cdrJSON["seizureTime"]; ok && v != nil { if v, ok := cdrJSON["seizureTime"]; ok && v != nil {
if seizureTime := parse.Number(v); seizureTime > 0 { if seizureTime := parse.Number(v); seizureTime > 0 {
seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DDTHH_MM_SSZ) seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
seizureTimeStr = v.(string) seizureTimeStr = v.(string)
} }
@@ -225,7 +225,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
releaseTimeStr := "" releaseTimeStr := ""
if v, ok := cdrJSON["releaseTime"]; ok && v != nil { if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
if releaseTime := parse.Number(v); releaseTime > 0 { if releaseTime := parse.Number(v); releaseTime > 0 {
releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
releaseTimeStr = v.(string) releaseTimeStr = v.(string)
} }
@@ -345,7 +345,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
seizureTimeStr := "" seizureTimeStr := ""
if v, ok := cdrJSON["seizureTime"]; ok && v != nil { if v, ok := cdrJSON["seizureTime"]; ok && v != nil {
if seizureTime := parse.Number(v); seizureTime > 0 { if seizureTime := parse.Number(v); seizureTime > 0 {
seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DDTHH_MM_SSZ) seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
seizureTimeStr = v.(string) seizureTimeStr = v.(string)
} }
@@ -354,7 +354,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
releaseTimeStr := "" releaseTimeStr := ""
if v, ok := cdrJSON["releaseTime"]; ok && v != nil { if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
if releaseTime := parse.Number(v); releaseTime > 0 { if releaseTime := parse.Number(v); releaseTime > 0 {
releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
releaseTimeStr = v.(string) releaseTimeStr = v.(string)
} }
@@ -485,7 +485,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s
timeStr := "" timeStr := ""
if v, ok := cdrJSON["updateTime"]; ok && v != nil { if v, ok := cdrJSON["updateTime"]; ok && v != nil {
if releaseTime := parse.Number(v); releaseTime > 0 { if releaseTime := parse.Number(v); releaseTime > 0 {
timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
timeStr = v.(string) timeStr = v.(string)
} }
@@ -578,7 +578,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s
timeStr := "" timeStr := ""
if v, ok := cdrJSON["updateTime"]; ok && v != nil { if v, ok := cdrJSON["updateTime"]; ok && v != nil {
if releaseTime := parse.Number(v); releaseTime > 0 { if releaseTime := parse.Number(v); releaseTime > 0 {
timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
timeStr = v.(string) timeStr = v.(string)
} }

8
src/modules/crontask/processor/backup_export_log/backup_export_log.go
View File

@@ -174,7 +174,7 @@ func (s BackupExportLogProcessor) exportOperate(hour int, fileType string) strin
row.RequestMethod, row.RequestMethod,
row.OperIP, row.OperIP,
statusValue, statusValue,
date.ParseDateToStr(row.OperTime, date.YYYY_MM_DDTHH_MM_SSZ), date.ParseDateToStr(row.OperTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
fmt.Sprint(row.CostTime), fmt.Sprint(row.CostTime),
row.TenantName, row.TenantName,
}) })
@@ -220,7 +220,7 @@ func (s BackupExportLogProcessor) exportOperate(hour int, fileType string) strin
"E" + idx: row.RequestMethod, "E" + idx: row.RequestMethod,
"F" + idx: row.OperIP, "F" + idx: row.OperIP,
"G" + idx: statusValue, "G" + idx: statusValue,
"H" + idx: date.ParseDateToStr(row.OperTime, date.YYYY_MM_DDTHH_MM_SSZ), "H" + idx: date.ParseDateToStr(row.OperTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
"I" + idx: row.CostTime, "I" + idx: row.CostTime,
"J" + idx: row.TenantName, "J" + idx: row.TenantName,
}) })
@@ -307,7 +307,7 @@ func (s BackupExportLogProcessor) exportLogin(hour int, fileType string) string
row.OS, row.OS,
row.Browser, row.Browser,
statusValue, statusValue,
date.ParseDateToStr(row.LoginTime, date.YYYY_MM_DDTHH_MM_SSZ), date.ParseDateToStr(row.LoginTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
row.Msg, row.Msg,
}) })
} }
@@ -348,7 +348,7 @@ func (s BackupExportLogProcessor) exportLogin(hour int, fileType string) string
"E" + idx: row.OS, "E" + idx: row.OS,
"F" + idx: row.Browser, "F" + idx: row.Browser,
"G" + idx: statusValue, "G" + idx: statusValue,
"H" + idx: date.ParseDateToStr(row.LoginTime, date.YYYY_MM_DDTHH_MM_SSZ), "H" + idx: date.ParseDateToStr(row.LoginTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
"I" + idx: row.Msg, "I" + idx: row.Msg,
}) })
} }

2
src/modules/crontask/processor/backup_export_udm/backup_export_udm.go
View File

@@ -197,7 +197,7 @@ func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string {
if fileType == "csv" { if fileType == "csv" {
// 转换数据 // 转换数据
data := [][]string{} data := [][]string{}
data = append(data, []string{"username", "password"}) data = append(data, []string{"user_name", "password"})
for _, v := range rows { for _, v := range rows {
data = append(data, []string{v.UserName, v.Password}) data = append(data, []string{v.UserName, v.Password})
} }

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

@@ -249,7 +249,7 @@ func (s *IMSController) CDRExport(c *gin.Context) {
seizureTimeStr := "" seizureTimeStr := ""
if v, ok := cdrJSON["seizureTime"]; ok && v != nil { if v, ok := cdrJSON["seizureTime"]; ok && v != nil {
if seizureTime := parse.Number(v); seizureTime > 0 { if seizureTime := parse.Number(v); seizureTime > 0 {
seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DDTHH_MM_SSZ) seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
seizureTimeStr = v.(string) seizureTimeStr = v.(string)
} }
@@ -258,7 +258,7 @@ func (s *IMSController) CDRExport(c *gin.Context) {
releaseTimeStr := "" releaseTimeStr := ""
if v, ok := cdrJSON["releaseTime"]; ok && v != nil { if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
if releaseTime := parse.Number(v); releaseTime > 0 { if releaseTime := parse.Number(v); releaseTime > 0 {
releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
releaseTimeStr = v.(string) releaseTimeStr = v.(string)
} }

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

@@ -216,7 +216,7 @@ func (s *MMEController) UEExport(c *gin.Context) {
timeStr := "" timeStr := ""
if v, ok := eventJSON["timestamp"]; ok && v != nil { if v, ok := eventJSON["timestamp"]; ok && v != nil {
rowTime := parse.Number(v) rowTime := parse.Number(v)
timeStr = date.ParseDateToStr(rowTime, date.YYYY_MM_DDTHH_MM_SSZ) timeStr = date.ParseDateToStr(rowTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} }
// for multi-tenant, get tenant name // for multi-tenant, get tenant name
tenantName := row.TenantName tenantName := row.TenantName

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

@@ -142,7 +142,7 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
seizureTimeStr := "" seizureTimeStr := ""
if v, ok := cdrJSON["seizureTime"]; ok && v != nil { if v, ok := cdrJSON["seizureTime"]; ok && v != nil {
if seizureTime := parse.Number(v); seizureTime > 0 { if seizureTime := parse.Number(v); seizureTime > 0 {
seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DDTHH_MM_SSZ) seizureTimeStr = date.ParseDateToStr(seizureTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
seizureTimeStr = v.(string) seizureTimeStr = v.(string)
} }
@@ -151,7 +151,7 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
releaseTimeStr := "" releaseTimeStr := ""
if v, ok := cdrJSON["releaseTime"]; ok && v != nil { if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
if releaseTime := parse.Number(v); releaseTime > 0 { if releaseTime := parse.Number(v); releaseTime > 0 {
releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
releaseTimeStr = v.(string) releaseTimeStr = v.(string)
} }

2
src/modules/network_data/service/cdr_event_smsc.go
View File

@@ -119,7 +119,7 @@ func (r CDREventSMSC) ExportXlsx(rows []model.CDREventSMSC, fileName, language s
timeStr := "" timeStr := ""
if v, ok := cdrJSON["updateTime"]; ok && v != nil { if v, ok := cdrJSON["updateTime"]; ok && v != nil {
if releaseTime := parse.Number(v); releaseTime > 0 { if releaseTime := parse.Number(v); releaseTime > 0 {
timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} else { } else {
timeStr = v.(string) timeStr = v.(string)
} }

2
src/modules/network_data/service/ue_event_mme.go
View File

@@ -117,7 +117,7 @@ func (r UEEventMME) ExportXlsx(rows []model.UEEventMME, fileName, language strin
timeStr := "" timeStr := ""
if v, ok := eventJSON["timestamp"]; ok && v != nil { if v, ok := eventJSON["timestamp"]; ok && v != nil {
rowTime := parse.Number(v) rowTime := parse.Number(v)
timeStr = date.ParseDateToStr(rowTime, date.YYYY_MM_DDTHH_MM_SSZ) timeStr = date.ParseDateToStr(rowTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} }
dataCells = append(dataCells, map[string]any{ dataCells = append(dataCells, map[string]any{

2
src/modules/system/controller/sys_log_login.go
View File

@@ -194,7 +194,7 @@ func (s *SysLogLoginController) Export(c *gin.Context) {
"E" + idx: row.OS, "E" + idx: row.OS,
"F" + idx: row.Browser, "F" + idx: row.Browser,
"G" + idx: statusValue, "G" + idx: statusValue,
"H" + idx: date.ParseDateToStr(row.LoginTime, date.YYYY_MM_DDTHH_MM_SSZ), "H" + idx: date.ParseDateToStr(row.LoginTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
"I" + idx: row.Msg, "I" + idx: row.Msg,
}) })
} }

2
src/modules/system/controller/sys_log_operate.go
View File

@@ -223,7 +223,7 @@ func (s *SysLogOperateController) Export(c *gin.Context) {
"E" + idx: row.RequestMethod, "E" + idx: row.RequestMethod,
"F" + idx: row.OperIP, "F" + idx: row.OperIP,
"G" + idx: statusValue, "G" + idx: statusValue,
"H" + idx: date.ParseDateToStr(row.OperTime, date.YYYY_MM_DDTHH_MM_SSZ), "H" + idx: date.ParseDateToStr(row.OperTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
"I" + idx: row.CostTime, "I" + idx: row.CostTime,
"J" + idx: row.TenantName, "J" + idx: row.TenantName,
}) })

2
src/modules/system/controller/sys_post.go
View File

@@ -267,7 +267,7 @@ func (s *SysPostController) Export(c *gin.Context) {
"C" + idx: row.PostCode, "C" + idx: row.PostCode,
"D" + idx: row.PostSort, "D" + idx: row.PostSort,
"E" + idx: statusValue, "E" + idx: statusValue,
"F" + idx: date.ParseDateToStr(row.CreateTime, date.YYYY_MM_DDTHH_MM_SSZ), "F" + idx: date.ParseDateToStr(row.CreateTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
}) })
} }

2
src/modules/system/controller/sys_role.go
View File

@@ -482,7 +482,7 @@ func (s *SysRoleController) Export(c *gin.Context) {
"C" + idx: row.RoleKey, "C" + idx: row.RoleKey,
"D" + idx: row.RoleSort, "D" + idx: row.RoleSort,
"E" + idx: statusValue, "E" + idx: statusValue,
"F" + idx: date.ParseDateToStr(row.CreateTime, date.YYYY_MM_DDTHH_MM_SSZ), "F" + idx: date.ParseDateToStr(row.CreateTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ),
// "F" + idx: dataScope, // "F" + idx: dataScope,
}) })
} }

4
src/modules/trace/service/trace_task_hlr.go
View File

@@ -91,10 +91,10 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (int64, error) {
return 0, fmt.Errorf("startTime must less than endTime") return 0, fmt.Errorf("startTime must less than endTime")
} }
if task.StartTime > 0 { if task.StartTime > 0 {
data["startTime"] = date.ParseDateToStr(task.StartTime, date.YYYY_MM_DDTHH_MM_SSZ) data["startTime"] = date.ParseDateToStr(task.StartTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} }
if task.StartTime > 0 { if task.StartTime > 0 {
data["endTime"] = date.ParseDateToStr(task.EndTime, date.YYYY_MM_DDTHH_MM_SSZ) data["endTime"] = date.ParseDateToStr(task.EndTime, date.YYYY_MM_DD_HH_MM_SS_GMT_TZ)
} }
// 发送创建任务 // 发送创建任务