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

add multi-tenant

Browse Source
This commit is contained in:
simonzhangsz
2024-06-17 11:56:16 +08:00
parent d435710175
commit 8b6b49e660
5 changed files with 77 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/udm_user/model/udm_sub_user.go
View File

@@ -25,7 +25,7 @@ type UdmSubUser struct {
ApnContext string `json:"apnContext" xorm:"apn_context"`
StaticIp string `json:"staticIp" xorm:"static_ip"`
TenantID string `json:"tenantID" xorm:"tenant_id"`
TenantName string `json:"tenantName" xorm:"tenant_name"`
TenantName string `json:"tenantName" xorm:"-"`
SubNum string `json:"subNum,omitempty" xorm:"-"` // 批量数
}

62
features/udm_user/repo/repo_udm_sub_user.go
View File

@@ -88,10 +88,16 @@ func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any {
params = append(params, v)
}
// for multi-tenancy solution
// if v, ok := query["tenantName"]; ok && v != "" {
// conditions = append(conditions, "tenant_name = '?'")
// params = append(params, v)
// }
if v, ok := query["tenantName"]; ok && v != "" {
var tenantID []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenant_name='?'", v).Cols("tenant_id").Distinct().Find(&tenantID)
if err != nil {
log.Errorf("Find tenant_id err => %v", err)
}
conditions = append(conditions, "s.tenant_id = ?")
params = append(params, tenantID[0])
}
// 构建查询条件语句
whereSql := ""
@@ -105,7 +111,7 @@ func (r *RepoUdmSubUser) SelectPage(query map[string]any) map[string]any {
}
// 查询数量 长度为0直接返回
totalSql := "select count(1) as 'total' from u_sub_user"
totalSql := "select count(1) as 'total' from u_sub_user s"
totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
if err != nil {
log.Errorf("total err => %v", err)
@@ -169,10 +175,16 @@ func (r *RepoUdmSubUser) SelectList(auth model.UdmSubUser) []model.UdmSubUser {
params = append(params, auth.NeID)
}
// multi-tenancy
// if auth.TenantName != "" {
// conditions = append(conditions, "tenant_name = '?'")
// params = append(params, auth.TenantName)
// }
if auth.TenantName != "" {
var tenantID []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenant_name='?'", auth.TenantName).Cols("tenant_id").Distinct().Find(&tenantID)
if err != nil {
log.Errorf("Find tenant_id err => %v", err)
}
conditions = append(conditions, "s.tenant_id = ?")
params = append(params, tenantID[0])
}
// 构建查询条件语句
whereSql := ""
@@ -212,7 +224,7 @@ func (r *RepoUdmSubUser) ClearAndInsert(neID string, subArr []model.UdmSubUser)
batch := subArr[i:end]
// multi-tenancy
r.SetTenantName(&batch)
r.SetTenantID(&batch)
// 调用 InsertMulti 函数将批量数据插入数据库
results, err := datasource.DefaultDB().Table("u_sub_user").InsertMulti(batch)
@@ -236,6 +248,10 @@ func (r *RepoUdmSubUser) ClearAndInsert(neID string, subArr []model.UdmSubUser)
// Insert 新增实体
func (r *RepoUdmSubUser) Insert(subUser model.UdmSubUser) int64 {
// multi-tenancy
subUserSlice := []model.UdmSubUser{subUser}
r.SetTenantID(&subUserSlice)
results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
if err != nil {
log.Errorf("Insert err => %v", err)
@@ -257,7 +273,7 @@ func (r *RepoUdmSubUser) Inserts(subUser []model.UdmSubUser) int64 {
batch := subUser[i:end]
// multi-tenancy
r.SetTenantName(&batch)
r.SetTenantID(&batch)
// 调用 InsertMulti 函数将批量数据插入数据库
results, err := datasource.DefaultDB().Table("u_sub_user").InsertMulti(batch)
@@ -289,7 +305,7 @@ func (r *RepoUdmSubUser) Insert4G(neID string, subUser model.UdmSubUser) int64 {
// multi-tenancy
subUserSlice := []model.UdmSubUser{subUser}
r.SetTenantName(&subUserSlice)
r.SetTenantID(&subUserSlice)
results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
if err == nil {
@@ -481,32 +497,28 @@ func (r *RepoUdmSubUser) Deletes(neID, imsi, num string) int64 {
// multi-tenancy solution, get tenant_name by imsi
func (r *RepoUdmSubUser) SetTenantName(subArr *[]model.UdmSubUser) {
for s := 0; s < len(*subArr); s++ {
var tenantName string
err := datasource.DefaultDB().Table("sys_tenant_map").
Where("mapping_type='udm_sub' and mapping_key='?'", (*subArr)[s].Imsi).Cols("tenant_name").Find(tenantName)
var tenantName []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenancy_type='IMSI' and tenancy_key='?'", (*subArr)[s].Imsi).Cols("tenant_name").Find(&tenantName)
if err != nil {
log.Errorf("Find tenant_name err => %v", err)
continue
}
if tenantName != "" {
log.Infof("tenantName=%s imsi=%s", tenantName, (*subArr)[s].Imsi)
}
(*subArr)[s].TenantName = tenantName
(*subArr)[s].TenantName = tenantName[0]
}
}
func (r *RepoUdmSubUser) SetTenantID(subArr *[]model.UdmSubUser) {
fmt.Printf("len:%d", len(*subArr))
for s := 0; s < len(*subArr); s++ {
var tenantID string
var tenantID []string
err := datasource.DefaultDB().Table("sys_tenant").
Where("tenancy_type='IMSI' and tenancy_key='?'", (*subArr)[s].Imsi).Cols("tenant_id").Find(tenantID)
Where("tenancy_type='IMSI' and tenancy_key='?'", (*subArr)[s].Imsi).Cols("parent_id").Distinct().Find(&tenantID)
if err != nil {
log.Errorf("Find tenant_id err => %v", err)
continue
}
if tenantID != "" {
log.Infof("tenantID=%s imsi=%s", tenantID, (*subArr)[s].Imsi)
}
(*subArr)[s].TenantID = tenantID
(*subArr)[s].TenantID = tenantID[0]
fmt.Printf("IMSI: %s, tenantID:%s", (*subArr)[s].Imsi, tenantID[0])
}
}