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

add: export file contain tenant name

Browse Source
This commit is contained in:
simonzhangsz
2024-10-16 19:27:14 +08:00
parent 984332caac
commit e0fd3004e9
7 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,9 @@ func (s *AMFController) UEExport(c *gin.Context) {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return return
} }
// for multi-tenancy
querys.UserName = ctx.LoginUserToUserName(c)
// 限制导出数据集 // 限制导出数据集
if querys.PageSize > 10000 { if querys.PageSize > 10000 {
querys.PageSize = 10000 querys.PageSize = 10000
@@ -121,6 +124,7 @@ func (s *AMFController) UEExport(c *gin.Context) {
"C1": "Event Type", "C1": "Event Type",
"D1": "Result", "D1": "Result",
"E1": "Time", "E1": "Time",
"F1": "Tenant Name",
} }
// 读取字典数据 UE 事件类型 // 读取字典数据 UE 事件类型
dictUEEventType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_type") dictUEEventType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_type")
@@ -182,7 +186,7 @@ func (s *AMFController) UEExport(c *gin.Context) {
timeStr = v.(string) timeStr = v.(string)
} }
if v, ok := eventJSON["status"]; ok && v != nil { if v, ok := eventJSON["status"]; ok && v != nil {
eventResult = v.(string) eventResult = fmt.Sprint(v)
for _, v := range dictUEEventCmState { for _, v := range dictUEEventCmState {
if eventResult == v.DictValue { if eventResult == v.DictValue {
eventResult = i18n.TKey(language, v.DictLabel) eventResult = i18n.TKey(language, v.DictLabel)
@@ -191,6 +195,8 @@ func (s *AMFController) UEExport(c *gin.Context) {
} }
} }
} }
// for multi-tenancy, get tenant name
tenantName := row.TenantName
dataCells = append(dataCells, map[string]any{ dataCells = append(dataCells, map[string]any{
"A" + idx: row.ID, "A" + idx: row.ID,
@@ -198,6 +204,7 @@ func (s *AMFController) UEExport(c *gin.Context) {
"C" + idx: eventType, "C" + idx: eventType,
"D" + idx: eventResult, "D" + idx: eventResult,
"E" + idx: timeStr, "E" + idx: timeStr,
"F" + idx: tenantName,
}) })
} }

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

@@ -101,6 +101,9 @@ func (s *IMSController) CDRExport(c *gin.Context) {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return return
} }
// for multi-tenancy
querys.UserName = ctx.LoginUserToUserName(c)
// 限制导出数据集 // 限制导出数据集
if querys.PageSize > 10000 { if querys.PageSize > 10000 {
querys.PageSize = 10000 querys.PageSize = 10000
@@ -198,11 +201,8 @@ func (s *IMSController) CDRExport(c *gin.Context) {
releaseTime := parse.Number(v) releaseTime := parse.Number(v)
timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
} }
// tenant name // for multi-tenant, get tenant name
tenantName := "" tenantName := row.TenantName
if v, ok := cdrJSON["tenantName"]; ok && v != nil {
tenantName = v.(string)
}
dataCells = append(dataCells, map[string]any{ dataCells = append(dataCells, map[string]any{
"A" + idx: row.ID, "A" + idx: row.ID,

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

@@ -101,6 +101,9 @@ func (s *MMEController) UEExport(c *gin.Context) {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return return
} }
// for multi-tenancy
querys.UserName = ctx.LoginUserToUserName(c)
// 限制导出数据集 // 限制导出数据集
if querys.PageSize > 10000 { if querys.PageSize > 10000 {
querys.PageSize = 10000 querys.PageSize = 10000
@@ -122,6 +125,7 @@ func (s *MMEController) UEExport(c *gin.Context) {
"C1": "Event Type", "C1": "Event Type",
"D1": "Result", "D1": "Result",
"E1": "Time", "E1": "Time",
"F1": "Tenant Name",
} }
// 读取字典数据 UE 事件类型 // 读取字典数据 UE 事件类型
dictUEEventType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_type") dictUEEventType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_type")
@@ -181,6 +185,8 @@ func (s *MMEController) UEExport(c *gin.Context) {
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_DDTHH_MM_SSZ)
} }
// for multi-tenant, get tenant name
tenantName := row.TenantName
dataCells = append(dataCells, map[string]any{ dataCells = append(dataCells, map[string]any{
"A" + idx: row.ID, "A" + idx: row.ID,
@@ -188,6 +194,7 @@ func (s *MMEController) UEExport(c *gin.Context) {
"C" + idx: eventType, "C" + idx: eventType,
"D" + idx: eventResult, "D" + idx: eventResult,
"E" + idx: timeStr, "E" + idx: timeStr,
"F" + idx: tenantName,
}) })
} }

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

@@ -103,6 +103,9 @@ func (s *SMFController) CDRExport(c *gin.Context) {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return return
} }
// for multi-tenancy
querys.UserName = ctx.LoginUserToUserName(c)
// 限制导出数据集 // 限制导出数据集
if querys.PageSize > 10000 { if querys.PageSize > 10000 {
querys.PageSize = 10000 querys.PageSize = 10000
@@ -246,11 +249,8 @@ PDU Type: %s
PDU IPv4 Address: %s PDU IPv4 Address: %s
PDU IPv6 Addres Swith Prefix: %s`, User_Identifier, SSC_Mode, RAT_Type, DNN_ID, PDU_Type, PDU_IPv4, PDU_IPv6) PDU IPv6 Addres Swith Prefix: %s`, User_Identifier, SSC_Mode, RAT_Type, DNN_ID, PDU_Type, PDU_IPv4, PDU_IPv6)
} }
// Tenant Name // for multi-tenant, get tenant name
tenantName := "" tenantName := row.TenantName
if v, ok := cdrJSON["tenantName"]; ok && v != nil {
tenantName = v.(string)
}
dataCells = append(dataCells, map[string]any{ dataCells = append(dataCells, map[string]any{
"A" + idx: row.ID, "A" + idx: row.ID,

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

@@ -100,6 +100,9 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
return return
} }
// for multi-tenancy
querys.UserName = ctx.LoginUserToUserName(c)
// 限制导出数据集 // 限制导出数据集
if querys.PageSize > 10000 { if querys.PageSize > 10000 {
querys.PageSize = 10000 querys.PageSize = 10000
@@ -177,11 +180,8 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
releaseTime := parse.Number(v) releaseTime := parse.Number(v)
timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ) timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
} }
// Tenant name // for multi-tenant, get tenant name
tenantName := "" tenantName := row.TenantName
if v, ok := cdrJSON["tenantName"]; ok && v != nil {
tenantName = v.(string)
}
dataCells = append(dataCells, map[string]any{ dataCells = append(dataCells, map[string]any{
"A" + idx: row.ID, "A" + idx: row.ID,

22
src/modules/network_data/model/ue_event_amf.go
View File

@@ -1,19 +1,17 @@
package model package model
import "time"
// UEEventAMF UE会话对象AMF ue_event_amf // UEEventAMF UE会话对象AMF ue_event_amf
type UEEventAMF struct { type UEEventAMF struct {
ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
NeType string `json:"neType" gorm:"column:ne_type"` NeType string `json:"neType" gorm:"column:ne_type"`
NeName string `json:"neName" gorm:"column:ne_name"` NeName string `json:"neName" gorm:"column:ne_name"`
RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有
Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` Timestamp int64 `json:"timestamp" gorm:"column:timestamp"`
EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state
EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` EventJSONStr string `json:"eventJSON" gorm:"column:event_json"`
CreatedAt time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"` CreatedAt string `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
TenantID string `json:"tenantID" gorm:"tenant_id"` TenantID string `json:"tenantID" gorm:"tenant_id"`
TenantName string `json:"tenantName" gorm:"column:tenant_name"` TenantName string `json:"tenantName" gorm:"column:tenant_name"`
} }
// UEEventAMFQuery UE会话对象AMF查询参数结构体 // UEEventAMFQuery UE会话对象AMF查询参数结构体

22
src/modules/network_data/model/ue_event_mme.go
View File

@@ -1,19 +1,17 @@
package model package model
import "time"
// UEEventMME UE会话对象MME ue_event_mme // UEEventMME UE会话对象MME ue_event_mme
type UEEventMME struct { type UEEventMME struct {
ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
NeType string `json:"neType" gorm:"column:ne_type"` NeType string `json:"neType" gorm:"column:ne_type"`
NeName string `json:"neName" gorm:"column:ne_name"` NeName string `json:"neName" gorm:"column:ne_name"`
RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有
Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` Timestamp int64 `json:"timestamp" gorm:"column:timestamp"`
EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state
EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` EventJSONStr string `json:"eventJSON" gorm:"column:event_json"`
CreatedAt time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"` CreatedAt string `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
TenantID string `json:"tenantID" gorm:"column:tenant_id"` TenantID string `json:"tenantID" gorm:"column:tenant_id"`
TenantName string `json:"tenantName" gorm:"column:tenant_name"` TenantName string `json:"tenantName" gorm:"column:tenant_name"`
} }
// UEEventMMEQuery UE会话对象MME查询参数结构体 // UEEventMMEQuery UE会话对象MME查询参数结构体