add: cdr and ue event for multi-tenancy

2024-07-04 18:25:25 +08:00
parent 97f53e44e4
commit 52bb4cb69c
16 changed files with 279 additions and 66 deletions
--- a/src/modules/network_data/repository/cdr_event_ims.impl.go
+++ b/src/modules/network_data/repository/cdr_event_ims.impl.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"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"
@@ -13,16 +15,21 @@ import (

 // 实例化数据层 CDREventImpl 结构体
 var NewCDREventIMSImpl = &CDREventIMSImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at from cdr_event_ims`,
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
+		t.tenant_id, t.tenant_name	
+		from cdr_event_ims c
+		left join sys_tenant t on t.tenant_id = c.tenant_id`,

 	resultMap: map[string]string{
-		"id":         "ID",
-		"ne_type":    "NeType",
-		"ne_name":    "NeName",
-		"rm_uid":     "RmUID",
-		"timestamp":  "Timestamp",
-		"cdr_json":   "CDRJSONStr",
-		"created_at": "CreatedAt",
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"cdr_json":    "CDRJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
 	},
 }

@@ -93,6 +100,33 @@ func (r *CDREventIMSImpl) SelectPage(querys model.CDREventIMSQuery) map[string]a
 		}
 	}

+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=?", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=?", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
 	// 构建查询条件语句
 	whereSql := ""
 	if len(conditions) > 0 {
@@ -105,7 +139,7 @@ func (r *CDREventIMSImpl) SelectPage(querys model.CDREventIMSQuery) map[string]a
 	}

 	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from cdr_event_ims"
+	totalSql := "select count(1) as 'total' from cdr_event_ims c"
 	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
 	if err != nil {
 		logger.Errorf("total err => %v", err)
--- a/src/modules/network_data/repository/cdr_event_smf.impl.go
+++ b/src/modules/network_data/repository/cdr_event_smf.impl.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"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"
@@ -13,17 +15,22 @@ import (

 // 实例化数据层 CDREventSMFImpl 结构体
 var NewCDREventSMFImpl = &CDREventSMFImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at from cdr_event_smf`,
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
+		t.tenant_id, t.tenant_name	
+		from cdr_event_smf c
+		left join sys_tenant t on t.tenant_id = c.tenant_id`,
 	// selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, JSON_EXTRACT(cdr_json, '$.recordType') AS record_type, JSON_EXTRACT(cdr_json, '$.chargingID') AS charging_id, JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') AS subscriber_id, JSON_EXTRACT(cdr_json, '$.duration') AS duration, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeUplink') AS data_volume_uplink, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataVolumeDownlink') AS data_volume_downlink, JSON_EXTRACT(cdr_json, '$.listOfMultipleUnitUsage[*].usedUnitContainer[*].dataTotalVolume') AS data_total_volume, JSON_EXTRACT(cdr_json, '$.pDUSessionChargingInformation.pDUAddress') AS pdu_address, created_at from cdr_event_smf`,

 	resultMap: map[string]string{
-		"id":         "ID",
-		"ne_type":    "NeType",
-		"ne_name":    "NeName",
-		"rm_uid":     "RmUID",
-		"timestamp":  "Timestamp",
-		"cdr_json":   "CDRJSONStr",
-		"created_at": "CreatedAt",
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"cdr_json":    "CDRJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
 		// "id":                   "ID",
 		// "ne_type":              "NeType",
 		// "ne_name":              "NeName",
@@ -100,6 +107,33 @@ func (r *CDREventSMFImpl) SelectPage(querys model.CDREventSMFQuery) map[string]a
 		params = append(params, querys.SubscriberID)
 	}

+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=?", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=?", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
 	// 构建查询条件语句
 	whereSql := ""
 	if len(conditions) > 0 {
@@ -112,7 +146,7 @@ func (r *CDREventSMFImpl) SelectPage(querys model.CDREventSMFQuery) map[string]a
 	}

 	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from cdr_event_smf"
+	totalSql := "select count(1) as 'total' from cdr_event_smf c"
 	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
 	if err != nil {
 		logger.Errorf("total err => %v", err)
--- a/src/modules/network_data/repository/udm_sub.impl.go
+++ b/src/modules/network_data/repository/udm_sub.impl.go
@@ -95,8 +95,10 @@ func (r *UDMSubImpl) SelectPage(query map[string]any) map[string]any {
 		params = append(params, strings.Trim(v.(string), " "))
 	}
 	if v, ok := query["imsi"]; ok && v != "" {
-		conditions = append(conditions, "imsi like concat(concat('%', ?), '%')")
-		params = append(params, strings.Trim(v.(string), " "))
+		//conditions = append(conditions, "imsi like concat(concat('%', ?), '%')")
+		//params = append(params, strings.Trim(v.(string), " "))
+		conditions = append(conditions, "imsi like ?")
+		params = append(params, v)
 	}
 	if v, ok := query["neId"]; ok && v != "" {
 		conditions = append(conditions, "ne_id = ?")
--- a/src/modules/network_data/repository/ue_event_amf.impl.go
+++ b/src/modules/network_data/repository/ue_event_amf.impl.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"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"
@@ -13,17 +15,22 @@ import (

 // 实例化数据层 UEEventAMFImpl 结构体
 var NewUEEventAMFImpl = &UEEventAMFImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at from ue_event_amf`,
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at,
+		t.tenant_id, t.tenant_name	
+		from ue_event_amf e
+		left join sys_tenant t on t.tenant_id = e.tenant_id`,

 	resultMap: map[string]string{
-		"id":         "ID",
-		"ne_type":    "NeType",
-		"ne_name":    "NeName",
-		"rm_uid":     "RmUID",
-		"timestamp":  "Timestamp",
-		"event_type": "EventType",
-		"event_json": "EventJSONStr",
-		"created_at": "CreatedAt",
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"event_type":  "EventType",
+		"event_json":  "EventJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
 	},
 }

@@ -90,6 +97,32 @@ func (r *UEEventAMFImpl) SelectPage(querys model.UEEventAMFQuery) map[string]any
 		params = append(params, querys.IMSI)
 	}

+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=?", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=?", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
 	// 构建查询条件语句
 	whereSql := ""
 	if len(conditions) > 0 {
@@ -102,7 +135,7 @@ func (r *UEEventAMFImpl) SelectPage(querys model.UEEventAMFQuery) map[string]any
 	}

 	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from ue_event_amf"
+	totalSql := "select count(1) as 'total' from ue_event_amf e"
 	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
 	if err != nil {
 		logger.Errorf("total err => %v", err)
--- a/src/modules/network_data/repository/ue_event_mme.impl.go
+++ b/src/modules/network_data/repository/ue_event_mme.impl.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"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"
@@ -13,17 +15,22 @@ import (

 // 实例化数据层 UEEventMMEImpl 结构体
 var NewUEEventMMEImpl = &UEEventMMEImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at from ue_event_mme`,
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at,
+		t.tenant_id, t.tenant_name
+		from ue_event_mme e
+		left join sys_tenant t on t.tenant_id = e.tenant_id`,

 	resultMap: map[string]string{
-		"id":         "ID",
-		"ne_type":    "NeType",
-		"ne_name":    "NeName",
-		"rm_uid":     "RmUID",
-		"timestamp":  "Timestamp",
-		"event_type": "EventType",
-		"event_json": "EventJSONStr",
-		"created_at": "CreatedAt",
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"event_type":  "EventType",
+		"event_json":  "EventJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
 	},
 }

@@ -90,6 +97,33 @@ func (r *UEEventMMEImpl) SelectPage(querys model.UEEventMMEQuery) map[string]any
 		params = append(params, querys.IMSI)
 	}

+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=?", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=?", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
 	// 构建查询条件语句
 	whereSql := ""
 	if len(conditions) > 0 {
@@ -102,7 +136,7 @@ func (r *UEEventMMEImpl) SelectPage(querys model.UEEventMMEQuery) map[string]any
 	}

 	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from ue_event_mme"
+	totalSql := "select count(1) as 'total' from ue_event_mme e"
 	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
 	if err != nil {
 		logger.Errorf("total err => %v", err)