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

fix: upf kpi for tenant

Browse Source
This commit is contained in:
simonzhangsz
2024-06-25 15:35:39 +08:00
parent 671f76f52e
commit 0faeb1e0ca
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
features/pm/performance.go
View File

@@ -76,7 +76,8 @@ type KpiData struct {
Granularity int8 `json:"granularity" xorm:"granularity"` Granularity int8 `json:"granularity" xorm:"granularity"`
KPIValues []KPIVal `json:"kpiValues" xorm:"json 'kpi_values'"` KPIValues []KPIVal `json:"kpiValues" xorm:"json 'kpi_values'"`
//CreatedAt int64 `json:"createdAt" xorm:"created 'created_at'"` //CreatedAt int64 `json:"createdAt" xorm:"created 'created_at'"`
CreatedAt int64 `json:"createdAt" xorm:"'created_at'"` CreatedAt int64 `json:"createdAt" xorm:"'created_at'"`
TenantName string `json:"tenantName" xorm:"tenant_name"`
} }
type KPIVal struct { type KPIVal struct {
KPIID string `json:"kpi_id" xorm:"kpi_id"` KPIID string `json:"kpi_id" xorm:"kpi_id"`
@@ -257,6 +258,9 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal) kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
} }
// set tenant_name if exist
where := fmt.Sprintf("status='1' and tenant_id=(select parent_id from sys_tenant where status='1' and tenancy_type='UPF' and tenancy_key='%s')", kpiData.RmUid)
kpiData.TenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
// insert kpi_report table, no session // insert kpi_report table, no session
tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType) tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
affected, err := xEngine.Table(tableName).Insert(kpiData) affected, err := xEngine.Table(tableName).Insert(kpiData)

10
src/modules/network_data/controller/perf_kpi.go
View File

@@ -71,9 +71,13 @@ func (s *PerfKPIController) GoldKPI(c *gin.Context) {
var userName, rmUID string var userName, rmUID string
userName = ctx.LoginUserToUserName(c) userName = ctx.LoginUserToUserName(c)
// multi-tenancy, useName->tenantID->UPF.001(NEType.NEID)->rmUID // multi-tenancy, useName->tenantID->UPF.001(NEType.NEID)->rmUID
selectSQL := fmt.Sprintf(`SELECT rm_uid FROM ne_info n WHERE CONCAT(n.ne_type,'.',n.ne_id) = // selectSQL := fmt.Sprintf(`SELECT rm_uid FROM ne_info n WHERE CONCAT(n.ne_type,'.',n.ne_id) =
(SELECT t.tenancy_key FROM sys_tenant t WHERE t.status='1' AND t.tenancy_type='NE' AND t.parent_id = // (SELECT t.tenancy_key FROM sys_tenant t WHERE t.status='1' AND t.tenancy_type='UPF' AND t.parent_id =
(SELECT u.tenant_id FROM sys_user u WHERE u.user_name='%s'))`, userName) // (SELECT u.tenant_id FROM sys_user u WHERE u.user_name='%s'))`, userName)
// multi-tenancy, useName->tenantID->rmUID
selectSQL := fmt.Sprintf(`SELECT t.tenancy_key FROM sys_tenant t WHERE t.status='1' AND t.tenancy_type='UPF' AND t.parent_id =
(SELECT u.tenant_id FROM sys_user u WHERE u.user_name='%s')`, userName)
_, err := datasource.DefaultDB().SQL(selectSQL).Cols("rm_uid").Get(&rmUID) _, err := datasource.DefaultDB().SQL(selectSQL).Cols("rm_uid").Get(&rmUID)
if err != nil { if err != nil {
c.JSON(200, result.ErrMsgFmt("DB Get error: %s", err.Error())) c.JSON(200, result.ErrMsgFmt("DB Get error: %s", err.Error()))