From caaa4abfb652154ab394bc74992a0188f501cb38 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Fri, 9 Aug 2024 19:53:36 +0800
Subject: [PATCH] add: ws for custom kpi

---
 features/pm/performance.go             | 6 +++++-
 src/modules/ws/service/ws_send.impl.go | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/features/pm/performance.go b/features/pm/performance.go
index 7824d508..ac0c3fd1 100644
--- a/features/pm/performance.go
+++ b/features/pm/performance.go
@@ -307,15 +307,19 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		report.KpiValues = append(report.KpiValues, *kpiCVal)
 	}
 
+	// 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)
 		if neInfo.NeType == "UPF" {
 			// 推送标识为：12_RMUID, exp: 12_4400HXUPF001
-			wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF+"_"+kpiReport.Task.NE.RmUID, kpiEvent)
+			wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF+kpiReport.Task.NE.RmUID, kpiEvent)
 		}
 	}
 
diff --git a/src/modules/ws/service/ws_send.impl.go b/src/modules/ws/service/ws_send.impl.go
index 2eea685b..9f9b5c1e 100644
--- a/src/modules/ws/service/ws_send.impl.go
+++ b/src/modules/ws/service/ws_send.impl.go
@@ -16,6 +16,8 @@ const (
 	GROUP_KPI = "10_"
 	// 组号-指标UPF 12_neId
 	GROUP_KPI_UPF = "12_"
+	// 组号-自定义KPI指标20_neType_neId
+	GROUP_KPI_C = "20_"
 	// 组号-IMS_CDR会话事件
 	GROUP_IMS_CDR = "1005"
 	// 组号-SMF_CDR会话事件