diff --git a/src/framework/utils/date/date.go b/src/framework/utils/date/date.go index 35cf339f..dc9c8709 100644 --- a/src/framework/utils/date/date.go +++ b/src/framework/utils/date/date.go @@ -19,6 +19,8 @@ const ( YYYY_MM_DD_HH_MM_SS = "2006-01-02 15:04:05" // 年-月-日T时:分:秒Z时区 列如:2022-12-30T01:01:59+08:00 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" ) // 格式时间字符串 diff --git a/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go b/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go index ae08d98a..1fea7547 100644 --- a/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go +++ b/src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go @@ -216,7 +216,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st seizureTimeStr := "" if v, ok := cdrJSON["seizureTime"]; ok && v != nil { 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 { seizureTimeStr = v.(string) } @@ -225,7 +225,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st releaseTimeStr := "" if v, ok := cdrJSON["releaseTime"]; ok && v != nil { 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 { releaseTimeStr = v.(string) } @@ -345,7 +345,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st seizureTimeStr := "" if v, ok := cdrJSON["seizureTime"]; ok && v != nil { 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 { seizureTimeStr = v.(string) } @@ -354,7 +354,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st releaseTimeStr := "" if v, ok := cdrJSON["releaseTime"]; ok && v != nil { 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 { releaseTimeStr = v.(string) } @@ -485,7 +485,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s timeStr := "" if v, ok := cdrJSON["updateTime"]; ok && v != nil { 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 { timeStr = v.(string) } @@ -578,7 +578,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s timeStr := "" if v, ok := cdrJSON["updateTime"]; ok && v != nil { 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 { timeStr = v.(string) } diff --git a/src/modules/crontask/processor/backup_export_log/backup_export_log.go b/src/modules/crontask/processor/backup_export_log/backup_export_log.go index 25232004..deeaef50 100644 --- a/src/modules/crontask/processor/backup_export_log/backup_export_log.go +++ b/src/modules/crontask/processor/backup_export_log/backup_export_log.go @@ -174,7 +174,7 @@ func (s BackupExportLogProcessor) exportOperate(hour int, fileType string) strin row.RequestMethod, row.OperIP, 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), row.TenantName, }) @@ -220,7 +220,7 @@ func (s BackupExportLogProcessor) exportOperate(hour int, fileType string) strin "E" + idx: row.RequestMethod, "F" + idx: row.OperIP, "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, "J" + idx: row.TenantName, }) @@ -307,7 +307,7 @@ func (s BackupExportLogProcessor) exportLogin(hour int, fileType string) string row.OS, row.Browser, 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, }) } @@ -348,7 +348,7 @@ func (s BackupExportLogProcessor) exportLogin(hour int, fileType string) string "E" + idx: row.OS, "F" + idx: row.Browser, "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, }) } diff --git a/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go b/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go index 0e4055c3..8fd5d731 100644 --- a/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go +++ b/src/modules/crontask/processor/backup_export_udm/backup_export_udm.go @@ -197,7 +197,7 @@ func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string { if fileType == "csv" { // 转换数据 data := [][]string{} - data = append(data, []string{"username", "password"}) + data = append(data, []string{"user_name", "password"}) for _, v := range rows { data = append(data, []string{v.UserName, v.Password}) } diff --git a/src/modules/network_data/controller/ims.go b/src/modules/network_data/controller/ims.go index ee555e2b..1d58b786 100644 --- a/src/modules/network_data/controller/ims.go +++ b/src/modules/network_data/controller/ims.go @@ -249,7 +249,7 @@ func (s *IMSController) CDRExport(c *gin.Context) { seizureTimeStr := "" if v, ok := cdrJSON["seizureTime"]; ok && v != nil { 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 { seizureTimeStr = v.(string) } @@ -258,7 +258,7 @@ func (s *IMSController) CDRExport(c *gin.Context) { releaseTimeStr := "" if v, ok := cdrJSON["releaseTime"]; ok && v != nil { 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 { releaseTimeStr = v.(string) } diff --git a/src/modules/network_data/controller/mme.go b/src/modules/network_data/controller/mme.go index 5a0e80a4..1c5889c1 100644 --- a/src/modules/network_data/controller/mme.go +++ b/src/modules/network_data/controller/mme.go @@ -216,7 +216,7 @@ func (s *MMEController) UEExport(c *gin.Context) { timeStr := "" if v, ok := eventJSON["timestamp"]; ok && v != nil { 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 tenantName := row.TenantName diff --git a/src/modules/network_data/service/cdr_event_ims.go b/src/modules/network_data/service/cdr_event_ims.go index a69dd61d..242aa9fb 100644 --- a/src/modules/network_data/service/cdr_event_ims.go +++ b/src/modules/network_data/service/cdr_event_ims.go @@ -142,7 +142,7 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str seizureTimeStr := "" if v, ok := cdrJSON["seizureTime"]; ok && v != nil { 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 { seizureTimeStr = v.(string) } @@ -151,7 +151,7 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str releaseTimeStr := "" if v, ok := cdrJSON["releaseTime"]; ok && v != nil { 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 { releaseTimeStr = v.(string) } diff --git a/src/modules/network_data/service/cdr_event_smsc.go b/src/modules/network_data/service/cdr_event_smsc.go index b55f62e3..f389e5a5 100644 --- a/src/modules/network_data/service/cdr_event_smsc.go +++ b/src/modules/network_data/service/cdr_event_smsc.go @@ -119,7 +119,7 @@ func (r CDREventSMSC) ExportXlsx(rows []model.CDREventSMSC, fileName, language s timeStr := "" if v, ok := cdrJSON["updateTime"]; ok && v != nil { 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 { timeStr = v.(string) } diff --git a/src/modules/network_data/service/ue_event_mme.go b/src/modules/network_data/service/ue_event_mme.go index 507db08d..398fb0b0 100644 --- a/src/modules/network_data/service/ue_event_mme.go +++ b/src/modules/network_data/service/ue_event_mme.go @@ -117,7 +117,7 @@ func (r UEEventMME) ExportXlsx(rows []model.UEEventMME, fileName, language strin timeStr := "" if v, ok := eventJSON["timestamp"]; ok && v != nil { 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{ diff --git a/src/modules/system/controller/sys_log_login.go b/src/modules/system/controller/sys_log_login.go index f7b5883d..83c87b57 100644 --- a/src/modules/system/controller/sys_log_login.go +++ b/src/modules/system/controller/sys_log_login.go @@ -194,7 +194,7 @@ func (s *SysLogLoginController) Export(c *gin.Context) { "E" + idx: row.OS, "F" + idx: row.Browser, "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, }) } diff --git a/src/modules/system/controller/sys_log_operate.go b/src/modules/system/controller/sys_log_operate.go index 6088b80b..e84a9bb5 100644 --- a/src/modules/system/controller/sys_log_operate.go +++ b/src/modules/system/controller/sys_log_operate.go @@ -223,7 +223,7 @@ func (s *SysLogOperateController) Export(c *gin.Context) { "E" + idx: row.RequestMethod, "F" + idx: row.OperIP, "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, "J" + idx: row.TenantName, }) diff --git a/src/modules/system/controller/sys_post.go b/src/modules/system/controller/sys_post.go index e767c315..1a0218d2 100644 --- a/src/modules/system/controller/sys_post.go +++ b/src/modules/system/controller/sys_post.go @@ -267,7 +267,7 @@ func (s *SysPostController) Export(c *gin.Context) { "C" + idx: row.PostCode, "D" + idx: row.PostSort, "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), }) } diff --git a/src/modules/system/controller/sys_role.go b/src/modules/system/controller/sys_role.go index bceb943b..6fede977 100644 --- a/src/modules/system/controller/sys_role.go +++ b/src/modules/system/controller/sys_role.go @@ -482,7 +482,7 @@ func (s *SysRoleController) Export(c *gin.Context) { "C" + idx: row.RoleKey, "D" + idx: row.RoleSort, "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, }) } diff --git a/src/modules/trace/service/trace_task_hlr.go b/src/modules/trace/service/trace_task_hlr.go index 2768f614..d195d975 100644 --- a/src/modules/trace/service/trace_task_hlr.go +++ b/src/modules/trace/service/trace_task_hlr.go @@ -91,10 +91,10 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (int64, error) { return 0, fmt.Errorf("startTime must less than endTime") } 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 { - 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) } // 发送创建任务