From 0b75b23ca3d4aa01cb9ab43690c2730624af03e0 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 11 Jan 2025 11:52:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20cdr/ue=E7=BB=93=E6=9E=84=E4=BD=93?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E8=A1=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_data/model/cdr_event_ims.go | 9 +++++++-- src/modules/network_data/model/cdr_event_smf.go | 9 +++++++-- src/modules/network_data/model/cdr_event_smsc.go | 9 +++++++-- src/modules/network_data/model/perf_kpi.go | 5 +++++ src/modules/network_data/model/ue_event_amf.go | 9 +++++++-- src/modules/network_data/model/ue_event_mme.go | 9 +++++++-- 6 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/modules/network_data/model/cdr_event_ims.go b/src/modules/network_data/model/cdr_event_ims.go index 08cdbe24..4c85a672 100644 --- a/src/modules/network_data/model/cdr_event_ims.go +++ b/src/modules/network_data/model/cdr_event_ims.go @@ -9,8 +9,13 @@ type CDREventIMS struct { Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` CreatedAt string `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"` - TenantID string `json:"tenantID" gorm:"column:tenant_id"` - TenantName string `json:"tenantName" gorm:"column:tenant_name"` + TenantID string `json:"tenantID" gorm:"-"` + TenantName string `json:"tenantName" gorm:"-"` +} + +// TableName 表名称 +func (*CDREventIMS) TableName() string { + return "cdr_event_ims" } // CDREventIMSQuery CDR会话对象IMS查询参数结构体 diff --git a/src/modules/network_data/model/cdr_event_smf.go b/src/modules/network_data/model/cdr_event_smf.go index 57560177..b972f949 100644 --- a/src/modules/network_data/model/cdr_event_smf.go +++ b/src/modules/network_data/model/cdr_event_smf.go @@ -9,11 +9,16 @@ type CDREventSMF struct { Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` CreatedAt string `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"` - TenantID string `json:"tenantID" gorm:"column:tenant_id"` - TenantName string `json:"tenantName" gorm:"column:tenant_name"` + TenantID string `json:"tenantID" gorm:"-"` + TenantName string `json:"tenantName" gorm:"-"` // ====== 非数据库字段属性 ====== } +// TableName 表名称 +func (*CDREventSMF) TableName() string { + return "cdr_event_smf" +} + // CDREventSMFQuery CDR会话对象SMF查询参数结构体 type CDREventSMFQuery struct { NeType string `json:"neType" form:"neType" binding:"required"` // SMF diff --git a/src/modules/network_data/model/cdr_event_smsc.go b/src/modules/network_data/model/cdr_event_smsc.go index 8df90ead..77076900 100644 --- a/src/modules/network_data/model/cdr_event_smsc.go +++ b/src/modules/network_data/model/cdr_event_smsc.go @@ -9,8 +9,13 @@ type CDREventSMSC struct { Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` CreatedAt string `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"` - TenantID string `json:"tenantID" gorm:"column:tenant_id"` // for multi-tenancy - TenantName string `json:"tenantName" gorm:"column:tenant_name"` // for multi-tenancy + TenantID string `json:"tenantID" gorm:"-"` // for multi-tenancy + TenantName string `json:"tenantName" gorm:"-"` // for multi-tenancy +} + +// TableName 表名称 +func (*CDREventSMSC) TableName() string { + return "cdr_event_smsc" } // CDREventSMSCQuery CDR会话对象SMSC查询参数结构体 diff --git a/src/modules/network_data/model/perf_kpi.go b/src/modules/network_data/model/perf_kpi.go index a2a86fc3..87c73184 100644 --- a/src/modules/network_data/model/perf_kpi.go +++ b/src/modules/network_data/model/perf_kpi.go @@ -10,6 +10,11 @@ type GoldKPITitle struct { EnTitle string `json:"enTitle" gorm:"column:en_title"` } +// TableName 表名称 +func (*GoldKPITitle) TableName() string { + return "kpi_title" +} + // GoldKPIQuery 黄金指标查询参数结构体 type GoldKPIQuery struct { NeType string `form:"neType" binding:"required"` diff --git a/src/modules/network_data/model/ue_event_amf.go b/src/modules/network_data/model/ue_event_amf.go index be7142eb..2b23dafb 100644 --- a/src/modules/network_data/model/ue_event_amf.go +++ b/src/modules/network_data/model/ue_event_amf.go @@ -10,8 +10,13 @@ type UEEventAMF struct { EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` CreatedAt string `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"` - TenantID string `json:"tenantID" gorm:"tenant_id"` - TenantName string `json:"tenantName" gorm:"column:tenant_name"` + TenantID string `json:"tenantID" gorm:"-"` + TenantName string `json:"tenantName" gorm:"-"` +} + +// TableName 表名称 +func (*UEEventAMF) TableName() string { + return "ue_event_amf" } // UEEventAMFQuery UE会话对象AMF查询参数结构体 diff --git a/src/modules/network_data/model/ue_event_mme.go b/src/modules/network_data/model/ue_event_mme.go index 09bd9ba7..f4558f26 100644 --- a/src/modules/network_data/model/ue_event_mme.go +++ b/src/modules/network_data/model/ue_event_mme.go @@ -10,8 +10,13 @@ type UEEventMME struct { EventType string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` CreatedAt string `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"` - TenantID string `json:"tenantID" gorm:"column:tenant_id"` - TenantName string `json:"tenantName" gorm:"column:tenant_name"` + TenantID string `json:"tenantID" gorm:"-"` + TenantName string `json:"tenantName" gorm:"-"` +} + +// TableName 表名称 +func (*UEEventMME) TableName() string { + return "ue_event_mme" } // UEEventMMEQuery UE会话对象MME查询参数结构体