merge: 合并代码20240706

src/modules/ws/processor/cdr_connect.go

@@ -10,17 +10,17 @@ import (
 	neDataService "be.ems/src/modules/network_data/service"
 )
 
-// GetCDRConnect 获取CDR会话事件-IMS
-func GetCDRConnect(requestID string, data any) ([]byte, error) {
+// GetCDRConnectByIMS 获取CDR会话事件-IMS
+func GetCDRConnectByIMS(requestID string, data any) ([]byte, error) {
 	msgByte, _ := json.Marshal(data)
-	var query neDataModel.CDREventQuery
+	var query neDataModel.CDREventIMSQuery
 	err := json.Unmarshal(msgByte, &query)
 	if err != nil {
 		logger.Warnf("ws processor GetCDRConnect err: %s", err.Error())
 		return nil, fmt.Errorf("query data structure error")
 	}
 
-	dataMap := neDataService.NewCDREventImpl.SelectPage(query)
+	dataMap := neDataService.NewCDREventIMSImpl.SelectPage(query)
 	resultByte, err := json.Marshal(result.Ok(map[string]any{
 		"requestId": requestID,
 		"data":      dataMap,
@@ -28,17 +28,17 @@ func GetCDRConnect(requestID string, data any) ([]byte, error) {
 	return resultByte, err
 }
 
-// GetCDRConnect 获取CDR会话事件-SMF
-func GetSMFCDRConnect(requestID string, data any) ([]byte, error) {
+// GetCDRConnectBySMF 获取CDR会话事件-SMF
+func GetCDRConnectBySMF(requestID string, data any) ([]byte, error) {
 	msgByte, _ := json.Marshal(data)
-	var query neDataModel.SMFCDREventQuery
+	var query neDataModel.CDREventSMFQuery
 	err := json.Unmarshal(msgByte, &query)
 	if err != nil {
 		logger.Warnf("ws processor GetCDRConnect err: %s", err.Error())
 		return nil, fmt.Errorf("query data structure error")
 	}
 
-	dataMap := neDataService.NewSMFCDREventImpl.SelectPage(query)
+	dataMap := neDataService.NewCDREventSMFImpl.SelectPage(query)
 	resultByte, err := json.Marshal(result.Ok(map[string]any{
 		"requestId": requestID,
 		"data":      dataMap,