add multi-tenant

src/modules/network_element/model/udm_sub.go

@@ -25,7 +25,7 @@ type UDMSub struct {
 	ApnContext string `json:"apnContext" gorm:"column:apn_context"`
 	StaticIp   string `json:"staticIp" gorm:"column:static_ip"`
 	TenantID   string `json:"tenantID" gorm:"column:tenant_id"`
-	TenantName string `json:"tenantName" gorm:"column:tenant_name"`
+	TenantName string `json:"tenantName" gorm:"-"`
 
 	// ====== 非数据库字段属性 ======
 

src/modules/network_element/repository/udm_sub.impl.go

@@ -4,6 +4,8 @@ import (
 	"strconv"
 	"strings"
 
+	dborm "be.ems/lib/core/datasource"
+	"be.ems/lib/log"
 	"be.ems/src/framework/datasource"
 	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/parse"
@@ -99,11 +101,16 @@ func (r *UDMSubImpl) 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)
-	// 	fmt.Printf("tenantName = %s", v)
-	// }
+	if v, ok := query["tenantName"]; ok && v != "" {
+		var tenantID []string
+		err := dborm.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 := ""
@@ -117,7 +124,7 @@ func (r *UDMSubImpl) 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 {
 		logger.Errorf("total err => %v", err)
@@ -200,6 +207,9 @@ func (r *UDMSubImpl) SelectList(subUser model.UDMSub) []model.UDMSub {
 
 // Insert 新增实体
 func (r *UDMSubImpl) Insert(subUser model.UDMSub) string {
+	// multi-tenancy
+	subUserSlice := []model.UDMSub{subUser}
+	r.SetTenantID(&subUserSlice)
 	err := datasource.DefaultDB().Create(&subUser).Error
 	if err != nil {
 		logger.Errorf("Create err => %v", err)
@@ -209,7 +219,10 @@ func (r *UDMSubImpl) Insert(subUser model.UDMSub) string {
 
 // Insert 批量添加
 func (r *UDMSubImpl) Inserts(subUser []model.UDMSub) int64 {
-	tx := datasource.DefaultDB().CreateInBatches(subUser, 2000)
+	// multi-tenancy
+	r.SetTenantID(&subUser)
+
+	tx := datasource.DefaultDB().CreateInBatches(subUser, 10)
 	if err := tx.Error; err != nil {
 		logger.Errorf("CreateInBatches err => %v", err)
 	}
@@ -321,3 +334,18 @@ func (r *UDMSubImpl) Deletes(neID, imsi, num string) int64 {
 	}
 	return tx.RowsAffected
 }
+
+func (r *UDMSubImpl) SetTenantID(subArr *[]model.UDMSub) {
+	for s := 0; s < len(*subArr); s++ {
+		var tenantID []string
+		err := dborm.DefaultDB().Table("sys_tenant").
+			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 len(tenantID) > 0 {
+			(*subArr)[s].TenantID = tenantID[0]
+		}
+	}
+}

src/modules/system/model/sys_tenant.go

@@ -1,14 +1,14 @@
 package model
 
-// SysTenant 部门对象 sys_Tenant
+// SysTenant 租户对象 sys_Tenant
 type SysTenant struct {
-	// 部门ID
+	// 租户ID
 	TenantID string `json:"tenantId"`
 	// 父部门ID
 	ParentID string `json:"parentId" binding:"required"`
 	// 祖级列表
 	Ancestors string `json:"ancestors"`
-	// 部门名称
+	// 租户名称
 	TenantName string `json:"tenantName" binding:"required"`
 	// 显示顺序
 	OrderNum int `json:"orderNum"`