add: multi-tenancy

features/udm_user/model/udm_sub_user.go

@@ -24,6 +24,7 @@ type UdmSubUser struct {
 	ContextId  string `json:"contextId" xorm:"context_id"`
 	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"`
 
 	SubNum string `json:"subNum,omitempty" xorm:"-"` // 批量数

features/udm_user/repo/repo_udm_sub_user.go

@@ -14,9 +14,11 @@ import (
 // 实例化数据层 RepoUdmSubUser 结构体
 var NewRepoUdmSubUser = &RepoUdmSubUser{
 	selectSql: `select 
-	id, msisdn, imsi, ambr, nssai, rat, arfb, sar, cn, sm_data, smf_sel, eps_dat, ne_id, eps_flag, eps_odb, hplmn_odb, ard, epstpl, context_id, apn_context, static_ip,
-	tenant_name
-	from u_sub_user`,
+	s.id, s.msisdn, s.imsi, s.ambr, s.nssai, s.rat, s.arfb, s.sar, s.cn, s.sm_data, s.smf_sel, s.eps_dat, 
+	s.ne_id, s.eps_flag, s.eps_odb, s.hplmn_odb, s.ard, s.epstpl, s.context_id, s.apn_context, s.static_ip,
+	t.tenant_id, t.tenant_name
+	from u_sub_user s 
+	left join sys_tenant t on t.tenant_id = s.tenant_id`,
 
 	resultMap: map[string]string{
 		"id":          "ID",
@@ -40,6 +42,7 @@ var NewRepoUdmSubUser = &RepoUdmSubUser{
 		"context_id":  "ContextId",
 		"apn_context": "ApnContext",
 		"static_ip":   "StaticIp",
+		"tenant_id":   "TenantID",
 		"tenant_name": "TenantName",
 	},
 }
@@ -85,10 +88,10 @@ 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 != "" {
+	// 	conditions = append(conditions, "tenant_name = '?'")
+	// 	params = append(params, v)
+	// }
 
 	// 构建查询条件语句
 	whereSql := ""
@@ -165,10 +168,11 @@ func (r *RepoUdmSubUser) SelectList(auth model.UdmSubUser) []model.UdmSubUser {
 		conditions = append(conditions, "ne_id = ?")
 		params = append(params, auth.NeID)
 	}
-	if auth.TenantName != "" {
-		conditions = append(conditions, "tenant_name = '?'")
-		params = append(params, auth.TenantName)
-	}
+	// multi-tenancy
+	// if auth.TenantName != "" {
+	// 	conditions = append(conditions, "tenant_name = '?'")
+	// 	params = append(params, auth.TenantName)
+	// }
 
 	// 构建查询条件语句
 	whereSql := ""
@@ -490,3 +494,19 @@ func (r *RepoUdmSubUser) SetTenantName(subArr *[]model.UdmSubUser) {
 		(*subArr)[s].TenantName = tenantName
 	}
 }
+
+func (r *RepoUdmSubUser) SetTenantID(subArr *[]model.UdmSubUser) {
+	for s := 0; s < len(*subArr); s++ {
+		var tenantID string
+		err := datasource.DefaultDB().Table("sys_tenant").
+			Where("tenancy_type='IMSI' and tenancy_key='?'", (*subArr)[s].Imsi).Cols("tenant_id").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
+	}
+}