add: kpiC report 2 FE

features/pm/performance.go

@@ -292,6 +292,21 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		TenantID:    &kpiData.TenantID,
 	}
 
+	// 发送到匹配的网元
+	neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(kpiData.RmUid)
+	// custom kpi report to FE
+	kpiCEvent := map[string]any{
+		// kip_id ...
+		"neType":      kpiData.NEType,
+		"neId":        neInfo.NeId,
+		"neName":      kpiData.NEName,
+		"rmUID":       kpiData.RmUid,
+		"startIndex":  kpiData.Index,
+		"timeGroup":   kpiData.Date[:10] + " " + kpiData.StartTime,
+		"createdAt":   kpiData.CreatedAt,
+		"granularity": kpiData.Granularity,
+		"tenantID":    kpiData.TenantID,
+	}
 	kpiCList := kpi_c_title.GetActiveKPICList(kpiData.NEType)
 	for _, k := range kpiCList {
 		result, err := evaluate.CalcExpr(*k.Expression, kpiValMap)
@@ -305,18 +320,19 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		}
 
 		report.KpiValues = append(report.KpiValues, *kpiCVal)
+
+		// set KPIC event kpiid and value
+		kpiCEvent[kpiCVal.KPIID] = kpiCVal.Value
 	}
 
 	// KPI自定义指标入库
 	kpi_c_report.InsertKpiCReport(kpiData.NEType, report)
 
-	// 发送到匹配的网元
-	neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(kpiData.RmUid)
 	if neInfo.RmUID == kpiData.RmUid {
 		// 推送到ws订阅组
 		wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
 		// 推送自定义KPI到ws订阅组
-		wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), report)
+		wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
 		if neInfo.NeType == "UPF" {
 			// 推送标识为：12_RMUID, exp: 12_4400HXUPF001
 			wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF+kpiReport.Task.NE.RmUID, kpiEvent)