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

fix: cdr filter by tenant

Browse Source
This commit is contained in:
simonzhangsz
2024-10-15 16:17:32 +08:00
parent 452ba71c9e
commit 97f9fd0bb2
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,8 @@ func (s *IMSController) CDRList(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)
// 查询网元信息 rmUID // 查询网元信息 rmUID
neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID) neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)

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

@@ -50,6 +50,8 @@ func (s *SMFController) CDRList(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)
// 查询网元信息 rmUID // 查询网元信息 rmUID
neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID) neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)

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

@@ -47,6 +47,8 @@ func (s *SMSCController) CDRList(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)
// 查询网元信息 rmUID // 查询网元信息 rmUID
neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID) neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)

20
src/modules/network_data/model/cdr_event_ims.go
View File

@@ -1,18 +1,16 @@
package model package model
import "time"
// CDREventIMS CDR会话对象IMS cdr_event_ims // CDREventIMS CDR会话对象IMS cdr_event_ims
type CDREventIMS struct { type CDREventIMS 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"`
CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_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"`
} }
// CDREventIMSQuery CDR会话对象IMS查询参数结构体 // CDREventIMSQuery CDR会话对象IMS查询参数结构体

20
src/modules/network_data/model/cdr_event_smf.go
View File

@@ -1,18 +1,16 @@
package model package model
import "time"
// CDREventSMF CDR会话对象SMF cdr_event_smf // CDREventSMF CDR会话对象SMF cdr_event_smf
type CDREventSMF struct { type CDREventSMF 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"`
CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_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"`
// ====== 非数据库字段属性 ====== // ====== 非数据库字段属性 ======
} }

20
src/modules/network_data/model/cdr_event_smsc.go
View File

@@ -1,18 +1,16 @@
package model package model
import "time"
// CDREventSMSC CDR会话对象SMSC cdr_event_smsc // CDREventSMSC CDR会话对象SMSC cdr_event_smsc
type CDREventSMSC struct { type CDREventSMSC 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"`
CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_json"` CDRJSONStr string `json:"cdrJSON" gorm:"column:cdr_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"` // for multi-tenancy TenantID string `json:"tenantID" gorm:"column:tenant_id"` // for multi-tenancy
TenantName string `json:"tenantName" gorm:"column:tenant_name"` // for multi-tenancy TenantName string `json:"tenantName" gorm:"column:tenant_name"` // for multi-tenancy
} }
// CDREventSMSCQuery CDR会话对象SMSC查询参数结构体 // CDREventSMSCQuery CDR会话对象SMSC查询参数结构体

2
src/modules/network_data/repository/cdr_event_ims.impl.go
View File

@@ -118,7 +118,7 @@ func (r *CDREventIMSImpl) SelectPage(querys model.CDREventIMSQuery) map[string]a
if err != nil { if err != nil {
log.Errorf("Get tenant_id from sys_user err => %v", err) 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 != "" { if tenantID != "" {
conditions = append(conditions, "c.tenant_id = ?") conditions = append(conditions, "c.tenant_id = ?")
params = append(params, tenantID) params = append(params, tenantID)

2
src/modules/network_data/repository/cdr_event_smf.impl.go
View File

@@ -100,7 +100,7 @@ func (r *CDREventSMFImpl) SelectPage(querys model.CDREventSMFQuery) map[string]a
if err != nil { if err != nil {
log.Errorf("Get tenant_id from sys_user err => %v", err) 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 != "" { if tenantID != "" {
conditions = append(conditions, "c.tenant_id = ?") conditions = append(conditions, "c.tenant_id = ?")
params = append(params, tenantID) params = append(params, tenantID)

4
src/modules/network_data/repository/cdr_event_smsc.impl.go
View File

@@ -111,7 +111,7 @@ func (r *CDREventSMSCImpl) SelectPage(querys model.CDREventSMSCQuery) map[string
if err != nil { if err != nil {
log.Errorf("Get tenant_id from sys_user err => %v", err) 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 != "" { if tenantID != "" {
conditions = append(conditions, "c.tenant_id = ?") conditions = append(conditions, "c.tenant_id = ?")
params = append(params, tenantID) params = append(params, tenantID)
@@ -142,7 +142,7 @@ func (r *CDREventSMSCImpl) SelectPage(querys model.CDREventSMSCQuery) map[string
} }
// 查询数量 长度为0直接返回 // 查询数量 长度为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) totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
if err != nil { if err != nil {
logger.Errorf("total err => %v", err) logger.Errorf("total err => %v", err)