diff --git a/src/modules/network_data/controller/ims.go b/src/modules/network_data/controller/ims.go index ef0f2756..c086ea9e 100644 --- a/src/modules/network_data/controller/ims.go +++ b/src/modules/network_data/controller/ims.go @@ -48,6 +48,8 @@ func (s *IMSController) CDRList(c *gin.Context) { c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } + // for multi-tenancy + querys.UserName = ctx.LoginUserToUserName(c) // 查询网元信息 rmUID neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID) diff --git a/src/modules/network_data/controller/smf.go b/src/modules/network_data/controller/smf.go index 9390ece5..b7a92c69 100644 --- a/src/modules/network_data/controller/smf.go +++ b/src/modules/network_data/controller/smf.go @@ -50,6 +50,8 @@ func (s *SMFController) CDRList(c *gin.Context) { c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } + // for multi-tenancy + querys.UserName = ctx.LoginUserToUserName(c) // 查询网元信息 rmUID neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID) diff --git a/src/modules/network_data/controller/smsc.go b/src/modules/network_data/controller/smsc.go index 9a879bca..7d63d9d8 100644 --- a/src/modules/network_data/controller/smsc.go +++ b/src/modules/network_data/controller/smsc.go @@ -47,6 +47,8 @@ func (s *SMSCController) CDRList(c *gin.Context) { c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) return } + // for multi-tenancy + querys.UserName = ctx.LoginUserToUserName(c) // 查询网元信息 rmUID neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID) diff --git a/src/modules/network_data/model/cdr_event_ims.go b/src/modules/network_data/model/cdr_event_ims.go index c7f181f3..08cdbe24 100644 --- a/src/modules/network_data/model/cdr_event_ims.go +++ b/src/modules/network_data/model/cdr_event_ims.go @@ -1,18 +1,16 @@ package model -import "time" - // CDREventIMS CDR会话对象IMS cdr_event_ims type CDREventIMS struct { - ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 - Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` - CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` - CreatedAt time.Time `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"` + ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` + NeType string `json:"neType" gorm:"column:ne_type"` + NeName string `json:"neName" gorm:"column:ne_name"` + RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 + 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"` } // 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 08f10f04..57560177 100644 --- a/src/modules/network_data/model/cdr_event_smf.go +++ b/src/modules/network_data/model/cdr_event_smf.go @@ -1,18 +1,16 @@ package model -import "time" - // CDREventSMF CDR会话对象SMF cdr_event_smf type CDREventSMF struct { - ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUID string `json:"rmUID" gorm:"column:rm_uid"` - Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` - CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` - CreatedAt time.Time `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"` + ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` + NeType string `json:"neType" gorm:"column:ne_type"` + NeName string `json:"neName" gorm:"column:ne_name"` + RmUID string `json:"rmUID" gorm:"column:rm_uid"` + 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"` // ====== 非数据库字段属性 ====== } diff --git a/src/modules/network_data/model/cdr_event_smsc.go b/src/modules/network_data/model/cdr_event_smsc.go index b7820650..8df90ead 100644 --- a/src/modules/network_data/model/cdr_event_smsc.go +++ b/src/modules/network_data/model/cdr_event_smsc.go @@ -1,18 +1,16 @@ package model -import "time" - // CDREventSMSC CDR会话对象SMSC cdr_event_smsc type CDREventSMSC struct { - ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` - NeType string `json:"neType" gorm:"column:ne_type"` - NeName string `json:"neName" gorm:"column:ne_name"` - RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 - Timestamp int64 `json:"timestamp" gorm:"column:timestamp"` - CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` - CreatedAt time.Time `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 + ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` + NeType string `json:"neType" gorm:"column:ne_type"` + NeName string `json:"neName" gorm:"column:ne_name"` + RmUID string `json:"rmUID" gorm:"column:rm_uid"` // 可能没有 + 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 } // CDREventSMSCQuery CDR会话对象SMSC查询参数结构体 diff --git a/src/modules/network_data/repository/cdr_event_ims.impl.go b/src/modules/network_data/repository/cdr_event_ims.impl.go index b42ece8f..db88f10f 100644 --- a/src/modules/network_data/repository/cdr_event_ims.impl.go +++ b/src/modules/network_data/repository/cdr_event_ims.impl.go @@ -118,7 +118,7 @@ func (r *CDREventIMSImpl) SelectPage(querys model.CDREventIMSQuery) map[string]a if err != nil { log.Errorf("Get tenant_id from sys_user err => %v", err) } - log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID) + log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID) if tenantID != "" { conditions = append(conditions, "c.tenant_id = ?") params = append(params, tenantID) diff --git a/src/modules/network_data/repository/cdr_event_smf.impl.go b/src/modules/network_data/repository/cdr_event_smf.impl.go index 34086285..2f390bbc 100644 --- a/src/modules/network_data/repository/cdr_event_smf.impl.go +++ b/src/modules/network_data/repository/cdr_event_smf.impl.go @@ -100,7 +100,7 @@ func (r *CDREventSMFImpl) SelectPage(querys model.CDREventSMFQuery) map[string]a if err != nil { log.Errorf("Get tenant_id from sys_user err => %v", err) } - log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID) + log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID) if tenantID != "" { conditions = append(conditions, "c.tenant_id = ?") params = append(params, tenantID) diff --git a/src/modules/network_data/repository/cdr_event_smsc.impl.go b/src/modules/network_data/repository/cdr_event_smsc.impl.go index a4aa0834..8d1899ba 100644 --- a/src/modules/network_data/repository/cdr_event_smsc.impl.go +++ b/src/modules/network_data/repository/cdr_event_smsc.impl.go @@ -111,7 +111,7 @@ func (r *CDREventSMSCImpl) SelectPage(querys model.CDREventSMSCQuery) map[string if err != nil { log.Errorf("Get tenant_id from sys_user err => %v", err) } - log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID) + log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID) if tenantID != "" { conditions = append(conditions, "c.tenant_id = ?") params = append(params, tenantID) @@ -142,7 +142,7 @@ func (r *CDREventSMSCImpl) SelectPage(querys model.CDREventSMSCQuery) map[string } // 查询数量 长度为0直接返回 - totalSql := "select count(1) as 'total' from cdr_event_smsc" + totalSql := "select count(1) as 'total' from cdr_event_smsc c" totalRows, err := datasource.RawDB("", totalSql+whereSql, params) if err != nil { logger.Errorf("total err => %v", err)