From 37ebadd4877e631714a9112957b9896f411d0525 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 26 Jan 2024 17:35:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ue=E4=BA=8B=E4=BB=B6=E6=8E=A8=E5=85=A5w?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/event/event.go                | 16 ++++++++++------
 src/modules/ws/service/ws_send.impl.go |  8 +++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/features/event/event.go b/features/event/event.go
index d10e98d3..ecf55f85 100644
--- a/features/event/event.go
+++ b/features/event/event.go
@@ -9,6 +9,7 @@ import (
 	"ems.agt/lib/global"
 	"ems.agt/lib/log"
 	"ems.agt/lib/services"
+	wsService "ems.agt/src/modules/ws/service"
 	"github.com/gin-gonic/gin"
 )
 
@@ -17,12 +18,12 @@ var (
 )
 
 type UEEvent struct {
-	NeType    string         `json:"-" xorm:"ne_type"`
-	NeName    string         `json:"-" xorm:"ne_name"`
-	RmUID     string         `json:"-" xorm:"rm_uid"`
-	Timestamp int            `json:"-" xorm:"timestamp"`
-	EventType string         `json:"-" xorm:"event_type"`
-	EventJson map[string]any `json:"-" xorm:"event_json"`
+	NeType    string         `json:"neType" xorm:"ne_type"`
+	NeName    string         `json:"neName" xorm:"ne_name"`
+	RmUID     string         `json:"rmUID" xorm:"rm_uid"`
+	Timestamp int            `json:"timestamp" xorm:"timestamp"`
+	EventType string         `json:"eventType" xorm:"event_type"`
+	EventJson map[string]any `json:"eventJSON" xorm:"event_json"`
 }
 
 func PostUEEventFromAMF(c *gin.Context) {
@@ -61,5 +62,8 @@ func PostUEEventFromAMF(c *gin.Context) {
 		return
 	}
 
+	// 推送到ws订阅组
+	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_UE, ueEvent)
+
 	services.ResponseStatusOK204NoContent(c.Writer)
 }
diff --git a/src/modules/ws/service/ws_send.impl.go b/src/modules/ws/service/ws_send.impl.go
index cab283a1..8d2aa693 100644
--- a/src/modules/ws/service/ws_send.impl.go
+++ b/src/modules/ws/service/ws_send.impl.go
@@ -12,9 +12,11 @@ const (
 	// 组号-其他
 	GROUP_OTHER = "0"
 	// 组号-指标
-	GROUP_KPI = "1000"
-	// 组号-会话记录
+	GROUP_KPI = "1"
+	// 组号-CDR会话事件-IMS
 	GROUP_CDR = "1005"
+	// 组号-UE会话事件-AMF
+	GROUP_UE = "1010"
 )
 
 // 实例化服务层 WSSendImpl 结构体
@@ -63,7 +65,7 @@ func (s *WSSendImpl) ByGroupID(groupID string, data any) error {
 		uidClientIds := clientIds.(*[]string)
 		for _, clientId := range *uidClientIds {
 			err := s.ByClientID(clientId, map[string]any{
-				"groupID": groupID,
+				"groupId": groupID,
 				"data":    data,
 			})
 			if err != nil {