From 9ec059b4cf0257056f53e0feed41c91e7a0b8a09 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 12 Aug 2024 10:57:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20ws=E8=AE=A2=E9=98=85=E7=BB=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E5=A4=B1=E8=B4=A5=E5=AF=BC=E8=87=B4=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/cdr/cdrevent.go               |  2 +-
 src/modules/ws/service/ws_send.go      |  2 +-
 src/modules/ws/service/ws_send.impl.go | 32 ++++++++++----------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/features/cdr/cdrevent.go b/features/cdr/cdrevent.go
index 7214f179..9d73a265 100644
--- a/features/cdr/cdrevent.go
+++ b/features/cdr/cdrevent.go
@@ -59,7 +59,7 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) {
 	neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(cdrEvent.RmUID)
 	if neInfo.RmUID == cdrEvent.RmUID {
 		// 推送到ws订阅组
-		switch neType {
+		switch neInfo.NeType {
 		case "IMS":
 			if v, ok := cdrEvent.CDR["recordType"]; ok && (v == "MOC" || v == "MTSM") {
 				wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_IMS_CDR+neInfo.NeId, cdrEvent)
diff --git a/src/modules/ws/service/ws_send.go b/src/modules/ws/service/ws_send.go
index 020d022a..91e48b14 100644
--- a/src/modules/ws/service/ws_send.go
+++ b/src/modules/ws/service/ws_send.go
@@ -5,6 +5,6 @@ type IWSSend interface {
 	// ByClientID 给已知客户端发消息
 	ByClientID(clientID string, data any) error
 
-	// ByGroupID 给订阅组的用户发送消息
+	// ByGroupID 给订阅组的客户端发送消息
 	ByGroupID(gid string, data any) error
 }
diff --git a/src/modules/ws/service/ws_send.impl.go b/src/modules/ws/service/ws_send.impl.go
index 88035523..cdf5b079 100644
--- a/src/modules/ws/service/ws_send.impl.go
+++ b/src/modules/ws/service/ws_send.impl.go
@@ -55,36 +55,28 @@ func (s *WSSendImpl) ByClientID(clientID string, data any) error {
 	return nil
 }
 
-// ByGroupID 给订阅组的用户发送消息
+// ByGroupID 给订阅组的客户端发送消息
 func (s *WSSendImpl) ByGroupID(groupID string, data any) error {
-	uids, ok := wsGroup.Load(groupID)
+	clientIds, ok := wsGroup.Load(groupID)
 	if !ok {
 		return fmt.Errorf("no fount Group ID: %s", groupID)
 	}
 
-	groupUids := uids.(*[]string)
-	// 群组中没有成员
-	if len(*groupUids) == 0 {
+	// 检查组内是否有客户端
+	ids := clientIds.(*[]string)
+	if len(*ids) == 0 {
 		return fmt.Errorf("no members in the group")
 	}
 
-	// 在群组中找到对应的 uid
-	for _, uid := range *groupUids {
-		clientIds, ok := wsUsers.Load(uid)
-		if !ok {
+	// 遍历给客户端发消息
+	for _, clientId := range *ids {
+		err := s.ByClientID(clientId, map[string]any{
+			"groupId": groupID,
+			"data":    data,
+		})
+		if err != nil {
 			continue
 		}
-		// 在用户中找到客户端并发送
-		uidClientIds := clientIds.(*[]string)
-		for _, clientId := range *uidClientIds {
-			err := s.ByClientID(clientId, map[string]any{
-				"groupId": groupID,
-				"data":    data,
-			})
-			if err != nil {
-				continue
-			}
-		}
 	}
 
 	return nil