diff --git a/features/cdr/cdrevent.go b/features/cdr/cdrevent.go index f04f74d4..47a74f5c 100644 --- a/features/cdr/cdrevent.go +++ b/features/cdr/cdrevent.go @@ -88,14 +88,14 @@ func PostCDREventFrom(w http.ResponseWriter, r *http.Request) { switch neInfo.NeType { case "IMS": if v, ok := body.CDR["recordType"]; ok && (v == "MOC" || v == "MTSM") { - wsService.NewWSSend.ByGroupID(wsService.GROUP_IMS_CDR+neInfo.NeId, data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_IMS_CDR, neInfo.NeId), data) } case "SMF": - wsService.NewWSSend.ByGroupID(wsService.GROUP_SMF_CDR+neInfo.NeId, data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_SMF_CDR, neInfo.NeId), data) case "SMSC": - wsService.NewWSSend.ByGroupID(wsService.GROUP_SMSC_CDR+neInfo.NeId, data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_SMSC_CDR, neInfo.NeId), data) case "SGWC": - wsService.NewWSSend.ByGroupID(wsService.GROUP_SGWC_CDR+neInfo.NeId, data) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_SGWC_CDR, neInfo.NeId), data) } services.ResponseStatusOK204NoContent(w) diff --git a/src/modules/trace/packet_task/packet.go b/src/modules/trace/packet_task/packet.go index 5df723b3..420b5a39 100644 --- a/src/modules/trace/packet_task/packet.go +++ b/src/modules/trace/packet_task/packet.go @@ -141,7 +141,7 @@ func capturePacketSource(taskInfo *task) { frameMeta := parsePacketFrame(frameNumber, frameTime, packet) // 推送到ws订阅组 - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s", wsService.GROUP_TRACE_PACKET, taskInfo.TaskNo), frameMeta) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%s", wsService.GROUP_TRACE_PACKET, taskInfo.TaskNo), frameMeta) } } } diff --git a/src/modules/trace/service/trace_task.go b/src/modules/trace/service/trace_task.go index d5259ab1..03948e2e 100644 --- a/src/modules/trace/service/trace_task.go +++ b/src/modules/trace/service/trace_task.go @@ -101,7 +101,7 @@ func (r *TraceTask) CreateUDP() error { // 推送文件 if v, ok := mData["pcapFile"]; ok && v != "" { logger.Infof("pcapFile: %s", v) - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%d", wsService.GROUP_TRACE_NE, taskId), taskId) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%d", wsService.GROUP_TRACE_NE, taskId), taskId) } // 发送响应 @@ -160,7 +160,7 @@ func (r *TraceTask) CreateUDP() error { // 推送文件 if v, ok := mData["pcapFile"]; ok && v != "" { logger.Infof("pcapFile: %s", v) - wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%d", wsService.GROUP_TRACE_NE, taskId), taskId) + wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s_%d", wsService.GROUP_TRACE_NE, taskId), taskId) } // 发送响应 diff --git a/src/modules/ws/service/ws_send.go b/src/modules/ws/service/ws_send.go index 86aa9461..3cf88541 100644 --- a/src/modules/ws/service/ws_send.go +++ b/src/modules/ws/service/ws_send.go @@ -13,21 +13,21 @@ const ( // 组号-其他 GROUP_OTHER = "0" // 组号-跟踪任务网元数据变更 2_traceId - GROUP_TRACE_NE = "2_" + GROUP_TRACE_NE = "2" // 组号-信令跟踪Packet 4_taskNo - GROUP_TRACE_PACKET = "4_" + GROUP_TRACE_PACKET = "4" // 组号-指标通用 10_neType_neId GROUP_KPI = "10" // 组号-自定义KPI指标 20_neType_neId GROUP_KPI_C = "20" // 组号-IMS_CDR会话事件 1005_neId - GROUP_IMS_CDR = "1005_" + GROUP_IMS_CDR = "1005" // 组号-SMF_CDR会话事件 1006_neId - GROUP_SMF_CDR = "1006_" + GROUP_SMF_CDR = "1006" // 组号-SMSC_CDR会话事件 1007_neId - GROUP_SMSC_CDR = "1007_" + GROUP_SMSC_CDR = "1007" // 组号-SGWC_CDR会话事件 1008_neId - GROUP_SGWC_CDR = "1008_" + GROUP_SGWC_CDR = "1008" // 组号-AMF_UE会话事件 1010_neId GROUP_AMF_UE = "1010" // 组号-MME_UE会话事件 1011_neId