Merge remote-tracking branch 'origin/main' into multi-tenant
This commit is contained in:
@@ -36,11 +36,11 @@ type PerfKPIController struct {
|
||||
// @Tags network_data/kpi
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param neType query string true "NE Type" Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC)
|
||||
// @Param neType query string true "NE Type" Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC) default(AMF)
|
||||
// @Param neId query string true "NE ID" default(001)
|
||||
// @Param startTime query number true "Start time (timestamped milliseconds)" default(1737453599059)
|
||||
// @Param endTime query number true "End time (timestamped milliseconds)" default(1737453599059)
|
||||
// @Param interval query number true "interval" Enums(5,10,15,30,60,300,600,900,1800,3600)
|
||||
// @Param startTime query number true "Start time (timestamped milliseconds)" default(1729162507596)
|
||||
// @Param endTime query number true "End time (timestamped milliseconds)" default(1729164187611)
|
||||
// @Param interval query number true "interval" Enums(5,10,15,30,60,300,600,900,1800,3600) default(60)
|
||||
// @Success 200 {object} object "Response Results"
|
||||
// @Security TokenAuth
|
||||
// @Summary Access to statistical data
|
||||
@@ -102,7 +102,7 @@ func (s *PerfKPIController) GoldKPI(c *gin.Context) {
|
||||
// @Tags network_data/kpi
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param neType query string true "NE Type" Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC)
|
||||
// @Param neType query string true "NE Type" Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC) default(AMF)
|
||||
// @Success 200 {object} object "Response Results"
|
||||
// @Security TokenAuth
|
||||
// @Summary Get Statistical Headings
|
||||
|
||||
@@ -205,7 +205,7 @@ func (s *UDMAuthController) Add(c *gin.Context) {
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param neId path string true "NE ID" default(001)
|
||||
// @Param value path number true "Number includes starting imsi"
|
||||
// @Param value path number true "Number of releases, value includes start imsi"
|
||||
// @Param data body object true "Request Param"
|
||||
// @Success 200 {object} object "Response Results"
|
||||
// @Security TokenAuth
|
||||
@@ -390,7 +390,7 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
|
||||
// @Produce json
|
||||
// @Param neId path string true "NE ID" default(001)
|
||||
// @Param imsi path string true "IMSI"
|
||||
// @Param num path number true "Number includes starting imsi"
|
||||
// @Param num path number true "Number of releases, value includes start imsi"
|
||||
// @Success 200 {object} object "Response Results"
|
||||
// @Security TokenAuth
|
||||
// @Summary UDM Authentication User Batch Deletion
|
||||
|
||||
@@ -216,8 +216,8 @@ func (s *UDMSubController) Add(c *gin.Context) {
|
||||
// @Tags network_data/udm/sub
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param neId path string true "NE ID" default(001)
|
||||
// @Param value path number true "Number includes starting imsi" default(1)
|
||||
// @Param neId path string true "NE ID" default(001)
|
||||
// @Param value path number true "Number of releases, value includes start imsi" default(1)
|
||||
// @Param data body object true "Request Param"
|
||||
// @Success 200 {object} object "Response Results"
|
||||
// @Security TokenAuth
|
||||
@@ -406,7 +406,7 @@ func (s *UDMSubController) Remove(c *gin.Context) {
|
||||
// @Produce json
|
||||
// @Param neId path string true "NE ID" default(001)
|
||||
// @Param imsi path string true "IMSI"
|
||||
// @Param num path number true "Number includes starting imsi"
|
||||
// @Param num path number true "Number of releases, value includes start imsi"
|
||||
// @Success 200 {object} object "Response Results"
|
||||
// @Security TokenAuth
|
||||
// @Summary UDM Subscriber User Batch Deletion
|
||||
|
||||
@@ -58,11 +58,12 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
|
||||
"A1": "ID",
|
||||
"B1": "Record Behavior",
|
||||
"C1": "Type",
|
||||
"D1": "Caller",
|
||||
"E1": "Called",
|
||||
"F1": "Duration",
|
||||
"G1": "Result",
|
||||
"H1": "Time",
|
||||
"D1": "Called",
|
||||
"E1": "Result",
|
||||
"F1": "Caller",
|
||||
"G1": "Duration",
|
||||
"H1": "Call Start Time",
|
||||
"I1": "Hangup Time",
|
||||
}
|
||||
// 读取字典数据 CDR SIP响应代码类别类型
|
||||
dictCDRSipCode := sysService.NewSysDictData.SelectDictDataByType("cdr_sip_code")
|
||||
@@ -122,13 +123,22 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
|
||||
}
|
||||
}
|
||||
}
|
||||
// 取时间
|
||||
timeStr := ""
|
||||
// 呼叫时间
|
||||
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)
|
||||
} else {
|
||||
seizureTimeStr = v.(string)
|
||||
}
|
||||
}
|
||||
// 挂断时间
|
||||
releaseTimeStr := ""
|
||||
if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
|
||||
if releaseTime := parse.Number(v); releaseTime > 0 {
|
||||
timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
|
||||
releaseTimeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
|
||||
} else {
|
||||
timeStr = v.(string)
|
||||
releaseTimeStr = v.(string)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,11 +146,12 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
|
||||
"A" + idx: row.ID,
|
||||
"B" + idx: recordType,
|
||||
"C" + idx: callTypeLable,
|
||||
"D" + idx: caller,
|
||||
"E" + idx: called,
|
||||
"F" + idx: duration,
|
||||
"G" + idx: callResult,
|
||||
"H" + idx: timeStr,
|
||||
"D" + idx: called,
|
||||
"E" + idx: callResult,
|
||||
"F" + idx: caller,
|
||||
"G" + idx: duration,
|
||||
"H" + idx: seizureTimeStr,
|
||||
"I" + idx: releaseTimeStr,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user