From b0a21dc61fa552022ecce435b8ed947ee3e5ce6e Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 7 Jun 2024 19:46:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20SMF=E7=9A=84CDR=E6=95=B0=E6=8D=AEWS?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/cdr/cdrevent.go                  |  6 +-----
 src/modules/ws/service/ws_receive.impl.go | 10 ++++++----
 src/modules/ws/service/ws_send.impl.go    |  2 ++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/features/cdr/cdrevent.go b/features/cdr/cdrevent.go
index 2f0efecd..02c95243 100644
--- a/features/cdr/cdrevent.go
+++ b/features/cdr/cdrevent.go
@@ -279,11 +279,7 @@ func PostCDREventFromSMF(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// 推送到ws订阅组
-	// if v, ok := cdrEvent.CDR["recordType"]; ok {
-	// 	if v == "MOC" || v == "MTSM" {
-	// 		wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_IMS_CDR, cdrEvent)
-	// 	}
-	// }
+	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_SMF_CDR, cdrEvent)
 
 	services.ResponseStatusOK204NoContent(w)
 }
diff --git a/src/modules/ws/service/ws_receive.impl.go b/src/modules/ws/service/ws_receive.impl.go
index 3df49304..db1d967c 100644
--- a/src/modules/ws/service/ws_receive.impl.go
+++ b/src/modules/ws/service/ws_receive.impl.go
@@ -68,10 +68,12 @@ func (s *WSReceiveImpl) AsyncReceive(client *model.WSClient, reqMsg model.WSRequ
 		resByte, err = processor.GetProcessData(reqMsg.RequestID, reqMsg.Data)
 	case "net":
 		resByte, err = processor.GetNetConnections(reqMsg.RequestID, reqMsg.Data)
-	case "cdr":
-		resByte, err = processor.GetCDRConnect(reqMsg.RequestID, reqMsg.Data)
-	case "ue":
-		resByte, err = processor.GetUEConnect(reqMsg.RequestID, reqMsg.Data)
+	case "ims_cdr":
+		resByte, err = processor.GetCDRConnectByIMS(reqMsg.RequestID, reqMsg.Data)
+	case "smf_cdr":
+		resByte, err = processor.GetCDRConnectBySMF(reqMsg.RequestID, reqMsg.Data)
+	case "amf_ue":
+		resByte, err = processor.GetUEConnectByAMF(reqMsg.RequestID, reqMsg.Data)
 	case "upf_tf":
 		resByte, err = processor.GetUPFTotalFlow(reqMsg.RequestID, reqMsg.Data)
 	case "ne_state":
diff --git a/src/modules/ws/service/ws_send.impl.go b/src/modules/ws/service/ws_send.impl.go
index 0720cc27..699961e3 100644
--- a/src/modules/ws/service/ws_send.impl.go
+++ b/src/modules/ws/service/ws_send.impl.go
@@ -18,6 +18,8 @@ const (
 	GROUP_KPI_UPF = "12"
 	// 组号-IMS_CDR会话事件
 	GROUP_IMS_CDR = "1005"
+	// 组号-SMF_CDR会话事件
+	GROUP_SMF_CDR = "1006"
 	// 组号-AMF_UE会话事件
 	GROUP_AMF_UE = "1010"
 )