marge: 合并代码

features/cdr/cdrevent.go

@@ -10,6 +10,7 @@ import (
 	"ems.agt/lib/log"
 	"ems.agt/lib/services"
 	"ems.agt/restagent/config"
+	wsService "ems.agt/src/modules/ws/service"
 )
 
 var (
@@ -41,7 +42,7 @@ func PostCDREventFromNF(w http.ResponseWriter, r *http.Request) {
 
 	cdrEvent := new(CDREvent)
 	err = json.Unmarshal(body, &cdrEvent)
-	if err != nil {
+	if cdrEvent.NeType == "" || err != nil {
 		log.Error("Failed to Unmarshal cdrEvent:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
@@ -55,5 +56,12 @@ func PostCDREventFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// 推送到ws订阅组
+	if v, ok := cdrEvent.CDR["recordType"]; ok {
+		if v == "MOC" || v == "MTSM" {
+			wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_IMS_CDR, cdrEvent)
+		}
+	}
+
 	services.ResponseStatusOK204NoContent(w)
 }