Merge branch 'main' into multi-tenant

src/modules/network_data/controller/all_alarm.go

@@ -15,19 +15,17 @@ import (
 )
 
 // 实例化控制层 AlarmController 结构体
-var NewAlarmController = &AlarmController{
-	neInfoService: neService.NewNeInfoImpl,
-	alarmService:  neDataService.NewAlarmImpl,
+var NewAlarm = &AlarmController{
+	neInfoService: neService.NewNeInfo,
+	alarmService:  neDataService.NewAlarm,
 }
 
 // 告警数据
 //
 // PATH /alarm
 type AlarmController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// 告警信息服务
-	alarmService neDataService.IAlarm
+	neInfoService *neService.NeInfo    // 网元信息服务
+	alarmService  *neDataService.Alarm // 告警信息服务
 }
 
 // 告警列表

src/modules/network_data/controller/all_kpi.go

@@ -16,19 +16,17 @@ import (
 )
 
 // 实例化控制层 PerfKPIController 结构体
-var NewPerfKPIController = &PerfKPIController{
-	neInfoService:  neService.NewNeInfoImpl,
-	perfKPIService: neDataService.NewPerfKPIImpl,
+var NewPerfKPI = &PerfKPIController{
+	neInfoService:  neService.NewNeInfo,
+	perfKPIService: neDataService.NewPerfKPI,
 }
 
 // 性能统计
 //
 // PATH /kpi
 type PerfKPIController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// 统计信息服务
-	perfKPIService neDataService.IPerfKPI
+	neInfoService  *neService.NeInfo      // 网元信息服务
+	perfKPIService *neDataService.PerfKPI // 统计信息服务
 }
 
 // 获取统计数据

src/modules/network_data/controller/amf.go

@@ -22,19 +22,17 @@ import (
 )
 
 // 实例化控制层 AMFController 结构体
-var NewAMFController = &AMFController{
-	neInfoService:  neService.NewNeInfoImpl,
-	ueEventService: neDataService.NewUEEventAMFImpl,
+var NewAMF = &AMFController{
+	neInfoService:  neService.NewNeInfo,
+	ueEventService: neDataService.NewUEEventAMF,
 }
 
 // 网元AMF
 //
 // PATH /amf
 type AMFController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// UE会话事件服务
-	ueEventService neDataService.IUEEventAMF
+	neInfoService  *neService.NeInfo         // 网元信息服务
+	ueEventService *neDataService.UEEventAMF // UE会话事件服务
 }
 
 // UE会话列表
@@ -127,11 +125,11 @@ func (s *AMFController) UEExport(c *gin.Context) {
 		"F1": "Tenant Name",
 	}
 	// 读取字典数据 UE 事件类型
-	dictUEEventType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_type")
+	dictUEEventType := sysService.NewSysDictData.SelectDictDataByType("ue_event_type")
 	// 读取字典数据 UE 事件认证代码类型
-	dictUEAauthCode := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_auth_code")
+	dictUEAauthCode := sysService.NewSysDictData.SelectDictDataByType("ue_auth_code")
 	// 读取字典数据 UE 事件CM状态
-	dictUEEventCmState := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_cm_state")
+	dictUEEventCmState := sysService.NewSysDictData.SelectDictDataByType("ue_event_cm_state")
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
 	for i, row := range rows {

src/modules/network_data/controller/ims.go

@@ -23,19 +23,17 @@ import (
 )
 
 // 实例化控制层 IMSController 结构体
-var NewIMSController = &IMSController{
-	neInfoService:   neService.NewNeInfoImpl,
-	cdrEventService: neDataService.NewCDREventIMSImpl,
+var NewIMS = &IMSController{
+	neInfoService:   neService.NewNeInfo,
+	cdrEventService: neDataService.NewCDREventIMS,
 }
 
 // 网元IMS
 //
 // PATH /ims
 type IMSController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// CDR会话事件服务
-	cdrEventService neDataService.ICDREventIMS
+	neInfoService   *neService.NeInfo          // 网元信息服务
+	cdrEventService *neDataService.CDREventIMS // CDR会话事件服务
 }
 
 // CDR会话列表
@@ -138,9 +136,9 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 		"I1": "Tenant Name", // for multi-tenancy
 	}
 	// 读取字典数据 CDR SIP响应代码类别类型
-	dictCDRSipCode := sysService.NewSysDictDataImpl.SelectDictDataByType("cdr_sip_code")
+	dictCDRSipCode := sysService.NewSysDictData.SelectDictDataByType("cdr_sip_code")
 	// 读取字典数据 CDR 呼叫类型
-	dictCDRCallType := sysService.NewSysDictDataImpl.SelectDictDataByType("cdr_call_type")
+	dictCDRCallType := sysService.NewSysDictData.SelectDictDataByType("cdr_call_type")
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
 	for i, row := range rows {

src/modules/network_data/controller/mme.go

@@ -23,19 +23,17 @@ import (
 )
 
 // 实例化控制层 MMEController 结构体
-var NewMMEController = &MMEController{
-	neInfoService:  neService.NewNeInfoImpl,
-	ueEventService: neDataService.NewUEEventMMEImpl,
+var NewMME = &MMEController{
+	neInfoService:  neService.NewNeInfo,
+	ueEventService: neDataService.NewUEEventMME,
 }
 
 // 网元MME
 //
 // PATH /mme
 type MMEController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// UE会话事件服务
-	ueEventService neDataService.IUEEventMME
+	neInfoService  *neService.NeInfo         // 网元信息服务
+	ueEventService *neDataService.UEEventMME // UE会话事件服务
 }
 
 // UE会话列表
@@ -128,11 +126,11 @@ func (s *MMEController) UEExport(c *gin.Context) {
 		"F1": "Tenant Name",
 	}
 	// 读取字典数据 UE 事件类型
-	dictUEEventType := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_type")
+	dictUEEventType := sysService.NewSysDictData.SelectDictDataByType("ue_event_type")
 	// 读取字典数据 UE 事件认证代码类型
-	dictUEAauthCode := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_auth_code")
+	dictUEAauthCode := sysService.NewSysDictData.SelectDictDataByType("ue_auth_code")
 	// 读取字典数据 UE 事件CM状态
-	dictUEEventCmState := sysService.NewSysDictDataImpl.SelectDictDataByType("ue_event_cm_state")
+	dictUEEventCmState := sysService.NewSysDictData.SelectDictDataByType("ue_event_cm_state")
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
 	for i, row := range rows {

src/modules/network_data/controller/smf.go

@@ -22,22 +22,19 @@ import (
 )
 
 // 实例化控制层 SMFController 结构体
-var NewSMFController = &SMFController{
-	neInfoService:      neService.NewNeInfoImpl,
-	cdrEventService:    neDataService.NewCDREventSMFImpl,
-	udmUserInfoService: *neDataService.NewUDMUserInfo,
+var NewSMF = &SMFController{
+	neInfoService:      neService.NewNeInfo,
+	cdrEventService:    neDataService.NewCDREventSMF,
+	udmUserInfoService: neDataService.NewUDMUserInfo,
 }
 
 // 网元SMF
 //
 // PATH /smf
 type SMFController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// CDR会话事件服务
-	cdrEventService neDataService.ICDREventSMF
-	// UDM用户信息服务
-	udmUserInfoService neDataService.UDMUserInfo
+	neInfoService      *neService.NeInfo          // 网元信息服务
+	cdrEventService    *neDataService.CDREventSMF // CDR会话事件服务
+	udmUserInfoService *neDataService.UDMUserInfo // UDM用户信息服务
 }
 
 // CDR会话列表
@@ -131,18 +128,31 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 	headerCells := map[string]string{
 		"A1": "ID",
 		"B1": "Charging ID",
-		"C1": "Subscriber ID Data",
-		"D1": "Subscriber ID Type",
-		"E1": "Data Volume Uplink",
-		"F1": "Data Volume Downlink",
-		"G1": "Data Total Volume",
-		"H1": "Duration",
-		"I1": "Invocation Time",
-		"J1": "PDU Session Charging Information",
-		"K1": "Tenant Name", // for multi-tenancy
+		"C1": "NE Name",
+		"D1": "Resource Unique ID",
+		"E1": "Subscriber ID Data",
+		"F1": "Subscriber ID Type",
+		"G1": "Data Volume Uplink",
+		"H1": "Data Volume Downlink",
+		"I1": "Data Total Volume",
+		"J1": "Duration",
+		"K1": "Invocation Time",
+		"L1": "User Identifier",
+		"M1": "SSC Mode",
+		"N1": "DNN ID",
+		"O1": "PDU Type",
+		"P1": "RAT Type",
+		"Q1": "PDU IPv4 Address",
+		"R1": "Network Function IPv4",
+		"S1": "PDU IPv6 Address Swith Prefix",
+		"T1": "Record Network Function ID",
+		"U1": "Record Type",
+		"V1": "Record Opening Time",
+		"W1": "Tenant Name", // for multi-tenancy
 	}
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
+
 	for i, row := range rows {
 		idx := strconv.Itoa(i + 2)
 		// 解析 JSON 字符串为 map
@@ -167,12 +177,22 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 				subscriptionIDData = sub["subscriptionIDData"].(string)
 			}
 		}
+
+		// 网络功能 IPv4 地址
+		networkFunctionIPv4Address := ""
+		if v, ok := cdrJSON["nFunctionConsumerInformation"]; ok && v != nil {
+			if conInfo, conInfoOk := v.(map[string]any); conInfoOk && conInfo != nil {
+				networkFunctionIPv4Address = conInfo["networkFunctionIPv4Address"].(string)
+			}
+		}
+
 		// 数据量上行链路
 		dataVolumeUplink := []string{}
 		// 数据量下行链路
 		dataVolumeDownlink := []string{}
 		// 数据总量
 		dataTotalVolume := []string{}
+
 		if v, ok := cdrJSON["listOfMultipleUnitUsage"]; ok && v != nil {
 			usageList := v.([]any)
 			if len(usageList) > 0 {
@@ -207,32 +227,31 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 			invocationTimestamp = v.(string)
 		}
 		// 记录打开时间
-		pduSessionChargingInformation := ""
+		User_Identifier := ""
+		SSC_Mode := ""
+		RAT_Type := ""
+		DNN_ID := ""
+		PDU_Type := ""
+		PDU_IPv4 := ""
+		PDU_IPv6 := ""
 		if v, ok := cdrJSON["pDUSessionChargingInformation"]; ok && v != nil {
 			pduInfo := v.(map[string]any)
 
-			User_Identifier := ""
 			if v, ok := pduInfo["userIdentifier"]; ok && v != nil {
 				User_Identifier = v.(string)
 			}
-			SSC_Mode := ""
 			if v, ok := pduInfo["sSCMode"]; ok && v != nil {
 				SSC_Mode = v.(string)
 			}
-			RAT_Type := ""
 			if v, ok := pduInfo["rATType"]; ok && v != nil {
 				RAT_Type = v.(string)
 			}
-			DNN_ID := ""
 			if v, ok := pduInfo["dNNID"]; ok && v != nil {
 				DNN_ID = v.(string)
 			}
-			PDU_Type := ""
 			if v, ok := pduInfo["pDUType"]; ok && v != nil {
 				PDU_Type = v.(string)
 			}
-			PDU_IPv4 := ""
-			PDU_IPv6 := ""
 			if v, ok := pduInfo["pDUAddress"]; ok && v != nil {
 				pDUAddress := v.(map[string]any)
 				if addr, ok := pDUAddress["pDUIPv4Address"]; ok && addr != nil {
@@ -243,11 +262,29 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 				}
 			}
 
-			pduSessionChargingInformation = fmt.Sprintf(`User Identifier: %s
-SSC Mode: %s    RAT Type: %s    DNN ID: %s
-PDU Type: %s
-PDU IPv4 Address: %s
-PDU IPv6 Addres Swith Prefix: %s`, User_Identifier, SSC_Mode, RAT_Type, DNN_ID, PDU_Type, PDU_IPv4, PDU_IPv6)
+			// 			pduSessionChargingInformation = fmt.Sprintf(`User Identifier: %s
+			// SSC Mode: %s    RAT Type: %s    DNN ID: %s
+			// PDU Type: %s
+			// PDU IPv4 Address: %s
+			// PDU IPv6 Addres Swith Prefix: %s`, User_Identifier, SSC_Mode, RAT_Type, DNN_ID, PDU_Type, PDU_IPv4, PDU_IPv6)
+		}
+
+		// 记录网络参数ID
+		recordNFID := ""
+		if v, ok := cdrJSON["recordingNetworkFunctionID"]; ok && v != nil {
+			recordNFID = v.(string)
+		}
+
+		//记录开始时间
+		recordOpeningTime := ""
+		if v, ok := cdrJSON["recordOpeningTime"]; ok && v != nil {
+			recordOpeningTime = v.(string)
+		}
+
+		//记录类型
+		recordType := ""
+		if v, ok := cdrJSON["recordType"]; ok && v != nil {
+			recordType = v.(string)
 		}
 		// for multi-tenant, get tenant name
 		tenantName := row.TenantName
@@ -255,15 +292,27 @@ PDU IPv6 Addres Swith Prefix: %s`, User_Identifier, SSC_Mode, RAT_Type, DNN_ID,
 		dataCells = append(dataCells, map[string]any{
 			"A" + idx: row.ID,
 			"B" + idx: chargingID,
-			"C" + idx: subscriptionIDData,
-			"D" + idx: subscriptionIDType,
-			"E" + idx: strings.Join(dataVolumeUplink, ","),
-			"F" + idx: strings.Join(dataVolumeDownlink, ","),
-			"G" + idx: strings.Join(dataTotalVolume, ","),
-			"H" + idx: duration,
-			"I" + idx: invocationTimestamp,
-			"J" + idx: pduSessionChargingInformation,
-			"K" + idx: tenantName,
+			"C" + idx: row.NeName,
+			"D" + idx: row.RmUID,
+			"E" + idx: subscriptionIDData,
+			"F" + idx: subscriptionIDType,
+			"G" + idx: strings.Join(dataVolumeUplink, ","),
+			"H" + idx: strings.Join(dataVolumeDownlink, ","),
+			"I" + idx: strings.Join(dataTotalVolume, ","),
+			"J" + idx: duration,
+			"K" + idx: invocationTimestamp,
+			"L" + idx: User_Identifier,
+			"M" + idx: SSC_Mode,
+			"N" + idx: DNN_ID,
+			"O" + idx: PDU_Type,
+			"P" + idx: RAT_Type,
+			"Q" + idx: PDU_IPv4,
+			"R" + idx: networkFunctionIPv4Address,
+			"S" + idx: PDU_IPv6,
+			"T" + idx: recordNFID,
+			"U" + idx: recordType,
+			"V" + idx: recordOpeningTime,
+			"W" + idx: tenantName,
 		})
 	}
 

src/modules/network_data/controller/smsc.go

@@ -22,19 +22,17 @@ import (
 )
 
 // 实例化控制层 SMSCController 结构体
-var NewSMSCController = &SMSCController{
-	neInfoService:   neService.NewNeInfoImpl,
-	cdrEventService: neDataService.NewCDREventSMSCImpl,
+var NewSMSC = &SMSCController{
+	neInfoService:   neService.NewNeInfo,
+	cdrEventService: neDataService.NewCDREventSMSC,
 }
 
 // 网元SMSC
 //
 // PATH /smsc
 type SMSCController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// CDR会话事件服务
-	cdrEventService neDataService.ICDREventSMSC
+	neInfoService   *neService.NeInfo           // 网元信息服务
+	cdrEventService *neDataService.CDREventSMSC // CDR会话事件服务
 }
 
 // CDR会话列表

src/modules/network_data/controller/udm_auth.go

@@ -24,17 +24,15 @@ import (
 // 实例化控制层 UDMAuthController 结构体
 var NewUDMAuth = &UDMAuthController{
 	udmAuthService: neDataService.NewUDMAuthUser,
-	neInfoService:  neService.NewNeInfoImpl,
+	neInfoService:  neService.NewNeInfo,
 }
 
 // UDM鉴权用户
 //
 // PATH /udm/auth
 type UDMAuthController struct {
-	// UDM鉴权信息服务
-	udmAuthService *neDataService.UDMAuthUser
-	// 网元信息服务
-	neInfoService neService.INeInfo
+	udmAuthService *neDataService.UDMAuthUser // UDM鉴权信息服务
+	neInfoService  *neService.NeInfo          // 网元信息服务
 }
 
 // UDM鉴权用户重载数据
@@ -48,7 +46,6 @@ func (s *UDMAuthController) ResetData(c *gin.Context) {
 		return
 	}
 
-	neId = ""
 	data := s.udmAuthService.ResetData(neId)
 	c.JSON(200, result.OkData(data))
 }
@@ -58,7 +55,6 @@ func (s *UDMAuthController) ResetData(c *gin.Context) {
 // GET /list
 func (s *UDMAuthController) List(c *gin.Context) {
 	querys := ctx.QueryMap(c)
-	querys["neId"] = ""
 	data := s.udmAuthService.SelectPage(querys)
 	c.JSON(200, result.Ok(data))
 }
@@ -102,7 +98,6 @@ func (s *UDMAuthController) Info(c *gin.Context) {
 		return
 	}
 
-	neId = ""
 	// 解析返回的数据
 	u := s.udmAuthService.ParseInfo(imsi, neId, data)
 	s.udmAuthService.Insert(neId, u)
@@ -142,7 +137,8 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("add authdat:imsi=%s,ki=%s,amf=%s,algo=%s,opc=%s", body.IMSI, body.Ki, body.Amf, body.AlgoIndex, body.Opc)
+	cmd := fmt.Sprintf("add authdat:imsi=%s,", body.IMSI)
+	cmd += s.udmAuthService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
@@ -151,7 +147,6 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
 		s.udmAuthService.Insert(neId, body)
 	}
 	c.JSON(200, result.OkData(data))
@@ -191,7 +186,8 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("baa authdat:start_imsi=%s,sub_num=%s,ki=%s,amf=%s,algo=%s,opc=%s", body.IMSI, num, body.Ki, body.Amf, body.AlgoIndex, body.Opc)
+	cmd := fmt.Sprintf("baa authdat:start_imsi=%s,sub_num=%s,", body.IMSI, num)
+	cmd += s.udmAuthService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
@@ -200,8 +196,7 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
-		go s.udmAuthService.LoadData(neId, body.IMSI, num)
+		s.udmAuthService.LoadData(neId, body.IMSI, num)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -239,20 +234,8 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("mod authdata:imsi=%s", body.IMSI)
-	// 修改的参数名称
-	if body.Ki != "" {
-		cmd += fmt.Sprintf(",ki=%s", body.Ki)
-	}
-	if body.Amf != "" {
-		cmd += fmt.Sprintf(",amf=%s", body.Amf)
-	}
-	if body.AlgoIndex != "" {
-		cmd += fmt.Sprintf(",algo=%s", body.AlgoIndex)
-	}
-	if body.Opc != "" {
-		cmd += fmt.Sprintf(",opc=%s", body.Opc)
-	}
+	cmd := fmt.Sprintf("mod authdata:imsi=%s,", body.IMSI)
+	cmd += s.udmAuthService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
@@ -261,7 +244,6 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
 		s.udmAuthService.Insert(neId, body)
 	}
 	c.JSON(200, result.OkData(data))
@@ -312,7 +294,6 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
 		}
 		// 命令ok时
 		if strings.Contains(data, "ok") {
-			neId = ""
 			s.udmAuthService.Delete(imsi, neId)
 		}
 		resultData[imsi] = data
@@ -358,8 +339,7 @@ func (s *UDMAuthController) Removes(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
-		go s.udmAuthService.LoadData(neId, imsi, num)
+		s.udmAuthService.LoadData(neId, imsi, num)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -384,7 +364,6 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 
 	querys["pageNum"] = 1
 	querys["pageSize"] = 10000
-	querys["neId"] = ""
 	data := s.udmAuthService.SelectPage(querys)
 	if parse.Number(data["total"]) == 0 {
 		// 导出数据记录为空
@@ -434,8 +413,8 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 			data = append(data, []string{v.IMSI, v.Ki, v.AlgoIndex, v.Amf, opc})
 		}
 		// 输出到文件
-		err := file.WriterFileTXT(data, ",", filePath)
-		if err != nil {
+
+		if err := file.WriterFileTXT(data, ",", filePath); err != nil {
 			c.JSON(200, result.ErrMsg(err.Error()))
 			return
 		}
@@ -531,13 +510,11 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 	if strings.Contains(resultMsg, "ok") {
 		if strings.HasSuffix(body.UploadPath, ".csv") {
 			data := file.ReadFileCSV(localFilePath)
-			neId := ""
-			go s.udmAuthService.InsertData(neId, "csv", data)
+			go s.udmAuthService.InsertData(neInfo.NeId, "csv", data)
 		}
 		if strings.HasSuffix(body.UploadPath, ".txt") {
 			data := file.ReadFileTXT(",", localFilePath)
-			neId := ""
-			go s.udmAuthService.InsertData(neId, "txt", data)
+			go s.udmAuthService.InsertData(neInfo.NeId, "txt", data)
 		}
 	}
 	c.JSON(200, result.OkMsg(resultMsg))

src/modules/network_data/controller/udm_sub.go

@@ -23,17 +23,15 @@ import (
 // 实例化控制层 UDMSubController 结构体
 var NewUDMSub = &UDMSubController{
 	udmSubService: neDataService.NewUDMSub,
-	neInfoService: neService.NewNeInfoImpl,
+	neInfoService: neService.NewNeInfo,
 }
 
 // UDM签约用户
 //
 // PATH /udm/sub
 type UDMSubController struct {
-	// UDM签约信息服务
-	udmSubService *neDataService.UDMSubUser
-	// 网元信息服务
-	neInfoService neService.INeInfo
+	udmSubService *neDataService.UDMSubUser // UDM签约信息服务
+	neInfoService *neService.NeInfo         // 网元信息服务
 }
 
 // UDM签约用户重载数据
@@ -47,7 +45,6 @@ func (s *UDMSubController) ResetData(c *gin.Context) {
 		return
 	}
 
-	neId = ""
 	data := s.udmSubService.ResetData(neId)
 	c.JSON(200, result.OkData(data))
 }
@@ -57,7 +54,6 @@ func (s *UDMSubController) ResetData(c *gin.Context) {
 // GET /list
 func (s *UDMSubController) List(c *gin.Context) {
 	querys := ctx.QueryMap(c)
-	querys["neId"] = ""
 	querys["userName"] = ctx.LoginUserToUserName(c)
 	data := s.udmSubService.SelectPage(querys)
 	c.JSON(200, result.Ok(data))
@@ -102,7 +98,6 @@ func (s *UDMSubController) Info(c *gin.Context) {
 		return
 	}
 
-	neId = ""
 	// 解析返回的数据
 	u := s.udmSubService.ParseInfo(imsi, neId, data)
 	s.udmSubService.Insert(neId, u)
@@ -142,12 +137,8 @@ func (s *UDMSubController) Add(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("add udmuser:imsi=%s,msisdn=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s,cag=%s",
-		body.IMSI, body.MSISDN, body.Ambr, body.Nssai, body.Arfb, body.Sar, body.Rat, body.Cn, body.SmfSel, body.SmData, body.EpsFlag, body.EpsOdb, body.HplmnOdb, body.Ard, body.Epstpl, body.ContextId, body.ApnContext, body.Cag)
-	// static_ip指给4G UE分配的静态IP，没有可不带此字段名，批量添加IP会自动递增
-	if body.StaticIp != "" {
-		cmd += fmt.Sprintf(",static_ip=%s", body.StaticIp)
-	}
+	cmd := fmt.Sprintf("add udmuser:imsi=%s,", body.IMSI)
+	cmd += s.udmSubService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
@@ -156,7 +147,6 @@ func (s *UDMSubController) Add(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
 		body.NeId = neId
 		s.udmSubService.Insert(neId, body)
 	}
@@ -197,8 +187,8 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s,cag=%s",
-		body.IMSI, body.MSISDN, num, body.Ambr, body.Nssai, body.Arfb, body.Sar, body.Rat, body.Cn, body.SmfSel, body.SmData, body.EpsFlag, body.EpsOdb, body.HplmnOdb, body.Ard, body.Epstpl, body.ContextId, body.ApnContext, body.Cag)
+	cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,", body.IMSI, body.MSISDN, num)
+	cmd += s.udmSubService.ParseCommandParams(body)
 	// static_ip指给4G UE分配的静态IP，没有可不带此字段名，批量添加IP会自动递增
 	if body.StaticIp != "" {
 		cmd += fmt.Sprintf(",static_ip=%s", body.StaticIp)
@@ -211,8 +201,7 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
-		go s.udmSubService.LoadData(neId, body.IMSI, num, body.Remark)
+		s.udmSubService.LoadData(neId, body.IMSI, num, body.Remark)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -250,65 +239,8 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("mod udmuser:imsi=%s", body.IMSI)
-	// 修改的参数名称
-	if body.MSISDN != "" {
-		cmd += fmt.Sprintf(",msisdn=%s", body.MSISDN)
-	}
-	if body.Ambr != "" {
-		cmd += fmt.Sprintf(",ambr=%s", body.Ambr)
-	}
-	if body.Nssai != "" {
-		cmd += fmt.Sprintf(",nssai=%s", body.Nssai)
-	}
-	if body.Arfb != "" {
-		cmd += fmt.Sprintf(",arfb=%s", body.Arfb)
-	}
-	if body.Sar != "" {
-		cmd += fmt.Sprintf(",sar=%s", body.Sar)
-	}
-	if body.Rat != "" {
-		cmd += fmt.Sprintf(",rat=%s", body.Rat)
-	}
-	if body.Cn != "" {
-		cmd += fmt.Sprintf(",cn=%s", body.Cn)
-	}
-	if body.SmfSel != "" {
-		cmd += fmt.Sprintf(",smf_sel=%s", body.SmfSel)
-	}
-	if body.SmData != "" {
-		cmd += fmt.Sprintf(",sm_data=%s", body.SmData)
-	}
-	if body.EpsDat != "" {
-		cmd += fmt.Sprintf(",eps_dat=%s", body.EpsDat)
-	}
-	if body.EpsFlag != "" {
-		cmd += fmt.Sprintf(",eps_flag=%s", body.EpsFlag)
-	}
-	if body.EpsOdb != "" {
-		cmd += fmt.Sprintf(",eps_odb=%s", body.EpsOdb)
-	}
-	if body.HplmnOdb != "" {
-		cmd += fmt.Sprintf(",hplmn_odb=%s", body.HplmnOdb)
-	}
-	if body.Epstpl != "" {
-		cmd += fmt.Sprintf(",epstpl=%s", body.Epstpl)
-	}
-	if body.Ard != "" {
-		cmd += fmt.Sprintf(",ard=%s", body.Ard)
-	}
-	if body.ContextId != "" {
-		cmd += fmt.Sprintf(",context_id=%s", body.ContextId)
-	}
-	if body.ApnContext != "" {
-		cmd += fmt.Sprintf(",apn_context=%s", body.ApnContext)
-	}
-	if body.Cag != "" {
-		cmd += fmt.Sprintf(",cag=%s", body.Cag)
-	}
-	if body.StaticIp != "" {
-		cmd += fmt.Sprintf(",static_ip=%s", body.StaticIp)
-	}
+	cmd := fmt.Sprintf("mod udmuser:imsi=%s,", body.IMSI)
+	cmd += s.udmSubService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
@@ -317,7 +249,6 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
 		body.NeId = neId
 		s.udmSubService.Insert(neId, body)
 	}
@@ -369,7 +300,6 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 		}
 		// 命令ok时
 		if strings.Contains(data, "ok") {
-			neId = ""
 			s.udmSubService.Delete(neId, imsi)
 		}
 		resultData[imsi] = data
@@ -415,9 +345,7 @@ func (s *UDMSubController) Removes(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		neId = ""
-		go s.udmSubService.LoadData(neId, imsi, num, "-(Deleted)-")
-
+		s.udmSubService.LoadData(neId, imsi, num, "-(Deleted)-")
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -442,11 +370,6 @@ func (s *UDMSubController) Export(c *gin.Context) {
 
 	querys["pageNum"] = 1
 	querys["pageSize"] = 10000
-
-	// for multi-tenancy
-	querys["userName"] = ctx.LoginUserToUserName(c)
-	querys["neId"] = ""
-
 	data := s.udmSubService.SelectPage(querys)
 	if parse.Number(data["total"]) == 0 {
 		// 导出数据记录为空
@@ -469,14 +392,13 @@ func (s *UDMSubController) Export(c *gin.Context) {
 	if fileType == "csv" {
 		// 转换数据
 		data := [][]string{}
-		data = append(data, []string{"imsi", "msisdn", "ambr", "nssai", "arfb", "sar", "rat", "cn", "smf_sel", "sm_dat", "eps_dat", "tenant_name"})
+		data = append(data, []string{"IMSI", "MSISDN", "UeAmbrTpl", "NssaiTpl", "AreaForbiddenTpl", "ServiceAreaRestrictionTpl", "RatRestrictions", "CnTypeRestrictions", "SmfSel", "SmData", "EPSDat"})
 		for _, v := range rows {
 			epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
-			data = append(data, []string{v.IMSI, v.MSISDN, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat, v.TenantName})
+			data = append(data, []string{v.IMSI, v.MSISDN, v.UeAmbrTpl, v.NssaiTpl, v.AreaForbiddenTpl, v.ServiceAreaRestrictionTpl, v.RatRestrictions, v.CnTypeRestrictions, v.SmfSel, v.SmData, epsDat})
 		}
 		// 输出到文件
-		err := file.WriterFileCSV(data, filePath)
-		if err != nil {
+		if err := file.WriterFileCSV(data, filePath); err != nil {
 			c.JSON(200, result.ErrMsg(err.Error()))
 			return
 		}
@@ -487,11 +409,10 @@ func (s *UDMSubController) Export(c *gin.Context) {
 		data := [][]string{}
 		for _, v := range rows {
 			epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
-			data = append(data, []string{v.IMSI, v.MSISDN, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat, v.TenantName})
+			data = append(data, []string{v.IMSI, v.MSISDN, v.UeAmbrTpl, v.NssaiTpl, v.AreaForbiddenTpl, v.ServiceAreaRestrictionTpl, v.RatRestrictions, v.CnTypeRestrictions, v.SmfSel, v.SmData, epsDat})
 		}
 		// 输出到文件
-		err := file.WriterFileTXT(data, ",", filePath)
-		if err != nil {
+		if err := file.WriterFileTXT(data, ",", filePath); err != nil {
 			c.JSON(200, result.ErrMsg(err.Error()))
 			return
 		}
@@ -571,13 +492,11 @@ func (s *UDMSubController) Import(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		if strings.HasSuffix(body.UploadPath, ".csv") {
 			data := file.ReadFileCSV(localFilePath)
-			neId := ""
-			go s.udmSubService.InsertData(neId, "csv", data)
+			go s.udmSubService.InsertData(neInfo.NeId, "csv", data)
 		}
 		if strings.HasSuffix(body.UploadPath, ".txt") {
 			data := file.ReadFileTXT(",", localFilePath)
-			neId := ""
-			go s.udmSubService.InsertData(neId, "txt", data)
+			go s.udmSubService.InsertData(neInfo.NeId, "txt", data)
 		}
 	}
 	c.JSON(200, result.OkMsg(data))

src/modules/network_data/controller/upf.go

@@ -10,19 +10,17 @@ import (
 )
 
 // 实例化控制层 UPFController 结构体
-var NewUPFController = &UPFController{
-	neInfoService:  neService.NewNeInfoImpl,
-	perfKPIService: neDataService.NewPerfKPIImpl,
+var NewUPF = &UPFController{
+	neInfoService:  neService.NewNeInfo,
+	perfKPIService: neDataService.NewPerfKPI,
 }
 
 // 网元UPF
 //
 // PATH /upf
 type UPFController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// 统计信息服务
-	perfKPIService neDataService.IPerfKPI
+	neInfoService  *neService.NeInfo      // 网元信息服务
+	perfKPIService *neDataService.PerfKPI // 统计信息服务
 }
 
 // 总流量数 N3上行 N6下行

src/modules/network_data/model/udm_auth.go

@@ -3,13 +3,13 @@ package model
 // UDMAuthUser UDM鉴权用户 u_auth_user
 type UDMAuthUser struct {
 	ID        string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID
-	IMSI      string `json:"imsi" gorm:"imsi"`                             // SIM卡/USIM卡ID
-	NeId      string `json:"neId" gorm:"ne_id"`                            // UDM网元标识
-	Amf       string `json:"amf" gorm:"amf"`                               // AMF
-	Status    string `json:"status" gorm:"status"`                         // 状态
-	Ki        string `json:"ki" gorm:"ki"`                                 // ki
-	AlgoIndex string `json:"algoIndex" gorm:"algo_index"`                  // algoIndex
-	Opc       string `json:"opc" gorm:"opc"`                               // OPC
+	IMSI      string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
+	NeId      string `json:"neId" gorm:"column:ne_id"`                     // UDM网元标识
+	Amf       string `json:"amf" gorm:"column:amf"`                        // AMF
+	Status    string `json:"status" gorm:"column:status"`                  // 状态
+	Ki        string `json:"ki" gorm:"column:ki"`                          // ki
+	AlgoIndex string `json:"algoIndex" gorm:"column:algo_index"`           // algoIndex
+	Opc       string `json:"opc" gorm:"column:opc"`                        // OPC
 }
 
 // TableName 表名称

src/modules/network_data/model/udm_sub.go

@@ -2,28 +2,40 @@ package model
 
 // UDMSubUser UDM签约用户 u_sub_user
 type UDMSubUser struct {
-	ID         string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
-	IMSI       string `json:"imsi" gorm:"imsi"`                             // SIM卡/USIM卡ID
-	MSISDN     string `json:"msisdn" gorm:"msisdn"`                         // 用户电话号码
-	NeId       string `json:"neId" gorm:"ne_id"`                            // UDM网元标识
-	Ambr       string `json:"ambr" gorm:"ambr"`                             // SubUeAMBRTemp
-	Nssai      string `json:"nssai" gorm:"nssai"`                           // SubSNSSAITemp
-	Rat        string `json:"rat" gorm:"rat"`                               // rat VIRTUAL|WLAN|EUTRA|NR
-	Arfb       string `json:"arfb" gorm:"arfb"`                             // forbiddenAreasTemp
-	Sar        string `json:"sar" gorm:"sar"`                               // serviceAreaRestrictTemp
-	Cn         string `json:"cn" gorm:"cn"`                                 // cnType EPC|5GC
-	SmData     string `json:"smData" gorm:"sm_data"`                        // smData
-	SmfSel     string `json:"smfSel" gorm:"smf_sel"`                        // smfSel
-	EpsDat     string `json:"epsDat" gorm:"eps_dat"`                        // Eps
-	EpsFlag    string `json:"epsFlag" gorm:"eps_flag"`                      // epsFlag
-	EpsOdb     string `json:"epsOdb" gorm:"eps_odb"`                        // epsOdb
-	HplmnOdb   string `json:"hplmnOdb" gorm:"hplmn_odb"`                    // hplmnOdb
-	Ard        string `json:"ard" gorm:"ard"`                               // Ard
-	Epstpl     string `json:"epstpl" gorm:"epstpl"`                         // Epstpl
-	ContextId  string `json:"contextId" gorm:"context_id"`                  // ContextId
-	ApnContext string `json:"apnContext" gorm:"apn_context"`                // apnContext
-	StaticIp   string `json:"staticIp" gorm:"static_ip"`                    // staticIpstatic_ip指给4G UE分配的静态IP，没有可不带此字段名
-	Cag        string `json:"cag" gorm:"cag"`                               // CAG
+	ID     string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
+	IMSI   string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
+	MSISDN string `json:"msisdn" gorm:"column:msisdn"`                  // 用户电话号码
+	NeId   string `json:"neId" gorm:"column:ne_id"`                     // UDM网元标识
+
+	AmDat                     string `json:"amDat" gorm:"column:am_dat"`              // AmData
+	UeAmbrTpl                 string `json:"ambr" gorm:"column:ambr"`                 // AmData SubUeAMBRTemp
+	NssaiTpl                  string `json:"nssai" gorm:"column:nssai"`               // AmData SubSNSSAITemp
+	RatRestrictions           string `json:"rat" gorm:"column:rat"`                   // AmData RAT 0x00:VIRTUAL 0x01:WLAN 0x02:EUTRA 0x03:NR
+	AreaForbiddenTpl          string `json:"arfb" gorm:"column:arfb"`                 // AmData AreaForbidden
+	ServiceAreaRestrictionTpl string `json:"sar" gorm:"column:sar"`                   // AmData serviceAreaRestrictTemp
+	CnTypeRestrictions        string `json:"cnType" gorm:"column:cn_type"`            // AmData CNType 0x00:EPC和5GC 0x01:5GC 0x02:EPC 0x03:EPC+5GC
+	RfspIndex                 string `json:"rfspIndex" gorm:"column:rfsp_index"`      // AmData RfspIndex
+	SubsRegTime               string `json:"regTimer" gorm:"column:reg_timer"`        // AmData RegTimer
+	UeUsageType               string `json:"ueUsageType" gorm:"column:ue_usage_type"` // AmData UEUsageType
+	ActiveTime                string `json:"activeTime" gorm:"column:active_time"`    // AmData ActiveTime
+	MicoAllowed               string `json:"mico" gorm:"column:mico"`                 // AmData MICO
+	OdbPs                     string `json:"odbPs" gorm:"column:odb_ps"`              // AmData ODB_PS 0-all,1-hplmn,2-vplmn
+	GroupId                   string `json:"groupId" gorm:"column:group_id"`          // AmData GroupId
+
+	EpsDat     string `json:"epsDat" gorm:"column:eps_dat"`         // EpsDat
+	EpsFlag    string `json:"epsFlag" gorm:"column:eps_flag"`       // EpsDat epsFlag
+	EpsOdb     string `json:"epsOdb" gorm:"column:eps_odb"`         // EpsDat epsOdb
+	HplmnOdb   string `json:"hplmnOdb" gorm:"column:hplmn_odb"`     // EpsDat hplmnOdb
+	Ard        string `json:"ard" gorm:"column:ard"`                // EpsDat Ard
+	Epstpl     string `json:"epstpl" gorm:"column:epstpl"`          // EpsDat Epstpl
+	ContextId  string `json:"contextId" gorm:"column:context_id"`   // EpsDat ContextId
+	ApnNum     string `json:"apnNum" gorm:"column:apn_mum"`         // EpsDat apnNum
+	ApnContext string `json:"apnContext" gorm:"column:apn_context"` // EpsDat apnContext
+	StaticIp   string `json:"staticIp" gorm:"column:static_ip"`     // EpsDat staticIp 指给4G UE分配的静态IP，没有可不带此字段名
+
+	SmData string `json:"smData" gorm:"column:sm_data"` // smData
+	SmfSel string `json:"smfSel" gorm:"column:smf_sel"` // smfSel
+	Cag    string `json:"cag" gorm:"column:cag"`        // CAG
 
 	TenantID   string `json:"tenantID" gorm:"column:tenant_id"`
 	TenantName string `json:"tenantName" gorm:"-"`

src/modules/network_data/network_data.go

@@ -21,11 +21,11 @@ func Setup(router *gin.Engine) {
 	{
 		kpiGroup.GET("/title",
 			middleware.PreAuthorize(nil),
-			controller.NewPerfKPIController.Title,
+			controller.NewPerfKPI.Title,
 		)
 		kpiGroup.GET("/data",
 			middleware.PreAuthorize(nil),
-			controller.NewPerfKPIController.GoldKPI,
+			controller.NewPerfKPI.GoldKPI,
 		)
 	}
 
@@ -34,11 +34,11 @@ func Setup(router *gin.Engine) {
 	{
 		alarmGroup.GET("/list",
 			middleware.PreAuthorize(nil),
-			controller.NewAlarmController.List,
+			controller.NewAlarm.List,
 		)
 		alarmGroup.DELETE("/:alarmIds",
 			middleware.PreAuthorize(nil),
-			controller.NewAlarmController.Remove,
+			controller.NewAlarm.Remove,
 		)
 	}
 
@@ -47,17 +47,17 @@ func Setup(router *gin.Engine) {
 	{
 		imsGroup.GET("/cdr/list",
 			middleware.PreAuthorize(nil),
-			controller.NewIMSController.CDRList,
+			controller.NewIMS.CDRList,
 		)
 		imsGroup.DELETE("/cdr/:cdrIds",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.imsCDR", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewIMSController.CDRRemove,
+			controller.NewIMS.CDRRemove,
 		)
 		imsGroup.POST("/cdr/export",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.imsCDR", collectlogs.BUSINESS_TYPE_EXPORT)),
-			controller.NewIMSController.CDRExport,
+			controller.NewIMS.CDRExport,
 		)
 	}
 
@@ -66,17 +66,17 @@ func Setup(router *gin.Engine) {
 	{
 		smscGroup.GET("/cdr/list",
 			middleware.PreAuthorize(nil),
-			controller.NewSMSCController.CDRList,
+			controller.NewSMSC.CDRList,
 		)
 		smscGroup.DELETE("/cdr/:cdrIds",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smscCDR", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewSMSCController.CDRRemove,
+			controller.NewSMSC.CDRRemove,
 		)
 		smscGroup.POST("/cdr/export",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smscCDR", collectlogs.BUSINESS_TYPE_EXPORT)),
-			controller.NewSMSCController.CDRExport,
+			controller.NewSMSC.CDRExport,
 		)
 	}
 
@@ -85,21 +85,21 @@ func Setup(router *gin.Engine) {
 	{
 		smfGroup.GET("/cdr/list",
 			middleware.PreAuthorize(nil),
-			controller.NewSMFController.CDRList,
+			controller.NewSMF.CDRList,
 		)
 		smfGroup.DELETE("/cdr/:cdrIds",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smfCDR", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewSMFController.CDRRemove,
+			controller.NewSMF.CDRRemove,
 		)
 		smfGroup.POST("/cdr/export",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smfCDR", collectlogs.BUSINESS_TYPE_EXPORT)),
-			controller.NewSMFController.CDRExport,
+			controller.NewSMF.CDRExport,
 		)
 		smfGroup.GET("/subscribers",
 			middleware.PreAuthorize(nil),
-			controller.NewSMFController.SubUserList,
+			controller.NewSMF.SubUserList,
 		)
 	}
 
@@ -108,17 +108,17 @@ func Setup(router *gin.Engine) {
 	{
 		amfGroup.GET("/ue/list",
 			middleware.PreAuthorize(nil),
-			controller.NewAMFController.UEList,
+			controller.NewAMF.UEList,
 		)
 		amfGroup.DELETE("/ue/:ueIds",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.amfUE", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewAMFController.UERemove,
+			controller.NewAMF.UERemove,
 		)
 		amfGroup.POST("/ue/export",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.amfUE", collectlogs.BUSINESS_TYPE_EXPORT)),
-			controller.NewAMFController.UEExport,
+			controller.NewAMF.UEExport,
 		)
 	}
 
@@ -127,7 +127,7 @@ func Setup(router *gin.Engine) {
 	{
 		upfGroup.GET("/totalFlow",
 			middleware.PreAuthorize(nil),
-			controller.NewUPFController.TotalFlow,
+			controller.NewUPF.TotalFlow,
 		)
 	}
 
@@ -244,17 +244,17 @@ func Setup(router *gin.Engine) {
 	{
 		mmeGroup.GET("/ue/list",
 			middleware.PreAuthorize(nil),
-			controller.NewMMEController.UEList,
+			controller.NewMME.UEList,
 		)
 		mmeGroup.DELETE("/ue/:ueIds",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.mmeUE", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewMMEController.UERemove,
+			controller.NewMME.UERemove,
 		)
 		mmeGroup.POST("/ue/export",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.mmeUE", collectlogs.BUSINESS_TYPE_EXPORT)),
-			controller.NewMMEController.UEExport,
+			controller.NewMME.UEExport,
 		)
 	}
 }

src/modules/network_data/repository/alarm.go

@@ -1,15 +1,194 @@
 package repository
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
+	"strings"
 
-// 告警 数据层接口
-type IAlarm interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.AlarmQuery) map[string]any
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
 
-	// SelectByIds 通过ID查询
-	SelectByIds(ids []string) []model.Alarm
+// 实例化数据层 Alarm 结构体
+var NewAlarm = &Alarm{
+	selectSql: `select 
+	id, alarm_seq, alarm_id, alarm_title, ne_type, ne_id, alarm_code, event_time, 
+	alarm_type, orig_severity, perceived_severity, pv_flag, ne_name, object_uid, object_name,
+	object_type, location_info, province, alarm_status, specific_problem, specific_problem_id,
+	add_info, counter, latest_event_time, ack_state, ack_time, ack_user, clear_type,
+	clear_time, clear_user, timestamp
+	from alarm`,
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(ids []string) int64
+	resultMap: map[string]string{
+		"id":                  "ID",
+		"alarm_seq":           "AlarmSeq",
+		"alarm_id":            "AlarmId",
+		"alarm_title":         "AlarmTitle",
+		"ne_type":             "NeType",
+		"ne_id":               "NeId",
+		"alarm_code":          "AlarmCode",
+		"event_time":          "EventTime",
+		"alarm_type":          "AlarmType",
+		"orig_severity":       "OrigSeverity",
+		"perceived_severity":  "PerceivedSeverity",
+		"pv_flag":             "PvFlag",
+		"ne_name":             "NeName",
+		"object_uid":          "ObjectUid",
+		"object_name":         "ObjectName",
+		"object_type":         "ObjectType",
+		"location_info":       "LocationInfo",
+		"province":            "Province",
+		"alarm_status":        "AlarmStatus",
+		"specific_problem":    "SpecificProblem",
+		"specific_problem_id": "SpecificProblemId",
+		"add_info":            "AddInfo",
+		"counter":             "Counter",
+		"latest_event_time":   "LatestEventTime",
+		"ack_state":           "AckState",
+		"ack_time":            "AckTime",
+		"ack_user":            "AckUser",
+		"clear_type":          "ClearType",
+		"clear_time":          "ClearTime",
+		"clear_user":          "ClearUser",
+		"timestamp":           "Timestamp",
+	},
+}
+
+// Alarm 告警 数据层处理
+type Alarm struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *Alarm) convertResultRows(rows []map[string]any) []model.Alarm {
+	arr := make([]model.Alarm, 0)
+	for _, row := range rows {
+		item := model.Alarm{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *Alarm) SelectPage(querys model.AlarmQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "object_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		params = append(params, querys.EndTime)
+	}
+	if querys.OrigSeverity != "" {
+		eventTypes := strings.Split(querys.OrigSeverity, ",")
+		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
+		conditions = append(conditions, fmt.Sprintf("orig_severity in (%s)", placeholder))
+		for _, eventType := range eventTypes {
+			params = append(params, eventType)
+		}
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.Alarm{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from alarm"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *Alarm) SelectByIds(ids []string) []model.Alarm {
+	placeholder := repo.KeyPlaceholderByQuery(len(ids))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ids)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.Alarm{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *Alarm) DeleteByIds(ids []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(ids))
+	sql := "delete from alarm where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ids)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
 }

src/modules/network_data/repository/alarm.impl.go

@@ -1,194 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 AlarmImpl 结构体
-var NewAlarmImpl = &AlarmImpl{
-	selectSql: `select 
-	id, alarm_seq, alarm_id, alarm_title, ne_type, ne_id, alarm_code, event_time, 
-	alarm_type, orig_severity, perceived_severity, pv_flag, ne_name, object_uid, object_name,
-	object_type, location_info, province, alarm_status, specific_problem, specific_problem_id,
-	add_info, counter, latest_event_time, ack_state, ack_time, ack_user, clear_type,
-	clear_time, clear_user, timestamp
-	from alarm`,
-
-	resultMap: map[string]string{
-		"id":                  "ID",
-		"alarm_seq":           "AlarmSeq",
-		"alarm_id":            "AlarmId",
-		"alarm_title":         "AlarmTitle",
-		"ne_type":             "NeType",
-		"ne_id":               "NeId",
-		"alarm_code":          "AlarmCode",
-		"event_time":          "EventTime",
-		"alarm_type":          "AlarmType",
-		"orig_severity":       "OrigSeverity",
-		"perceived_severity":  "PerceivedSeverity",
-		"pv_flag":             "PvFlag",
-		"ne_name":             "NeName",
-		"object_uid":          "ObjectUid",
-		"object_name":         "ObjectName",
-		"object_type":         "ObjectType",
-		"location_info":       "LocationInfo",
-		"province":            "Province",
-		"alarm_status":        "AlarmStatus",
-		"specific_problem":    "SpecificProblem",
-		"specific_problem_id": "SpecificProblemId",
-		"add_info":            "AddInfo",
-		"counter":             "Counter",
-		"latest_event_time":   "LatestEventTime",
-		"ack_state":           "AckState",
-		"ack_time":            "AckTime",
-		"ack_user":            "AckUser",
-		"clear_type":          "ClearType",
-		"clear_time":          "ClearTime",
-		"clear_user":          "ClearUser",
-		"timestamp":           "Timestamp",
-	},
-}
-
-// AlarmImpl 告警 数据层处理
-type AlarmImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *AlarmImpl) convertResultRows(rows []map[string]any) []model.Alarm {
-	arr := make([]model.Alarm, 0)
-	for _, row := range rows {
-		item := model.Alarm{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *AlarmImpl) SelectPage(querys model.AlarmQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "object_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		params = append(params, querys.StartTime)
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		params = append(params, querys.EndTime)
-	}
-	if querys.OrigSeverity != "" {
-		eventTypes := strings.Split(querys.OrigSeverity, ",")
-		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
-		conditions = append(conditions, fmt.Sprintf("orig_severity in (%s)", placeholder))
-		for _, eventType := range eventTypes {
-			params = append(params, eventType)
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.Alarm{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from alarm"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *AlarmImpl) SelectByIds(ids []string) []model.Alarm {
-	placeholder := repo.KeyPlaceholderByQuery(len(ids))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ids)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.Alarm{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *AlarmImpl) DeleteByIds(ids []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(ids))
-	sql := "delete from alarm where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ids)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}

src/modules/network_data/repository/cdr_event_ims.go

@@ -1,15 +1,222 @@
 package repository
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
+	"strings"
 
-// CDR会话事件IMS 数据层接口
-type ICDREventIMS interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.CDREventIMSQuery) map[string]any
+	dborm "be.ems/lib/core/datasource"
+	"be.ems/lib/log"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
 
-	// SelectByIds 通过ID查询
-	SelectByIds(cdrIds []string) []model.CDREventIMS
+// 实例化数据层 CDREvent 结构体
+var NewCDREventIMS = &CDREventIMS{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
+		t.tenant_id, t.tenant_name	
+		from cdr_event_ims c
+		left join sys_tenant t on t.tenant_id = c.tenant_id and t.status = 1`,
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) int64
+	resultMap: map[string]string{
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"cdr_json":    "CDRJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
+	},
+}
+
+// CDREventIMS CDR会话事件IMS 数据层处理
+type CDREventIMS struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *CDREventIMS) convertResultRows(rows []map[string]any) []model.CDREventIMS {
+	arr := make([]model.CDREventIMS, 0)
+	for _, row := range rows {
+		item := model.CDREventIMS{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventIMS) SelectPage(querys model.CDREventIMSQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.CallerParty != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
+		params = append(params, querys.CallerParty)
+	}
+	if querys.CalledParty != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?")
+		params = append(params, querys.CalledParty)
+	}
+	// MySQL8支持的
+	// if querys.RecordType != "" {
+	// 	recordTypes := strings.Split(querys.RecordType, ",")
+	// 	placeholder := repo.KeyPlaceholderByQuery(len(recordTypes))
+	// 	conditions = append(conditions, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') in (%s)", placeholder))
+	// 	for _, recordType := range recordTypes {
+	// 		params = append(params, recordType)
+	// 	}
+	// }
+	// Mariadb不支持json in查询改or
+	if querys.RecordType != "" {
+		recordTypes := strings.Split(querys.RecordType, ",")
+		var querys []string
+		for _, recordType := range recordTypes {
+			querys = append(querys, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
+		}
+		conditions = append(conditions, "("+strings.Join(querys, " OR ")+")")
+	}
+
+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.CDREventIMS{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from cdr_event_ims c"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventIMS) SelectByIds(cdrIds []string) []model.CDREventIMS {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.CDREventIMS{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventIMS) DeleteByIds(cdrIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	sql := "delete from cdr_event_ims where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
 }

src/modules/network_data/repository/cdr_event_ims.impl.go

@@ -1,222 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	dborm "be.ems/lib/core/datasource"
-	"be.ems/lib/log"
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 CDREventImpl 结构体
-var NewCDREventIMSImpl = &CDREventIMSImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
-		t.tenant_id, t.tenant_name	
-		from cdr_event_ims c
-		left join sys_tenant t on t.tenant_id = c.tenant_id and t.status = 1`,
-
-	resultMap: map[string]string{
-		"id":          "ID",
-		"ne_type":     "NeType",
-		"ne_name":     "NeName",
-		"rm_uid":      "RmUID",
-		"timestamp":   "Timestamp",
-		"cdr_json":    "CDRJSONStr",
-		"created_at":  "CreatedAt",
-		"tenant_id":   "TenantID",
-		"tenant_name": "TenantName",
-	},
-}
-
-// CDREventIMSImpl CDR会话事件IMS 数据层处理
-type CDREventIMSImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *CDREventIMSImpl) convertResultRows(rows []map[string]any) []model.CDREventIMS {
-	arr := make([]model.CDREventIMS, 0)
-	for _, row := range rows {
-		item := model.CDREventIMS{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *CDREventIMSImpl) SelectPage(querys model.CDREventIMSQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "rm_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		if len(querys.StartTime) == 13 {
-			querys.StartTime = querys.StartTime[:10]
-		}
-		params = append(params, querys.StartTime)
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		if len(querys.EndTime) == 13 {
-			querys.EndTime = querys.EndTime[:10]
-		}
-		params = append(params, querys.EndTime)
-	}
-	if querys.CallerParty != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
-		params = append(params, querys.CallerParty)
-	}
-	if querys.CalledParty != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?")
-		params = append(params, querys.CalledParty)
-	}
-	// MySQL8支持的
-	// if querys.RecordType != "" {
-	// 	recordTypes := strings.Split(querys.RecordType, ",")
-	// 	placeholder := repo.KeyPlaceholderByQuery(len(recordTypes))
-	// 	conditions = append(conditions, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') in (%s)", placeholder))
-	// 	for _, recordType := range recordTypes {
-	// 		params = append(params, recordType)
-	// 	}
-	// }
-	// Mariadb不支持json in查询改or
-	if querys.RecordType != "" {
-		recordTypes := strings.Split(querys.RecordType, ",")
-		var querys []string
-		for _, recordType := range recordTypes {
-			querys = append(querys, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
-		}
-		conditions = append(conditions, "("+strings.Join(querys, " OR ")+")")
-	}
-
-	// for multi-tenancy solution
-	if querys.TenantName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_tenant").
-			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "c.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	} else if querys.UserName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_user").
-			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "c.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.CDREventIMS{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from cdr_event_ims c"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *CDREventIMSImpl) SelectByIds(cdrIds []string) []model.CDREventIMS {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.CDREventIMS{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *CDREventIMSImpl) DeleteByIds(cdrIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	sql := "delete from cdr_event_ims where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}

src/modules/network_data/repository/cdr_event_smf.go

@@ -1,15 +1,204 @@
 package repository
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
+	"strings"
 
-// CDR会话事件SMF 数据层接口
-type ICDREventSMF interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.CDREventSMFQuery) map[string]any
+	dborm "be.ems/lib/core/datasource"
+	"be.ems/lib/log"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
 
-	// SelectByIds 通过ID查询
-	SelectByIds(cdrIds []string) []model.CDREventSMF
+// 实例化数据层 CDREventSMF 结构体
+var NewCDREventSMF = &CDREventSMF{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
+		t.tenant_id, t.tenant_name	
+		from cdr_event_smf c
+		left join sys_tenant t on t.tenant_id = c.tenant_id and t.status = 1`,
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) int64
+	resultMap: map[string]string{
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"cdr_json":    "CDRJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
+	},
+}
+
+// CDREventSMF CDR会话事件 数据层处理
+type CDREventSMF struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *CDREventSMF) convertResultRows(rows []map[string]any) []model.CDREventSMF {
+	arr := make([]model.CDREventSMF, 0)
+	for _, row := range rows {
+		item := model.CDREventSMF{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventSMF) SelectPage(querys model.CDREventSMFQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.RecordType != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
+		params = append(params, querys.RecordType)
+	}
+	if querys.SubscriberID != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?")
+		params = append(params, querys.SubscriberID)
+	}
+
+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.CDREventSMF{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from cdr_event_smf c"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventSMF) SelectByIds(cdrIds []string) []model.CDREventSMF {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.CDREventSMF{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventSMF) DeleteByIds(cdrIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	sql := "delete from cdr_event_smf where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
 }

src/modules/network_data/repository/cdr_event_smf.impl.go

@@ -1,204 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	dborm "be.ems/lib/core/datasource"
-	"be.ems/lib/log"
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 CDREventSMFImpl 结构体
-var NewCDREventSMFImpl = &CDREventSMFImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
-		t.tenant_id, t.tenant_name	
-		from cdr_event_smf c
-		left join sys_tenant t on t.tenant_id = c.tenant_id and t.status = 1`,
-
-	resultMap: map[string]string{
-		"id":          "ID",
-		"ne_type":     "NeType",
-		"ne_name":     "NeName",
-		"rm_uid":      "RmUID",
-		"timestamp":   "Timestamp",
-		"cdr_json":    "CDRJSONStr",
-		"created_at":  "CreatedAt",
-		"tenant_id":   "TenantID",
-		"tenant_name": "TenantName",
-	},
-}
-
-// CDREventSMFImpl CDR会话事件 数据层处理
-type CDREventSMFImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *CDREventSMFImpl) convertResultRows(rows []map[string]any) []model.CDREventSMF {
-	arr := make([]model.CDREventSMF, 0)
-	for _, row := range rows {
-		item := model.CDREventSMF{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *CDREventSMFImpl) SelectPage(querys model.CDREventSMFQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "rm_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		if len(querys.StartTime) == 13 {
-			querys.StartTime = querys.StartTime[:10]
-		}
-		params = append(params, querys.StartTime)
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		if len(querys.EndTime) == 13 {
-			querys.EndTime = querys.EndTime[:10]
-		}
-		params = append(params, querys.EndTime)
-	}
-	if querys.RecordType != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
-		params = append(params, querys.RecordType)
-	}
-	if querys.SubscriberID != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?")
-		params = append(params, querys.SubscriberID)
-	}
-
-	// for multi-tenancy solution
-	if querys.TenantName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_tenant").
-			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "c.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	} else if querys.UserName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_user").
-			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "c.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.CDREventSMF{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from cdr_event_smf c"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *CDREventSMFImpl) SelectByIds(cdrIds []string) []model.CDREventSMF {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.CDREventSMF{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *CDREventSMFImpl) DeleteByIds(cdrIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	sql := "delete from cdr_event_smf where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}

src/modules/network_data/repository/cdr_event_smsc.go

@@ -1,15 +1,223 @@
 package repository
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
+	"strings"
 
-// CDR会话事件SMSC 数据层接口
-type ICDREventSMSC interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.CDREventSMSCQuery) map[string]any
+	dborm "be.ems/lib/core/datasource"
+	"be.ems/lib/log"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
 
-	// SelectByIds 通过ID查询
-	SelectByIds(cdrIds []string) []model.CDREventSMSC
+// 实例化数据层 CDREventSMSC 结构体
+var NewCDREventSMSC = &CDREventSMSC{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
+		t.tenant_id, t.tenant_name 
+		from cdr_event_smsc c
+		left join sys_tenant t on t.tenant_id = c.tenant_id and t.status = 1`,
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) int64
+	resultMap: map[string]string{
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"cdr_json":    "CDRJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
+	},
+}
+
+// CDREventSMSC CDR会话事件 数据层处理
+type CDREventSMSC struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *CDREventSMSC) convertResultRows(rows []map[string]any) []model.CDREventSMSC {
+	arr := make([]model.CDREventSMSC, 0)
+	for _, row := range rows {
+		item := model.CDREventSMSC{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventSMSC) SelectPage(querys model.CDREventSMSCQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.CallerParty != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
+		params = append(params, querys.CallerParty)
+	}
+	if querys.CalledParty != "" {
+		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?")
+		params = append(params, querys.CalledParty)
+	}
+	// MySQL8支持的
+	// if querys.RecordType != "" {
+	// 	recordTypes := strings.Split(querys.RecordType, ",")
+	// 	placeholder := repo.KeyPlaceholderByQuery(len(recordTypes))
+	// 	conditions = append(conditions, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') in (%s)", placeholder))
+	// 	for _, recordType := range recordTypes {
+	// 		params = append(params, recordType)
+	// 	}
+	// }
+	// Mariadb不支持json in查询改or
+	if querys.RecordType != "" {
+		recordTypes := strings.Split(querys.RecordType, ",")
+		var queryStrArr []string
+		for _, recordType := range recordTypes {
+			queryStrArr = append(queryStrArr, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
+			params = append(params, recordType)
+		}
+		conditions = append(conditions, fmt.Sprintf("( %s )", strings.Join(queryStrArr, " OR ")))
+	}
+
+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "c.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.CDREventSMSC{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from cdr_event_smsc c"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *CDREventSMSC) SelectByIds(cdrIds []string) []model.CDREventSMSC {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.CDREventSMSC{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventSMSC) DeleteByIds(cdrIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
+	sql := "delete from cdr_event_smsc where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(cdrIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
 }

src/modules/network_data/repository/cdr_event_smsc.impl.go

@@ -1,223 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	dborm "be.ems/lib/core/datasource"
-	"be.ems/lib/log"
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 CDREventSMSCImpl 结构体
-var NewCDREventSMSCImpl = &CDREventSMSCImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, cdr_json, created_at,
-		t.tenant_id, t.tenant_name 
-		from cdr_event_smsc c
-		left join sys_tenant t on t.tenant_id = c.tenant_id and t.status = 1`,
-
-	resultMap: map[string]string{
-		"id":          "ID",
-		"ne_type":     "NeType",
-		"ne_name":     "NeName",
-		"rm_uid":      "RmUID",
-		"timestamp":   "Timestamp",
-		"cdr_json":    "CDRJSONStr",
-		"created_at":  "CreatedAt",
-		"tenant_id":   "TenantID",
-		"tenant_name": "TenantName",
-	},
-}
-
-// CDREventSMSCImpl CDR会话事件 数据层处理
-type CDREventSMSCImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *CDREventSMSCImpl) convertResultRows(rows []map[string]any) []model.CDREventSMSC {
-	arr := make([]model.CDREventSMSC, 0)
-	for _, row := range rows {
-		item := model.CDREventSMSC{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *CDREventSMSCImpl) SelectPage(querys model.CDREventSMSCQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "rm_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		if len(querys.StartTime) == 13 {
-			querys.StartTime = querys.StartTime[:10]
-		}
-		params = append(params, querys.StartTime)
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		if len(querys.EndTime) == 13 {
-			querys.EndTime = querys.EndTime[:10]
-		}
-		params = append(params, querys.EndTime)
-	}
-	if querys.CallerParty != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?")
-		params = append(params, querys.CallerParty)
-	}
-	if querys.CalledParty != "" {
-		conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?")
-		params = append(params, querys.CalledParty)
-	}
-	// MySQL8支持的
-	// if querys.RecordType != "" {
-	// 	recordTypes := strings.Split(querys.RecordType, ",")
-	// 	placeholder := repo.KeyPlaceholderByQuery(len(recordTypes))
-	// 	conditions = append(conditions, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') in (%s)", placeholder))
-	// 	for _, recordType := range recordTypes {
-	// 		params = append(params, recordType)
-	// 	}
-	// }
-	// Mariadb不支持json in查询改or
-	if querys.RecordType != "" {
-		recordTypes := strings.Split(querys.RecordType, ",")
-		var queryStrArr []string
-		for _, recordType := range recordTypes {
-			queryStrArr = append(queryStrArr, "JSON_EXTRACT(cdr_json, '$.recordType') = ?")
-			params = append(params, recordType)
-		}
-		conditions = append(conditions, fmt.Sprintf("( %s )", strings.Join(queryStrArr, " OR ")))
-	}
-
-	// for multi-tenancy solution
-	if querys.TenantName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_tenant").
-			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("tenantName=%v, tenantID=%v", querys.TenantName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "c.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	} else if querys.UserName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_user").
-			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "c.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.CDREventSMSC{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from cdr_event_smsc c"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *CDREventSMSCImpl) SelectByIds(cdrIds []string) []model.CDREventSMSC {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.CDREventSMSC{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *CDREventSMSCImpl) DeleteByIds(cdrIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(cdrIds))
-	sql := "delete from cdr_event_smsc where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(cdrIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}

src/modules/network_data/repository/perf_kpi.go

@@ -1,15 +1,141 @@
 package repository
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
+	"strings"
 
-// 性能统计 数据层接口
-type IPerfKPI interface {
-	// SelectGoldKPI 通过网元指标数据信息
-	SelectGoldKPI(query model.GoldKPIQuery, kpiIds []string) []map[string]any
+	"be.ems/lib/log"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
 
-	// SelectGoldKPITitle 网元对应的指标名称
-	SelectGoldKPITitle(neType string) []model.GoldKPITitle
+// 实例化数据层 PerfKPI 结构体
+var NewPerfKPI = &PerfKPI{}
 
-	// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
-	SelectUPFTotalFlow(neType, rmUID, startDate, endDate string) map[string]any
+// PerfKPI 性能统计 数据层处理
+type PerfKPI struct{}
+
+// SelectGoldKPI 通过网元指标数据信息
+func (r *PerfKPI) SelectGoldKPI(query model.GoldKPIQuery, kpiIds []string) []map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	var tableName string = "kpi_report_"
+	if query.RmUID != "" {
+		rmUIDs := strings.Split(query.RmUID, ",")
+		var rmUIDconditions []string
+		for _, rmUID := range rmUIDs {
+			rmUIDconditions = append(rmUIDconditions, "gk.rm_uid = ?")
+			params = append(params, rmUID)
+		}
+		conditions = append(conditions, "("+strings.Join(rmUIDconditions, " or ")+")")
+		log.Debugf("conditions: %s params: %v", conditions, params)
+	}
+	if query.NeType != "" {
+		//conditions = append(conditions, "gk.ne_type = ?")
+		// params = append(params, query.NeType)
+		tableName += strings.ToLower(query.NeType)
+	}
+	if query.StartTime != "" {
+		conditions = append(conditions, "gk.created_at >= ?")
+		params = append(params, query.StartTime)
+	}
+	if query.EndTime != "" {
+		conditions = append(conditions, "gk.created_at <= ?")
+		params = append(params, query.EndTime)
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	// 查询字段列
+	var fields = []string{
+		// fmt.Sprintf("FROM_UNIXTIME(FLOOR(gk.created_at / (%d * 1000)) * %d) AS timeGroup", query.Interval, query.Interval),
+		fmt.Sprintf("CONCAT(FLOOR(gk.created_at / (%d * 1000)) * (%d * 1000)) AS timeGroup", query.Interval, query.Interval), // 时间戳毫秒
+		"min(CASE WHEN gk.index != '' THEN gk.index ELSE 0 END) AS startIndex",
+		"min(CASE WHEN gk.ne_type != '' THEN gk.ne_type ELSE 0 END) AS neType",
+		"min(CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END) AS neName",
+		"min(CASE WHEN gk.rm_uid != '' THEN gk.rm_uid ELSE 0 END) AS rmUID",
+	}
+	for i, kid := range kpiIds {
+		// 特殊字段，只取最后一次收到的非0值
+		if kid == "AMF.01" || kid == "UDM.01" || kid == "UDM.02" || kid == "UDM.03" || kid == "SMF.01" {
+			str := fmt.Sprintf("IFNULL(SUBSTRING_INDEX(GROUP_CONCAT( CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') END  ), ',', 1), 0) AS '%s'", i, kid, i, kid)
+			fields = append(fields, str)
+		} else {
+			str := fmt.Sprintf("sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') ELSE 0 END) AS '%s'", i, kid, i, kid)
+			fields = append(fields, str)
+		}
+	}
+	fieldsSql := strings.Join(fields, ",")
+
+	// 查询数据
+	if query.SortField == "" {
+		query.SortField = "timeGroup"
+	}
+	if query.SortOrder == "" {
+		query.SortOrder = "desc"
+	}
+	orderSql := fmt.Sprintf(" order by %s %s", query.SortField, query.SortOrder)
+	// for multi-tenancy group by timeGroup, rm_uid support multiple upf
+	querySql := fmt.Sprintf("SELECT %s FROM %s gk %s GROUP BY timeGroup, gk.rm_uid %s", fieldsSql, tableName, whereSql, orderSql)
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+	log.Debugf("querySql: %s params: %v results: %v", querySql, params, results)
+	return results
+}
+
+// SelectGoldKPITitle 网元对应的指标名称
+func (r *PerfKPI) SelectGoldKPITitle(neType string) []model.GoldKPITitle {
+	result := []model.GoldKPITitle{}
+	tx := datasource.DefaultDB().Table("kpi_title").Where("ne_type = ?", neType).Find(&result)
+	if err := tx.Error; err != nil {
+		logger.Errorf("Find err => %v", err)
+	}
+	return result
+}
+
+// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
+func (r *PerfKPI) SelectUPFTotalFlow(neType, rmUID, startDate, endDate string) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if neType != "" {
+		conditions = append(conditions, "kupf.ne_type = ?")
+		params = append(params, neType)
+	}
+	if rmUID != "" {
+		conditions = append(conditions, "kupf.rm_uid = ?")
+		params = append(params, rmUID)
+	}
+	if startDate != "" {
+		conditions = append(conditions, "kupf.created_at >= ?")
+		params = append(params, startDate)
+	}
+	if endDate != "" {
+		conditions = append(conditions, "kupf.created_at <= ?")
+		params = append(params, endDate)
+	}
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	// 查询数据
+	querySql := `SELECT 
+	sum( CASE WHEN  JSON_EXTRACT(kupf.kpi_values, '$[2].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(kupf.kpi_values, '$[2].value') ELSE 0 END ) AS 'up', 
+	sum( CASE WHEN  JSON_EXTRACT(kupf.kpi_values, '$[5].kpi_id') = 'UPF.06' THEN JSON_EXTRACT(kupf.kpi_values, '$[5].value') ELSE 0 END ) AS 'down' 
+	FROM kpi_report_upf kupf`
+	results, err := datasource.RawDB("", querySql+whereSql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+	return results[0]
 }

src/modules/network_data/repository/perf_kpi.impl.go

@@ -1,141 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	"be.ems/lib/log"
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 PerfKPIImpl 结构体
-var NewPerfKPIImpl = &PerfKPIImpl{}
-
-// PerfKPIImpl 性能统计 数据层处理
-type PerfKPIImpl struct{}
-
-// SelectGoldKPI 通过网元指标数据信息
-func (r *PerfKPIImpl) SelectGoldKPI(query model.GoldKPIQuery, kpiIds []string) []map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	var tableName string = "kpi_report_"
-	if query.RmUID != "" {
-		rmUIDs := strings.Split(query.RmUID, ",")
-		var rmUIDconditions []string
-		for _, rmUID := range rmUIDs {
-			rmUIDconditions = append(rmUIDconditions, "gk.rm_uid = ?")
-			params = append(params, rmUID)
-		}
-		conditions = append(conditions, "("+strings.Join(rmUIDconditions, " or ")+")")
-		log.Debugf("conditions: %s params: %v", conditions, params)
-	}
-	if query.NeType != "" {
-		//conditions = append(conditions, "gk.ne_type = ?")
-		// params = append(params, query.NeType)
-		tableName += strings.ToLower(query.NeType)
-	}
-	if query.StartTime != "" {
-		conditions = append(conditions, "gk.created_at >= ?")
-		params = append(params, query.StartTime)
-	}
-	if query.EndTime != "" {
-		conditions = append(conditions, "gk.created_at <= ?")
-		params = append(params, query.EndTime)
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	// 查询字段列
-	var fields = []string{
-		// fmt.Sprintf("FROM_UNIXTIME(FLOOR(gk.created_at / (%d * 1000)) * %d) AS timeGroup", query.Interval, query.Interval),
-		fmt.Sprintf("CONCAT(FLOOR(gk.created_at / (%d * 1000)) * (%d * 1000)) AS timeGroup", query.Interval, query.Interval), // 时间戳毫秒
-		"min(CASE WHEN gk.index != '' THEN gk.index ELSE 0 END) AS startIndex",
-		"min(CASE WHEN gk.ne_type != '' THEN gk.ne_type ELSE 0 END) AS neType",
-		"min(CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END) AS neName",
-		"min(CASE WHEN gk.rm_uid != '' THEN gk.rm_uid ELSE 0 END) AS rmUID",
-	}
-	for i, kid := range kpiIds {
-		// 特殊字段，只取最后一次收到的非0值
-		if kid == "AMF.01" || kid == "UDM.01" || kid == "UDM.02" || kid == "UDM.03" || kid == "SMF.01" {
-			str := fmt.Sprintf("IFNULL(SUBSTRING_INDEX(GROUP_CONCAT( CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') END  ), ',', 1), 0) AS '%s'", i, kid, i, kid)
-			fields = append(fields, str)
-		} else {
-			str := fmt.Sprintf("sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') ELSE 0 END) AS '%s'", i, kid, i, kid)
-			fields = append(fields, str)
-		}
-	}
-	fieldsSql := strings.Join(fields, ",")
-
-	// 查询数据
-	if query.SortField == "" {
-		query.SortField = "timeGroup"
-	}
-	if query.SortOrder == "" {
-		query.SortOrder = "desc"
-	}
-	orderSql := fmt.Sprintf(" order by %s %s", query.SortField, query.SortOrder)
-	// for multi-tenancy group by timeGroup, rm_uid support multiple upf
-	querySql := fmt.Sprintf("SELECT %s FROM %s gk %s GROUP BY timeGroup, gk.rm_uid %s", fieldsSql, tableName, whereSql, orderSql)
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-	log.Debugf("querySql: %s params: %v results: %v", querySql, params, results)
-	return results
-}
-
-// SelectGoldKPITitle 网元对应的指标名称
-func (r *PerfKPIImpl) SelectGoldKPITitle(neType string) []model.GoldKPITitle {
-	result := []model.GoldKPITitle{}
-	tx := datasource.DefaultDB().Table("kpi_title").Where("ne_type = ?", neType).Find(&result)
-	if err := tx.Error; err != nil {
-		logger.Errorf("Find err => %v", err)
-	}
-	return result
-}
-
-// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
-func (r *PerfKPIImpl) SelectUPFTotalFlow(neType, rmUID, startDate, endDate string) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if neType != "" {
-		conditions = append(conditions, "kupf.ne_type = ?")
-		params = append(params, neType)
-	}
-	if rmUID != "" {
-		conditions = append(conditions, "kupf.rm_uid = ?")
-		params = append(params, rmUID)
-	}
-	if startDate != "" {
-		conditions = append(conditions, "kupf.created_at >= ?")
-		params = append(params, startDate)
-	}
-	if endDate != "" {
-		conditions = append(conditions, "kupf.created_at <= ?")
-		params = append(params, endDate)
-	}
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	// 查询数据
-	querySql := `SELECT 
-	sum( CASE WHEN  JSON_EXTRACT(kupf.kpi_values, '$[2].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(kupf.kpi_values, '$[2].value') ELSE 0 END ) AS 'up', 
-	sum( CASE WHEN  JSON_EXTRACT(kupf.kpi_values, '$[5].kpi_id') = 'UPF.06' THEN JSON_EXTRACT(kupf.kpi_values, '$[5].value') ELSE 0 END ) AS 'down' 
-	FROM kpi_report_upf kupf`
-	results, err := datasource.RawDB("", querySql+whereSql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-	return results[0]
-}

src/modules/network_data/repository/udm_auth.go

@@ -53,7 +53,8 @@ func (r *UDMAuthUser) convertResultRows(rows []map[string]any) []model.UDMAuthUs
 // ClearAndInsert 清空ne_id后新增实体
 func (r *UDMAuthUser) ClearAndInsert(neId string, uArr []model.UDMAuthUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
-	_, err := datasource.ExecDB("", "TRUNCATE TABLE u_auth_user", nil)
+	// _, err := datasource.ExecDB("", "TRUNCATE TABLE u_auth_user", nil)
+	_, err := datasource.ExecDB("", "DELETE FROM u_auth_user WHERE ne_id = ?", []any{neId})
 	if err != nil {
 		logger.Errorf("TRUNCATE err => %v", err)
 	}

src/modules/network_data/repository/udm_sub.go

@@ -16,26 +16,35 @@ import (
 // 实例化数据层 UDMSubUser 结构体
 var NewUDMSub = &UDMSubUser{
 	selectSql: `select 
-	s.id, s.msisdn, s.imsi, s.ambr, s.nssai, s.rat, s.arfb, s.sar, s.cn, s.sm_data, s.smf_sel, s.eps_dat, 
-	s.ne_id, s.eps_flag, s.eps_odb, s.hplmn_odb, s.ard, s.epstpl, s.context_id, s.apn_context, s.static_ip, 
-	s.cag, 
+	s.id, s.imsi, s.msisdn, s.ne_id, 
+	s.am_dat, s.ambr, s.nssai, s.rat, s.arfb, s.sar, s.cn_type, s.rfsp_index, s.reg_timer, s.ue_usage_type, s.active_time, s.mico, s.odb_ps, s.group_id, 
+	s.eps_dat, s.eps_flag, s.eps_odb, s.hplmn_odb, s.ard, s.epstpl, s.context_id, s.apn_mum, s.apn_context, s.static_ip, 
+	s.sm_data, s.smf_sel, s.cag,
 	t.tenant_id, t.tenant_name
-	from u_sub_user s 
+	from u_sub_user s
 	left join sys_tenant t on t.tenant_id = s.tenant_id and t.status = 1`,
 
 	resultMap: map[string]string{
-		"id":          "ID",
-		"imsi":        "IMSI",
-		"msisdn":      "MSISDN",
-		"ne_id":       "NeId",
-		"ambr":        "Ambr",
-		"nssai":       "Nssai",
-		"rat":         "Rat",
-		"arfb":        "Arfb",
-		"sar":         "Sar",
-		"cn":          "Cn",
-		"sm_data":     "SmData",
-		"smf_sel":     "SmfSel",
+		"id":     "ID",
+		"imsi":   "IMSI",
+		"msisdn": "MSISDN",
+		"ne_id":  "NeId",
+
+		"am_dat":        "AmDat",
+		"ambr":          "UeAmbrTpl",
+		"nssai":         "NssaiTpl",
+		"rat":           "RatRestrictions",
+		"arfb":          "AreaForbiddenTpl",
+		"sar":           "ServiceAreaRestrictionTpl",
+		"cn_type":       "CnTypeRestrictions",
+		"rfsp_index":    "RfspIndex",
+		"reg_timer":     "SubsRegTime",
+		"ue_usage_type": "UeUsageType",
+		"active_time":   "ActiveTime",
+		"mico":          "MicoAllowed",
+		"odb_ps":        "OdbPs",
+		"group_id":      "GroupId",
+
 		"eps_dat":     "EpsDat",
 		"eps_flag":    "EpsFlag",
 		"eps_odb":     "EpsOdb",
@@ -43,9 +52,13 @@ var NewUDMSub = &UDMSubUser{
 		"ard":         "Ard",
 		"epstpl":      "Epstpl",
 		"context_id":  "ContextId",
+		"apn_mum":     "ApnNum",
 		"apn_context": "ApnContext",
 		"static_ip":   "StaticIp",
-		"cag":         "Cag",
+
+		"sm_data": "SmData",
+		"smf_sel": "SmfSel",
+		"cag":     "Cag",
 
 		"tenant_id":   "TenantID",
 		"tenant_name": "TenantName", // Tenant name for multi-tenancy
@@ -76,9 +89,10 @@ func (r *UDMSubUser) convertResultRows(rows []map[string]any) []model.UDMSubUser
 }
 
 // ClearAndInsert 清空ne_id后新增实体
-func (r *UDMSubUser) ClearAndInsert(neID string, u []model.UDMSubUser) int64 {
+func (r *UDMSubUser) ClearAndInsert(neId string, u []model.UDMSubUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
-	_, err := datasource.ExecDB("", "TRUNCATE TABLE u_sub_user", nil)
+	// _, err := datasource.ExecDB("", "TRUNCATE TABLE u_sub_user", nil)
+	_, err := datasource.ExecDB("", "DELETE FROM u_sub_user WHERE ne_id = ?", []any{neId})
 	if err != nil {
 		logger.Errorf("TRUNCATE err => %v", err)
 	}
@@ -91,20 +105,15 @@ func (r *UDMSubUser) SelectPage(query map[string]any) map[string]any {
 	// 查询条件拼接
 	var conditions []string
 	var params []any
+	if v, ok := query["imsi"]; ok && v != "" {
+		conditions = append(conditions, "imsi like concat(concat('%', ?), '%')")
+		params = append(params, strings.Trim(v.(string), " "))
+	}
 	if v, ok := query["msisdn"]; ok && v != "" {
 		conditions = append(conditions, "msisdn like concat(concat('%', ?), '%')")
 		params = append(params, strings.Trim(v.(string), " "))
 	}
-	if v, ok := query["imsi"]; ok && v != "" {
-		//conditions = append(conditions, "imsi like concat(concat('%', ?), '%')")
-		//params = append(params, strings.Trim(v.(string), " "))
-		conditions = append(conditions, "imsi like ?")
-		params = append(params, v)
-	}
-	if v, ok := query["neId"]; ok && v != "" {
-		conditions = append(conditions, "ne_id = ?")
-		params = append(params, v)
-	}
+
 	// for multi-tenancy solution
 	if v, ok := query["tenantName"]; ok && v != "" {
 		var tenantID []string
@@ -129,13 +138,13 @@ func (r *UDMSubUser) SelectPage(query map[string]any) map[string]any {
 		if tenantID != "" {
 			conditions = append(conditions, "s.tenant_id = ?")
 			params = append(params, tenantID)
+			query["neId"] = ""
 		}
-		// if len(tenantID) > 0 {
-		// 	conditions = append(conditions, "s.tenant_id = ?")
-		// 	params = append(params, tenantID[0])
-		// }
 	}
-
+	if v, ok := query["neId"]; ok && v != "" {
+		conditions = append(conditions, "ne_id = ?")
+		params = append(params, v)
+	}
 	// 构建查询条件语句
 	whereSql := ""
 	if len(conditions) > 0 {

src/modules/network_data/repository/ue_event_amf.go

@@ -1,15 +1,209 @@
 package repository
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
+	"strings"
 
-// UE会话事件AMF 数据层接口
-type IUEEventAMF interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.UEEventAMFQuery) map[string]any
+	dborm "be.ems/lib/core/datasource"
+	"be.ems/lib/log"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
 
-	// SelectByIds 通过ID查询
-	SelectByIds(ueIds []string) []model.UEEventAMF
+// 实例化数据层 UEEventAMF 结构体
+var NewUEEventAMF = &UEEventAMF{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at,
+		t.tenant_id, t.tenant_name	
+		from ue_event_amf e
+		left join sys_tenant t on t.tenant_id = e.tenant_id and t.status = 1`,
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(ueIds []string) int64
+	resultMap: map[string]string{
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"event_type":  "EventType",
+		"event_json":  "EventJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
+	},
+}
+
+// UEEventAMF UE会话事件 数据层处理
+type UEEventAMF struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *UEEventAMF) convertResultRows(rows []map[string]any) []model.UEEventAMF {
+	arr := make([]model.UEEventAMF, 0)
+	for _, row := range rows {
+		item := model.UEEventAMF{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *UEEventAMF) SelectPage(querys model.UEEventAMFQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.EventType != "" {
+		eventTypes := strings.Split(querys.EventType, ",")
+		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
+		conditions = append(conditions, fmt.Sprintf("event_type in (%s)", placeholder))
+		for _, eventType := range eventTypes {
+			params = append(params, eventType)
+		}
+	}
+	if querys.IMSI != "" {
+		conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?")
+		params = append(params, querys.IMSI)
+	}
+
+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.UEEventAMF{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from ue_event_amf e"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *UEEventAMF) SelectByIds(ueIds []string) []model.UEEventAMF {
+	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ueIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.UEEventAMF{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *UEEventAMF) DeleteByIds(ueIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
+	sql := "delete from ue_event_amf where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ueIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
 }

src/modules/network_data/repository/ue_event_amf.impl.go

@@ -1,209 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	dborm "be.ems/lib/core/datasource"
-	"be.ems/lib/log"
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 UEEventAMFImpl 结构体
-var NewUEEventAMFImpl = &UEEventAMFImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at,
-		t.tenant_id, t.tenant_name	
-		from ue_event_amf e
-		left join sys_tenant t on t.tenant_id = e.tenant_id and t.status = 1`,
-
-	resultMap: map[string]string{
-		"id":          "ID",
-		"ne_type":     "NeType",
-		"ne_name":     "NeName",
-		"rm_uid":      "RmUID",
-		"timestamp":   "Timestamp",
-		"event_type":  "EventType",
-		"event_json":  "EventJSONStr",
-		"created_at":  "CreatedAt",
-		"tenant_id":   "TenantID",
-		"tenant_name": "TenantName",
-	},
-}
-
-// UEEventAMFImpl UE会话事件 数据层处理
-type UEEventAMFImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *UEEventAMFImpl) convertResultRows(rows []map[string]any) []model.UEEventAMF {
-	arr := make([]model.UEEventAMF, 0)
-	for _, row := range rows {
-		item := model.UEEventAMF{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *UEEventAMFImpl) SelectPage(querys model.UEEventAMFQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "rm_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		if len(querys.StartTime) == 13 {
-			querys.StartTime = querys.StartTime[:10]
-		}
-		params = append(params, querys.StartTime)
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		if len(querys.EndTime) == 13 {
-			querys.EndTime = querys.EndTime[:10]
-		}
-		params = append(params, querys.EndTime)
-	}
-	if querys.EventType != "" {
-		eventTypes := strings.Split(querys.EventType, ",")
-		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
-		conditions = append(conditions, fmt.Sprintf("event_type in (%s)", placeholder))
-		for _, eventType := range eventTypes {
-			params = append(params, eventType)
-		}
-	}
-	if querys.IMSI != "" {
-		conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?")
-		params = append(params, querys.IMSI)
-	}
-
-	// for multi-tenancy solution
-	if querys.TenantName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_tenant").
-			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "e.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	} else if querys.UserName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_user").
-			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "e.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.UEEventAMF{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from ue_event_amf e"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *UEEventAMFImpl) SelectByIds(ueIds []string) []model.UEEventAMF {
-	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ueIds)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.UEEventAMF{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *UEEventAMFImpl) DeleteByIds(ueIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
-	sql := "delete from ue_event_amf where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ueIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}

src/modules/network_data/repository/ue_event_mme.go

@@ -1,15 +1,209 @@
 package repository
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
+	"strings"
 
-// UE会话事件MME 数据层接口
-type IUEEventMME interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.UEEventMMEQuery) map[string]any
+	dborm "be.ems/lib/core/datasource"
+	"be.ems/lib/log"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/network_data/model"
+)
 
-	// SelectByIds 通过ID查询
-	SelectByIds(ueIds []string) []model.UEEventMME
+// 实例化数据层 UEEventMME 结构体
+var NewUEEventMME = &UEEventMME{
+	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at,
+		t.tenant_id, t.tenant_name
+		from ue_event_mme e
+		left join sys_tenant t on t.tenant_id = e.tenant_id and t.status = 1`,
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(ueIds []string) int64
+	resultMap: map[string]string{
+		"id":          "ID",
+		"ne_type":     "NeType",
+		"ne_name":     "NeName",
+		"rm_uid":      "RmUID",
+		"timestamp":   "Timestamp",
+		"event_type":  "EventType",
+		"event_json":  "EventJSONStr",
+		"created_at":  "CreatedAt",
+		"tenant_id":   "TenantID",
+		"tenant_name": "TenantName",
+	},
+}
+
+// UEEventMME UE会话事件 数据层处理
+type UEEventMME struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *UEEventMME) convertResultRows(rows []map[string]any) []model.UEEventMME {
+	arr := make([]model.UEEventMME, 0)
+	for _, row := range rows {
+		item := model.UEEventMME{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询
+func (r *UEEventMME) SelectPage(querys model.UEEventMMEQuery) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, querys.NeType)
+	}
+	if querys.RmUID != "" {
+		conditions = append(conditions, "rm_uid = ?")
+		params = append(params, querys.RmUID)
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "timestamp >= ?")
+		if len(querys.StartTime) == 13 {
+			querys.StartTime = querys.StartTime[:10]
+		}
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "timestamp <= ?")
+		if len(querys.EndTime) == 13 {
+			querys.EndTime = querys.EndTime[:10]
+		}
+		params = append(params, querys.EndTime)
+	}
+	if querys.EventType != "" {
+		eventTypes := strings.Split(querys.EventType, ",")
+		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
+		conditions = append(conditions, fmt.Sprintf("event_type in (%s)", placeholder))
+		for _, eventType := range eventTypes {
+			params = append(params, eventType)
+		}
+	}
+	if querys.IMSI != "" {
+		conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?")
+		params = append(params, querys.IMSI)
+	}
+
+	// for multi-tenancy solution
+	if querys.TenantName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_tenant").
+			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	} else if querys.UserName != "" {
+		var tenantID string
+		_, err := dborm.DefaultDB().Table("sys_user").
+			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
+		if err != nil {
+			log.Errorf("Get tenant_id from sys_user err => %v", err)
+		}
+		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
+		if tenantID != "" {
+			conditions = append(conditions, "e.tenant_id = ?")
+			params = append(params, tenantID)
+		}
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.UEEventMME{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from ue_event_mme e"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 排序
+	orderSql := ""
+	if querys.SortField != "" {
+		sortSql := querys.SortField
+		if querys.SortOrder != "" {
+			if querys.SortOrder == "desc" {
+				sortSql += " desc "
+			} else {
+				sortSql += " asc "
+			}
+		}
+		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + orderSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectByIds 通过ID查询
+func (r *UEEventMME) SelectByIds(ueIds []string) []model.UEEventMME {
+	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
+	querySql := r.selectSql + " where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ueIds)
+	results, err := datasource.RawDB("", querySql, parameters)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return []model.UEEventMME{}
+	}
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// DeleteByIds 批量删除信息
+func (r *UEEventMME) DeleteByIds(ueIds []string) int64 {
+	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
+	sql := "delete from ue_event_mme where id in (" + placeholder + ")"
+	parameters := repo.ConvertIdsSlice(ueIds)
+	results, err := datasource.ExecDB("", sql, parameters)
+	if err != nil {
+		logger.Errorf("delete err => %v", err)
+		return 0
+	}
+	return results
 }

src/modules/network_data/repository/ue_event_mme.impl.go

@@ -1,209 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	dborm "be.ems/lib/core/datasource"
-	"be.ems/lib/log"
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 UEEventMMEImpl 结构体
-var NewUEEventMMEImpl = &UEEventMMEImpl{
-	selectSql: `select id, ne_type, ne_name, rm_uid, timestamp, event_type, event_json, created_at,
-		t.tenant_id, t.tenant_name
-		from ue_event_mme e
-		left join sys_tenant t on t.tenant_id = e.tenant_id and t.status = 1`,
-
-	resultMap: map[string]string{
-		"id":          "ID",
-		"ne_type":     "NeType",
-		"ne_name":     "NeName",
-		"rm_uid":      "RmUID",
-		"timestamp":   "Timestamp",
-		"event_type":  "EventType",
-		"event_json":  "EventJSONStr",
-		"created_at":  "CreatedAt",
-		"tenant_id":   "TenantID",
-		"tenant_name": "TenantName",
-	},
-}
-
-// UEEventMMEImpl UE会话事件 数据层处理
-type UEEventMMEImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *UEEventMMEImpl) convertResultRows(rows []map[string]any) []model.UEEventMME {
-	arr := make([]model.UEEventMME, 0)
-	for _, row := range rows {
-		item := model.UEEventMME{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询
-func (r *UEEventMMEImpl) SelectPage(querys model.UEEventMMEQuery) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if querys.NeType != "" {
-		conditions = append(conditions, "ne_type = ?")
-		params = append(params, querys.NeType)
-	}
-	if querys.RmUID != "" {
-		conditions = append(conditions, "rm_uid = ?")
-		params = append(params, querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		conditions = append(conditions, "timestamp >= ?")
-		if len(querys.StartTime) == 13 {
-			querys.StartTime = querys.StartTime[:10]
-		}
-		params = append(params, querys.StartTime)
-	}
-	if querys.EndTime != "" {
-		conditions = append(conditions, "timestamp <= ?")
-		if len(querys.EndTime) == 13 {
-			querys.EndTime = querys.EndTime[:10]
-		}
-		params = append(params, querys.EndTime)
-	}
-	if querys.EventType != "" {
-		eventTypes := strings.Split(querys.EventType, ",")
-		placeholder := repo.KeyPlaceholderByQuery(len(eventTypes))
-		conditions = append(conditions, fmt.Sprintf("event_type in (%s)", placeholder))
-		for _, eventType := range eventTypes {
-			params = append(params, eventType)
-		}
-	}
-	if querys.IMSI != "" {
-		conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?")
-		params = append(params, querys.IMSI)
-	}
-
-	// for multi-tenancy solution
-	if querys.TenantName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_tenant").
-			Where("tenant_name=? and status=1", querys.TenantName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("userName=%v, tenantID=%v", querys.TenantName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "e.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	} else if querys.UserName != "" {
-		var tenantID string
-		_, err := dborm.DefaultDB().Table("sys_user").
-			Where("user_name=? and status=1", querys.UserName).Cols("tenant_id").Distinct().Get(&tenantID)
-		if err != nil {
-			log.Errorf("Get tenant_id from sys_user err => %v", err)
-		}
-		log.Tracef("userName=%v, tenantID=%v", querys.UserName, tenantID)
-		if tenantID != "" {
-			conditions = append(conditions, "e.tenant_id = ?")
-			params = append(params, tenantID)
-		}
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.UEEventMME{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from ue_event_mme e"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(querys.PageNum, querys.PageSize)
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 排序
-	orderSql := ""
-	if querys.SortField != "" {
-		sortSql := querys.SortField
-		if querys.SortOrder != "" {
-			if querys.SortOrder == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		orderSql = fmt.Sprintf(" order by id desc, %s ", sortSql)
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + orderSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectByIds 通过ID查询
-func (r *UEEventMMEImpl) SelectByIds(ueIds []string) []model.UEEventMME {
-	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
-	querySql := r.selectSql + " where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ueIds)
-	results, err := datasource.RawDB("", querySql, parameters)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return []model.UEEventMME{}
-	}
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// DeleteByIds 批量删除信息
-func (r *UEEventMMEImpl) DeleteByIds(ueIds []string) int64 {
-	placeholder := repo.KeyPlaceholderByQuery(len(ueIds))
-	sql := "delete from ue_event_mme where id in (" + placeholder + ")"
-	parameters := repo.ConvertIdsSlice(ueIds)
-	results, err := datasource.ExecDB("", sql, parameters)
-	if err != nil {
-		logger.Errorf("delete err => %v", err)
-		return 0
-	}
-	return results
-}

src/modules/network_data/service/alarm.go

@@ -1,12 +1,39 @@
 package service
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
 
-// 告警 服务层接口
-type IAlarm interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.AlarmQuery) map[string]any
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(ids []string) (int64, error)
+// 实例化数据层 Alarm 结构体
+var NewAlarm = &Alarm{
+	alarmRepository: repository.NewAlarm,
+}
+
+// Alarm 告警 服务层处理
+type Alarm struct {
+	alarmRepository *repository.Alarm // 告警数据信息
+}
+
+// SelectPage 根据条件分页查询
+func (r *Alarm) SelectPage(querys model.AlarmQuery) map[string]any {
+	return r.alarmRepository.SelectPage(querys)
+}
+
+// DeleteByIds 批量删除信息
+func (r *Alarm) DeleteByIds(ids []string) (int64, error) {
+	// 检查是否存在
+	data := r.alarmRepository.SelectByIds(ids)
+	if len(data) <= 0 {
+		return 0, fmt.Errorf("no data")
+	}
+
+	if len(data) == len(ids) {
+		rows := r.alarmRepository.DeleteByIds(ids)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
 }

src/modules/network_data/service/alarm.impl.go

@@ -1,40 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化数据层 AlarmImpl 结构体
-var NewAlarmImpl = &AlarmImpl{
-	alarmRepository: repository.NewAlarmImpl,
-}
-
-// AlarmImpl 告警 服务层处理
-type AlarmImpl struct {
-	// 告警数据信息
-	alarmRepository repository.IAlarm
-}
-
-// SelectPage 根据条件分页查询
-func (r *AlarmImpl) SelectPage(querys model.AlarmQuery) map[string]any {
-	return r.alarmRepository.SelectPage(querys)
-}
-
-// DeleteByIds 批量删除信息
-func (r *AlarmImpl) DeleteByIds(ids []string) (int64, error) {
-	// 检查是否存在
-	data := r.alarmRepository.SelectByIds(ids)
-	if len(data) <= 0 {
-		return 0, fmt.Errorf("no data")
-	}
-
-	if len(data) == len(ids) {
-		rows := r.alarmRepository.DeleteByIds(ids)
-		return rows, nil
-	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}

src/modules/network_data/service/cdr_event_ims.go

@@ -1,12 +1,39 @@
 package service
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
 
-// CDR会话事件IMS 服务层接口
-type ICDREventIMS interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.CDREventIMSQuery) map[string]any
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) (int64, error)
+// 实例化数据层 CDREventIMS 结构体
+var NewCDREventIMS = &CDREventIMS{
+	cdrEventIMSRepository: repository.NewCDREventIMS,
+}
+
+// CDREventImpl CDR会话事件IMS 服务层处理
+type CDREventIMS struct {
+	cdrEventIMSRepository *repository.CDREventIMS // CDR会话事件数据信息
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventIMS) SelectPage(querys model.CDREventIMSQuery) map[string]any {
+	return r.cdrEventIMSRepository.SelectPage(querys)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventIMS) DeleteByIds(cdrIds []string) (int64, error) {
+	// 检查是否存在
+	ids := r.cdrEventIMSRepository.SelectByIds(cdrIds)
+	if len(ids) <= 0 {
+		return 0, fmt.Errorf("not data")
+	}
+
+	if len(ids) == len(cdrIds) {
+		rows := r.cdrEventIMSRepository.DeleteByIds(cdrIds)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
 }

src/modules/network_data/service/cdr_event_ims.impl.go

@@ -1,40 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化数据层 NewCDREventIMSImpl 结构体
-var NewCDREventIMSImpl = &CDREventIMSImpl{
-	cdrEventIMSRepository: repository.NewCDREventIMSImpl,
-}
-
-// CDREventImpl CDR会话事件IMS 服务层处理
-type CDREventIMSImpl struct {
-	// CDR会话事件数据信息
-	cdrEventIMSRepository repository.ICDREventIMS
-}
-
-// SelectPage 根据条件分页查询
-func (r *CDREventIMSImpl) SelectPage(querys model.CDREventIMSQuery) map[string]any {
-	return r.cdrEventIMSRepository.SelectPage(querys)
-}
-
-// DeleteByIds 批量删除信息
-func (r *CDREventIMSImpl) DeleteByIds(cdrIds []string) (int64, error) {
-	// 检查是否存在
-	ids := r.cdrEventIMSRepository.SelectByIds(cdrIds)
-	if len(ids) <= 0 {
-		return 0, fmt.Errorf("not data")
-	}
-
-	if len(ids) == len(cdrIds) {
-		rows := r.cdrEventIMSRepository.DeleteByIds(cdrIds)
-		return rows, nil
-	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}

src/modules/network_data/service/cdr_event_smf.go

@@ -1,12 +1,39 @@
 package service
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
 
-// CDR会话事件SMF 服务层接口
-type ICDREventSMF interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.CDREventSMFQuery) map[string]any
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) (int64, error)
+// 实例化数据层 CDREventSMF 结构体
+var NewCDREventSMF = &CDREventSMF{
+	cdrEventRepository: repository.NewCDREventSMF,
+}
+
+// CDREventSMF CDR会话事件SMF 服务层处理
+type CDREventSMF struct {
+	cdrEventRepository *repository.CDREventSMF // CDR会话事件数据信息
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventSMF) SelectPage(querys model.CDREventSMFQuery) map[string]any {
+	return r.cdrEventRepository.SelectPage(querys)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventSMF) DeleteByIds(cdrIds []string) (int64, error) {
+	// 检查是否存在
+	ids := r.cdrEventRepository.SelectByIds(cdrIds)
+	if len(ids) <= 0 {
+		return 0, fmt.Errorf("not data")
+	}
+
+	if len(ids) == len(cdrIds) {
+		rows := r.cdrEventRepository.DeleteByIds(cdrIds)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
 }

src/modules/network_data/service/cdr_event_smf.impl.go

@@ -1,37 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-var NewCDREventSMFImpl = &CDREventSMFImpl{
-	cdrEventRepository: repository.NewCDREventSMFImpl,
-}
-
-type CDREventSMFImpl struct {
-	// CDR会话事件数据信息
-	cdrEventRepository repository.ICDREventSMF
-}
-
-func (r *CDREventSMFImpl) SelectPage(querys model.CDREventSMFQuery) map[string]any {
-	return r.cdrEventRepository.SelectPage(querys)
-}
-
-// DeleteByIds 批量删除信息
-func (r *CDREventSMFImpl) DeleteByIds(cdrIds []string) (int64, error) {
-	// 检查是否存在
-	ids := r.cdrEventRepository.SelectByIds(cdrIds)
-	if len(ids) <= 0 {
-		return 0, fmt.Errorf("not data")
-	}
-
-	if len(ids) == len(cdrIds) {
-		rows := r.cdrEventRepository.DeleteByIds(cdrIds)
-		return rows, nil
-	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}

src/modules/network_data/service/cdr_event_smsc.go

@@ -1,12 +1,39 @@
 package service
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
 
-// CDR会话事件SMSC 服务层接口
-type ICDREventSMSC interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.CDREventSMSCQuery) map[string]any
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(cdrIds []string) (int64, error)
+// 实例化数据层 CDREventSMSC 结构体
+var NewCDREventSMSC = &CDREventSMSC{
+	cdrEventRepository: repository.NewCDREventSMSC,
+}
+
+// CDREventSMSC CDR会话事件SMSC 服务层处理
+type CDREventSMSC struct {
+	cdrEventRepository *repository.CDREventSMSC // CDR会话事件数据信息
+}
+
+// SelectPage 根据条件分页查询
+func (r *CDREventSMSC) SelectPage(querys model.CDREventSMSCQuery) map[string]any {
+	return r.cdrEventRepository.SelectPage(querys)
+}
+
+// DeleteByIds 批量删除信息
+func (r *CDREventSMSC) DeleteByIds(cdrIds []string) (int64, error) {
+	// 检查是否存在
+	ids := r.cdrEventRepository.SelectByIds(cdrIds)
+	if len(ids) <= 0 {
+		return 0, fmt.Errorf("not data")
+	}
+
+	if len(ids) == len(cdrIds) {
+		rows := r.cdrEventRepository.DeleteByIds(cdrIds)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
 }

src/modules/network_data/service/cdr_event_smsc.impl.go

@@ -1,37 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-var NewCDREventSMSCImpl = &CDREventSMSCImpl{
-	cdrEventRepository: repository.NewCDREventSMSCImpl,
-}
-
-type CDREventSMSCImpl struct {
-	// CDR会话事件数据信息
-	cdrEventRepository repository.ICDREventSMSC
-}
-
-func (r *CDREventSMSCImpl) SelectPage(querys model.CDREventSMSCQuery) map[string]any {
-	return r.cdrEventRepository.SelectPage(querys)
-}
-
-// DeleteByIds 批量删除信息
-func (r *CDREventSMSCImpl) DeleteByIds(cdrIds []string) (int64, error) {
-	// 检查是否存在
-	ids := r.cdrEventRepository.SelectByIds(cdrIds)
-	if len(ids) <= 0 {
-		return 0, fmt.Errorf("not data")
-	}
-
-	if len(ids) == len(cdrIds) {
-		rows := r.cdrEventRepository.DeleteByIds(cdrIds)
-		return rows, nil
-	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}

src/modules/network_data/service/perf_kpi.go

@@ -1,15 +1,79 @@
 package service
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"encoding/json"
+	"fmt"
+	"time"
 
-// 性能统计 服务层接口
-type IPerfKPI interface {
-	// SelectGoldKPI 通过网元指标数据信息
-	SelectGoldKPI(query model.GoldKPIQuery) []map[string]any
+	"be.ems/src/framework/constants/cachekey"
+	"be.ems/src/framework/redis"
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
 
-	// SelectGoldKPITitle 网元对应的指标名称
-	SelectGoldKPITitle(neType string) []model.GoldKPITitle
-
-	// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
-	SelectUPFTotalFlow(neType, rmUID string, day int) map[string]any
+// 实例化数据层 PerfKPI 结构体
+var NewPerfKPI = &PerfKPI{
+	perfKPIRepository: repository.NewPerfKPI,
+}
+
+// PerfKPI 性能统计 服务层处理
+type PerfKPI struct {
+	perfKPIRepository *repository.PerfKPI // 性能统计数据信息
+}
+
+// SelectGoldKPI 通过网元指标数据信息
+func (r *PerfKPI) SelectGoldKPI(query model.GoldKPIQuery) []map[string]any {
+	// 获取数据指标id
+	var kpiIds []string
+	kpiTitles := r.perfKPIRepository.SelectGoldKPITitle(query.NeType)
+	for _, kpiId := range kpiTitles {
+		kpiIds = append(kpiIds, kpiId.KPIID)
+	}
+
+	data := r.perfKPIRepository.SelectGoldKPI(query, kpiIds)
+	if data == nil {
+		return []map[string]any{}
+	}
+	return data
+}
+
+// SelectGoldKPITitle 网元对应的指标名称
+func (r *PerfKPI) SelectGoldKPITitle(neType string) []model.GoldKPITitle {
+	return r.perfKPIRepository.SelectGoldKPITitle(neType)
+}
+
+// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
+func (r *PerfKPI) SelectUPFTotalFlow(neType, rmUID string, day int) map[string]any {
+	now := time.Now()
+	// 获取当前日期
+	endDate := fmt.Sprint(now.UnixMilli())
+	// 将当前日期前几天数
+	startDate := fmt.Sprint(now.AddDate(0, 0, -day).Truncate(24 * time.Hour).UnixMilli())
+
+	var info map[string]any
+
+	// 读取缓存数据 小于2分钟重新缓存
+	key := fmt.Sprintf("%sUPF:totalFlow:%s_%d", cachekey.NE_DATA_KEY, rmUID, day)
+	infoStr, _ := redis.Get("", key)
+	if infoStr != "" {
+		json.Unmarshal([]byte(infoStr), &info)
+		expireSecond, _ := redis.GetExpire("", key)
+		if expireSecond > 120 {
+			return info
+		}
+	}
+	// down * 8 / 1000 / 1000 单位M
+	info = r.perfKPIRepository.SelectUPFTotalFlow(neType, rmUID, startDate, endDate)
+	if v, ok := info["up"]; ok && v == nil {
+		info["up"] = 0
+	}
+	if v, ok := info["down"]; ok && v == nil {
+		info["down"] = 0
+	}
+
+	// 保存到缓存
+	infoJSON, _ := json.Marshal(info)
+	redis.SetByExpire("", key, string(infoJSON), time.Duration(10)*time.Minute)
+
+	return info
 }

src/modules/network_data/service/perf_kpi.impl.go

@@ -1,80 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"be.ems/src/framework/constants/cachekey"
-	"be.ems/src/framework/redis"
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化数据层 PerfKPIImpl 结构体
-var NewPerfKPIImpl = &PerfKPIImpl{
-	perfKPIRepository: repository.NewPerfKPIImpl,
-}
-
-// PerfKPIImpl 性能统计 服务层处理
-type PerfKPIImpl struct {
-	// 性能统计数据信息
-	perfKPIRepository repository.IPerfKPI
-}
-
-// SelectGoldKPI 通过网元指标数据信息
-func (r *PerfKPIImpl) SelectGoldKPI(query model.GoldKPIQuery) []map[string]any {
-	// 获取数据指标id
-	var kpiIds []string
-	kpiTitles := r.perfKPIRepository.SelectGoldKPITitle(query.NeType)
-	for _, kpiId := range kpiTitles {
-		kpiIds = append(kpiIds, kpiId.KPIID)
-	}
-
-	data := r.perfKPIRepository.SelectGoldKPI(query, kpiIds)
-	if data == nil {
-		return []map[string]any{}
-	}
-	return data
-}
-
-// SelectGoldKPITitle 网元对应的指标名称
-func (r *PerfKPIImpl) SelectGoldKPITitle(neType string) []model.GoldKPITitle {
-	return r.perfKPIRepository.SelectGoldKPITitle(neType)
-}
-
-// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
-func (r *PerfKPIImpl) SelectUPFTotalFlow(neType, rmUID string, day int) map[string]any {
-	now := time.Now()
-	// 获取当前日期
-	endDate := fmt.Sprint(now.UnixMilli())
-	// 将当前日期前几天数
-	startDate := fmt.Sprint(now.AddDate(0, 0, -day).Truncate(24 * time.Hour).UnixMilli())
-
-	var info map[string]any
-
-	// 读取缓存数据 小于2分钟重新缓存
-	key := fmt.Sprintf("%sUPF:totalFlow:%s_%d", cachekey.NE_DATA_KEY, rmUID, day)
-	infoStr, _ := redis.Get("", key)
-	if infoStr != "" {
-		json.Unmarshal([]byte(infoStr), &info)
-		expireSecond, _ := redis.GetExpire("", key)
-		if expireSecond > 120 {
-			return info
-		}
-	}
-
-	info = r.perfKPIRepository.SelectUPFTotalFlow(neType, rmUID, startDate, endDate)
-	if v, ok := info["up"]; ok && v == nil {
-		info["up"] = 0
-	}
-	if v, ok := info["down"]; ok && v == nil {
-		info["down"] = 0
-	}
-
-	// 保存到缓存
-	infoJSON, _ := json.Marshal(info)
-	redis.SetByExpire("", key, string(infoJSON), time.Duration(10)*time.Minute)
-
-	return info
-}

src/modules/network_data/service/udm_auth.go

@@ -8,6 +8,7 @@ import (
 	"be.ems/src/framework/redis"
 	"be.ems/src/modules/network_data/model"
 	"be.ems/src/modules/network_data/repository"
+	neService "be.ems/src/modules/network_element/service"
 )
 
 // 实例化服务层 UDMAuthUser 结构体
@@ -25,12 +26,25 @@ type UDMAuthUser struct {
 func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser {
 	arr := []model.UDMAuthUser{}
 	key := fmt.Sprintf("ausf:%s", imsi)
-	ausfArr, err := redis.GetKeys("udmuser", key)
+	source := fmt.Sprintf("UDM_%s", neId)
+
+	// 网元主机的Redis客户端
+	redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId)
+	if err != nil {
+		return arr
+	}
+	defer func() {
+		redisClient.Close()
+		redis.ConnectPush(source, nil)
+	}()
+	redis.ConnectPush(source, redisClient.Client)
+
+	ausfArr, err := redis.GetKeys(source, key)
 	if err != nil {
 		return arr
 	}
 	for _, key := range ausfArr {
-		m, err := redis.GetHash("udmuser", key)
+		m, err := redis.GetHash(source, key)
 		if err != nil {
 			continue
 		}
@@ -69,21 +83,16 @@ func (r *UDMAuthUser) ResetData(neId string) int64 {
 
 // ParseInfo 解析单个用户imsi鉴权信息 data从命令MML得到的结果
 func (r *UDMAuthUser) ParseInfo(imsi, neId string, data map[string]string) model.UDMAuthUser {
-	u := model.UDMAuthUser{
-		IMSI:      imsi,
-		NeId:      neId,
-		Amf:       data["amf"],
-		Status:    "1",
-		Ki:        data["ki"],
-		AlgoIndex: data["algo"],
-		Opc:       data["opc"],
-	}
+	u := r.udmAuthRepository.SelectByIMSIAndNeID(imsi, neId)
 
-	// 补充用户ID用于更新
-	auth := r.udmAuthRepository.SelectByIMSIAndNeID(imsi, neId)
-	if auth.IMSI == imsi {
-		u.ID = auth.ID
-	}
+	// 用于更新
+	u.IMSI = imsi
+	u.NeId = neId
+	u.Amf = data["amf"]
+	u.Ki = data["ki"]
+	u.AlgoIndex = data["algo"]
+	u.Opc = data["opc"]
+	u.Status = "1"
 	return u
 }
 
@@ -170,3 +179,22 @@ func (r *UDMAuthUser) LoadData(neId, imsi, num string) {
 		r.udmAuthRepository.Inserts(arr)
 	}
 }
+
+// ParseCommandParams 解析数据组成命令参数 ki=xx,xx=xx,...
+func (r *UDMAuthUser) ParseCommandParams(item model.UDMAuthUser) string {
+	var conditions []string
+	if item.Ki != "" {
+		conditions = append(conditions, fmt.Sprintf("ki=%s", item.Ki))
+	}
+
+	if item.Amf != "" {
+		conditions = append(conditions, fmt.Sprintf("amf=%s", item.Amf))
+	}
+	if item.AlgoIndex != "" {
+		conditions = append(conditions, fmt.Sprintf("algo=%s", item.AlgoIndex))
+	}
+	if item.Opc != "" {
+		conditions = append(conditions, fmt.Sprintf("opc=%s", item.Opc))
+	}
+	return strings.Join(conditions, ",")
+}

src/modules/network_data/service/udm_sub.go

@@ -8,6 +8,7 @@ import (
 	"be.ems/src/framework/redis"
 	"be.ems/src/modules/network_data/model"
 	"be.ems/src/modules/network_data/repository"
+	neService "be.ems/src/modules/network_element/service"
 )
 
 // 实例化服务层 UDMSubUser 结构体
@@ -18,22 +19,33 @@ var NewUDMSub = &UDMSubUser{
 
 // UDM签约信息 服务层处理
 type UDMSubUser struct {
-	// UDM签约信息数据信息
-	udmSubRepository *repository.UDMSubUser
-	// UDM用户IMSI信息数据信息
-	udmUserInfoRepository *repository.UDMUserInfo
+	udmSubRepository      *repository.UDMSubUser  // UDM签约信息数据信息
+	udmUserInfoRepository *repository.UDMUserInfo // UDM用户IMSI信息数据信息
 }
 
 // dataByRedis UDM签约用户 db:0 中 udm-sd:*
 func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser {
 	arr := []model.UDMSubUser{}
 	key := fmt.Sprintf("udm-sd:%s", imsi)
-	udmsdArr, err := redis.GetKeys("udmuser", key)
+	source := fmt.Sprintf("UDM_%s", neId)
+
+	// 网元主机的Redis客户端
+	redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId)
+	if err != nil {
+		return arr
+	}
+	defer func() {
+		redisClient.Close()
+		redis.ConnectPush(source, nil)
+	}()
+	redis.ConnectPush(source, redisClient.Client)
+
+	udmsdArr, err := redis.GetKeys(source, key)
 	if err != nil {
 		return arr
 	}
 	for _, key := range udmsdArr {
-		m, err := redis.GetHash("udmuser", key)
+		m, err := redis.GetHash(source, key)
 		if err != nil {
 			continue
 		}
@@ -50,12 +62,29 @@ func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser {
 		// def_ambr,def_nssai,0,def_arfb,def_sar,3,1,12000,1,1000,0,1,-
 		if v, ok := m["am-dat"]; ok {
 			arr := strings.Split(v, ",")
-			a.Ambr = arr[0]
-			a.Nssai = arr[1]
-			a.Rat = arr[2]
-			a.Arfb = arr[3]
-			a.Sar = arr[4]
-			a.Cn = arr[5]
+			a.AmDat = v
+			a.UeAmbrTpl = arr[0]
+			a.NssaiTpl = arr[1]
+			a.RatRestrictions = arr[2]
+			a.AreaForbiddenTpl = arr[3]
+			a.ServiceAreaRestrictionTpl = arr[4]
+			a.CnTypeRestrictions = arr[5]
+			a.RfspIndex = arr[6]
+			a.SubsRegTime = arr[7]
+			a.UeUsageType = arr[8]
+			a.ActiveTime = arr[9]
+			a.MicoAllowed = "0" // arr[10]
+			a.OdbPs = "1"       // arr[11]
+			a.GroupId = "-"     // arr[12]
+			if len(arr) > 10 {
+				a.MicoAllowed = arr[10]
+			}
+			if len(arr) > 11 {
+				a.OdbPs = arr[11]
+			}
+			if len(arr) > 12 && arr[12] != "-" {
+				a.GroupId = arr[12]
+			}
 		}
 		// 1,64,24,65,def_eps,1,2,010200000000,-
 		if v, ok := m["eps-dat"]; ok {
@@ -71,9 +100,11 @@ func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser {
 			a.Ard = arr[3]
 			a.Epstpl = arr[4]
 			a.ContextId = arr[5]
+			a.ApnNum = arr[6] // 导入和导出不用
 			a.ApnContext = arr[7]
-			// [6] 是不要的，导入和导出不用
-			a.StaticIp = arr[8]
+			if len(arr) >= 9 {
+				a.StaticIp = arr[8]
+			}
 		}
 
 		arr = append(arr, a)
@@ -91,27 +122,30 @@ func (r *UDMSubUser) ResetData(neId string) int64 {
 
 // ParseInfo 解析单个用户imsi签约信息 data从命令MML得到的结果
 func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.UDMSubUser {
-	cnType, _ := strconv.ParseInt(data["CNType"][:4], 0, 64)
-	rat, _ := strconv.ParseInt(data["RAT"][:4], 0, 64)
+	u := r.udmSubRepository.SelectByIMSIAndNeID(imsi, neId)
+
+	cnType, _ := strconv.ParseInt(data["CNType"][:4], 0, 64) // 0x03(EPC|5GC)
+	rat, _ := strconv.ParseInt(data["RAT"][:4], 0, 64)       // 0x00(VIRTUAL|WLAN|EUTRA|NR)
 	msisdn := data["MSISDN"]
 	if imsMsisdnLen := strings.Index(msisdn, ","); imsMsisdnLen != -1 {
 		msisdn = msisdn[:imsMsisdnLen]
 	}
 
-	u := model.UDMSubUser{
-		IMSI:   imsi,
-		MSISDN: msisdn,
-		NeId:   neId,
-		Ambr:   data["AMBR"],
-		Arfb:   data["AreaForbidden"],
-		Cn:     fmt.Sprint(cnType),
-		SmData: data["SM-Data(snssai+dnn[1..n])"],
-		Sar:    data["ServiceAreaRestriction"],
-		Nssai:  data["NSSAI"],
-		SmfSel: data["Smf-Selection"],
-		Cag:    data["cag"],
-		Rat:    fmt.Sprint(rat),
-	}
+	// 用于更新
+	u.IMSI = imsi
+	u.MSISDN = msisdn
+	u.NeId = neId
+	u.UeAmbrTpl = data["AMBR"]
+	u.NssaiTpl = data["NSSAI"]
+	u.AreaForbiddenTpl = data["AreaForbidden"]
+	u.ServiceAreaRestrictionTpl = data["ServiceAreaRestriction"]
+	u.CnTypeRestrictions = fmt.Sprint(cnType)
+	u.RatRestrictions = fmt.Sprint(rat)
+	u.MicoAllowed = data["MICO"]
+	u.SmData = data["SM-Data(snssai+dnn[1..n])"]
+	u.SmfSel = data["Smf-Selection"]
+	u.Cag = data["cag"]
+
 	// 1,64,24,65,def_eps,1,2,010200000000,-
 	if v, ok := data["EPS-Data"]; ok {
 		u.EpsDat = v
@@ -122,16 +156,11 @@ func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.
 		u.Ard = arr[3]
 		u.Epstpl = arr[4]
 		u.ContextId = arr[5]
+		u.ApnNum = arr[6] // 导入和导出不用
 		u.ApnContext = arr[7]
-		// [6] 是不要的，导入和导出不用
 		u.StaticIp = arr[8]
 	}
 
-	// 补充用户ID用于更新
-	sub := r.udmSubRepository.SelectByIMSIAndNeID(imsi, neId)
-	if sub.IMSI == imsi {
-		u.ID = sub.ID
-	}
 	// 补充用户拓展信息
 	info := r.udmUserInfoRepository.SelectByIMSIAndNeID(imsi, neId)
 	if info.IMSI == imsi {
@@ -252,3 +281,75 @@ func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) {
 		}
 	}
 }
+
+// ParseCommandParams 解析数据组成命令参数 msisdn=xx,xx=xx,...
+func (r *UDMSubUser) ParseCommandParams(item model.UDMSubUser) string {
+	var conditions []string
+	if item.MSISDN != "" {
+		conditions = append(conditions, fmt.Sprintf("msisdn=%s", item.MSISDN))
+	}
+
+	// AmData
+	if item.UeAmbrTpl != "" {
+		conditions = append(conditions, fmt.Sprintf("ambr=%s", item.UeAmbrTpl))
+	}
+	if item.NssaiTpl != "" {
+		conditions = append(conditions, fmt.Sprintf("nssai=%s", item.NssaiTpl))
+	}
+	if item.AreaForbiddenTpl != "" {
+		conditions = append(conditions, fmt.Sprintf("arfb=%s", item.AreaForbiddenTpl))
+	}
+	if item.ServiceAreaRestrictionTpl != "" {
+		conditions = append(conditions, fmt.Sprintf("sar=%s", item.ServiceAreaRestrictionTpl))
+	}
+	if item.RatRestrictions != "" {
+		conditions = append(conditions, fmt.Sprintf("rat=%s", item.RatRestrictions))
+	}
+	if item.CnTypeRestrictions != "" {
+		conditions = append(conditions, fmt.Sprintf("cn=%s", item.CnTypeRestrictions))
+	}
+	if item.MicoAllowed != "" {
+		conditions = append(conditions, fmt.Sprintf("mico=%s", item.MicoAllowed))
+	}
+
+	// EpsDat
+	// if item.EpsDat != "" {
+	// 	conditions = append(conditions, fmt.Sprintf("eps_dat=%s", item.EpsDat))
+	// }
+	if item.EpsFlag != "" {
+		conditions = append(conditions, fmt.Sprintf("eps_flag=%s", item.EpsFlag))
+	}
+	if item.EpsOdb != "" {
+		conditions = append(conditions, fmt.Sprintf("eps_odb=%s", item.EpsOdb))
+	}
+	if item.HplmnOdb != "" {
+		conditions = append(conditions, fmt.Sprintf("hplmn_odb=%s", item.HplmnOdb))
+	}
+	if item.Epstpl != "" {
+		conditions = append(conditions, fmt.Sprintf("epstpl=%s", item.Epstpl))
+	}
+	if item.Ard != "" {
+		conditions = append(conditions, fmt.Sprintf("ard=%s", item.Ard))
+	}
+	if item.ContextId != "" {
+		conditions = append(conditions, fmt.Sprintf("context_id=%s", item.ContextId))
+	}
+	if item.ApnContext != "" {
+		conditions = append(conditions, fmt.Sprintf("apn_context=%s", item.ApnContext))
+	}
+	if item.StaticIp != "" {
+		conditions = append(conditions, fmt.Sprintf("static_ip=%s", item.StaticIp))
+	}
+
+	// 其他
+	if item.SmfSel != "" {
+		conditions = append(conditions, fmt.Sprintf("smf_sel=%s", item.SmfSel))
+	}
+	if item.SmData != "" {
+		conditions = append(conditions, fmt.Sprintf("sm_data=%s", item.SmData))
+	}
+	if item.Cag != "" {
+		conditions = append(conditions, fmt.Sprintf("cag=%s", item.Cag))
+	}
+	return strings.Join(conditions, ",")
+}

src/modules/network_data/service/ue_event_amf.go

@@ -1,12 +1,40 @@
 package service
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
 
-// UE会话事件AMF 服务层接口
-type IUEEventAMF interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.UEEventAMFQuery) map[string]any
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(ueIds []string) (int64, error)
+// 实例化数据层 UEEventAMF 结构体
+var NewUEEventAMF = &UEEventAMF{
+	ueEventRepository: repository.NewUEEventAMF,
+}
+
+// UEEventAMF UE会话事件AMF 服务层处理
+type UEEventAMF struct {
+	// UE会话事件数据信息
+	ueEventRepository *repository.UEEventAMF
+}
+
+// SelectPage 根据条件分页查询
+func (r *UEEventAMF) SelectPage(querys model.UEEventAMFQuery) map[string]any {
+	return r.ueEventRepository.SelectPage(querys)
+}
+
+// DeleteByIds 批量删除信息
+func (r *UEEventAMF) DeleteByIds(ueIds []string) (int64, error) {
+	// 检查是否存在
+	ids := r.ueEventRepository.SelectByIds(ueIds)
+	if len(ids) <= 0 {
+		return 0, fmt.Errorf("no data")
+	}
+
+	if len(ids) == len(ueIds) {
+		rows := r.ueEventRepository.DeleteByIds(ueIds)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
 }

src/modules/network_data/service/ue_event_amf.impl.go

@@ -1,40 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化数据层 UEEventMMEImpl 结构体
-var NewUEEventMMEImpl = &UEEventMMEImpl{
-	ueEventRepository: repository.NewUEEventMMEImpl,
-}
-
-// UEEventMMEImpl UE会话事件MME 服务层处理
-type UEEventMMEImpl struct {
-	// UE会话事件数据信息
-	ueEventRepository repository.IUEEventMME
-}
-
-// SelectPage 根据条件分页查询
-func (r *UEEventMMEImpl) SelectPage(querys model.UEEventMMEQuery) map[string]any {
-	return r.ueEventRepository.SelectPage(querys)
-}
-
-// DeleteByIds 批量删除信息
-func (r *UEEventMMEImpl) DeleteByIds(ueIds []string) (int64, error) {
-	// 检查是否存在
-	ids := r.ueEventRepository.SelectByIds(ueIds)
-	if len(ids) <= 0 {
-		return 0, fmt.Errorf("no data")
-	}
-
-	if len(ids) == len(ueIds) {
-		rows := r.ueEventRepository.DeleteByIds(ueIds)
-		return rows, nil
-	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}

src/modules/network_data/service/ue_event_mme.go

@@ -1,12 +1,39 @@
 package service
 
-import "be.ems/src/modules/network_data/model"
+import (
+	"fmt"
 
-// UE会话事件MME 服务层接口
-type IUEEventMME interface {
-	// SelectPage 根据条件分页查询
-	SelectPage(querys model.UEEventMMEQuery) map[string]any
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
 
-	// DeleteByIds 批量删除信息
-	DeleteByIds(ueIds []string) (int64, error)
+// 实例化数据层 UEEventMME 结构体
+var NewUEEventMME = &UEEventMME{
+	ueEventRepository: repository.NewUEEventMME,
+}
+
+// UEEventMME UE会话事件MME 服务层处理
+type UEEventMME struct {
+	ueEventRepository *repository.UEEventMME // UE会话事件数据信息
+}
+
+// SelectPage 根据条件分页查询
+func (r *UEEventMME) SelectPage(querys model.UEEventMMEQuery) map[string]any {
+	return r.ueEventRepository.SelectPage(querys)
+}
+
+// DeleteByIds 批量删除信息
+func (r *UEEventMME) DeleteByIds(ueIds []string) (int64, error) {
+	// 检查是否存在
+	ids := r.ueEventRepository.SelectByIds(ueIds)
+	if len(ids) <= 0 {
+		return 0, fmt.Errorf("no data")
+	}
+
+	if len(ids) == len(ueIds) {
+		rows := r.ueEventRepository.DeleteByIds(ueIds)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
 }

src/modules/network_data/service/ue_event_mme.impl.go

@@ -1,40 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化数据层 UEEventAMFImpl 结构体
-var NewUEEventAMFImpl = &UEEventAMFImpl{
-	ueEventRepository: repository.NewUEEventAMFImpl,
-}
-
-// UEEventAMFImpl UE会话事件AMF 服务层处理
-type UEEventAMFImpl struct {
-	// UE会话事件数据信息
-	ueEventRepository repository.IUEEventAMF
-}
-
-// SelectPage 根据条件分页查询
-func (r *UEEventAMFImpl) SelectPage(querys model.UEEventAMFQuery) map[string]any {
-	return r.ueEventRepository.SelectPage(querys)
-}
-
-// DeleteByIds 批量删除信息
-func (r *UEEventAMFImpl) DeleteByIds(ueIds []string) (int64, error) {
-	// 检查是否存在
-	ids := r.ueEventRepository.SelectByIds(ueIds)
-	if len(ids) <= 0 {
-		return 0, fmt.Errorf("no data")
-	}
-
-	if len(ids) == len(ueIds) {
-		rows := r.ueEventRepository.DeleteByIds(ueIds)
-		return rows, nil
-	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}