ref: v3变更,，同步v2.2508.4

src/modules/ne_data/controller/all_alarm.go

@@ -99,7 +99,8 @@ func (s AlarmController) Remove(c *gin.Context) {
 // PUT /clear
 func (s AlarmController) Clear(c *gin.Context) {
 	var body struct {
-		Ids []int64 `json:"ids" binding:"required"`
+		CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+		Id      int64  `json:"id" binding:"required"`
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -108,7 +109,12 @@ func (s AlarmController) Clear(c *gin.Context) {
 	}
 
 	clearUser := reqctx.LoginUserToUserName(c)
-	rows, err := s.alarmService.ClearByIds(body.Ids, clearUser, constants.ALARM_CLEAR_TYPE_MANUAL_CLEAR)
+	rows, err := s.alarmService.ClearById(
+		body.Id,
+		body.CoreUID,
+		clearUser,
+		constants.ALARM_CLEAR_TYPE_MANUAL_CLEAR,
+	)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -121,8 +127,9 @@ func (s AlarmController) Clear(c *gin.Context) {
 // PUT /ack
 func (s AlarmController) Ack(c *gin.Context) {
 	var body struct {
-		Ids      []int64 `json:"ids" binding:"required"`
-		AckState bool    `json:"ackState" binding:"omitempty"`
+		CoreUID  string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+		Id       int64  `json:"id" binding:"required"`
+		AckState bool   `json:"ackState" binding:"omitempty"`
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -131,7 +138,12 @@ func (s AlarmController) Ack(c *gin.Context) {
 	}
 
 	ackUser := reqctx.LoginUserToUserName(c)
-	rows, err := s.alarmService.AckByIds(body.Ids, ackUser, constants.ALARM_ACK_STATE_ACK)
+	rows, err := s.alarmService.AckById(
+		body.Id,
+		body.CoreUID,
+		ackUser,
+		constants.ALARM_ACK_STATE_ACK,
+	)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -144,6 +156,7 @@ func (s AlarmController) Ack(c *gin.Context) {
 // GET /count/severity
 func (s AlarmController) CountSeverity(c *gin.Context) {
 	var query struct {
+		CoreUID     string `form:"coreUid" binding:"required"`                                           // 核心网唯一标识
 		AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"required,oneof=Clear Active"` // 告警状态
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
@@ -152,7 +165,7 @@ func (s AlarmController) CountSeverity(c *gin.Context) {
 		return
 	}
 
-	data := s.alarmService.CountSeverity(query.AlarmStatus)
+	data := s.alarmService.CountSeverity(query.CoreUID, query.AlarmStatus)
 	c.JSON(200, resp.OkData(data))
 }
 
@@ -161,6 +174,7 @@ func (s AlarmController) CountSeverity(c *gin.Context) {
 // GET /count/type
 func (s AlarmController) CountType(c *gin.Context) {
 	var query struct {
+		CoreUID     string `form:"coreUid" binding:"required"`                                           // 核心网唯一标识
 		AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"required,oneof=Clear Active"` // 告警状态
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
@@ -169,15 +183,16 @@ func (s AlarmController) CountType(c *gin.Context) {
 		return
 	}
 
-	data := s.alarmService.CountType(query.AlarmStatus)
+	data := s.alarmService.CountType(query.CoreUID, query.AlarmStatus)
 	c.JSON(200, resp.OkData(data))
 }
 
 // 告警状态前几排名
 //
-// GET /count/ne
-func (s AlarmController) CountNe(c *gin.Context) {
+// GET /count/top
+func (s AlarmController) CountTop(c *gin.Context) {
 	var query struct {
+		CoreUID     string `form:"coreUid" binding:"required"`                                           // 核心网唯一标识
 		AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"required,oneof=Clear Active"` // 告警状态
 		Top         int    `json:"top" form:"top" binding:"required"`                                    // 前几
 	}
@@ -187,7 +202,7 @@ func (s AlarmController) CountNe(c *gin.Context) {
 		return
 	}
 
-	data := s.alarmService.CountNe(query.AlarmStatus, query.Top)
+	data := s.alarmService.CountNe(query.CoreUID, query.AlarmStatus, query.Top)
 	c.JSON(200, resp.OkData(data))
 }
 

src/modules/ne_data/controller/all_kpi.go

@@ -55,12 +55,11 @@ func (s KPIController) KPIData(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
 	kpiData := s.kpiReportService.FindData(querys)

src/modules/ne_data/controller/all_kpi_c.go

@@ -57,12 +57,11 @@ func (s KPICController) KPIData(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
 	kpiData := s.kpicReportService.FindData(querys)

src/modules/ne_data/controller/all_nb_state.go

@@ -58,12 +58,11 @@ func (s NBStateController) List(c *gin.Context) {
 	}
 
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query.NeType, query.NeID)
-	if neInfo.NeId != query.NeID || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query.RmUID = neInfo.RmUID
 
 	// 查询数据
 	rows, total := s.nbStateService.FindByPage(query)
@@ -97,12 +96,12 @@ func (s NBStateController) Export(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	querys.RmUID = neInfo.RmUID
+
 	rows, total := s.nbStateService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空

src/modules/ne_data/controller/amf.go

@@ -54,13 +54,19 @@ func (s *AMFController) UEList(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.ueEventService.FindByPage(neInfo.NeType, query)
 	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
@@ -124,13 +130,19 @@ func (s *AMFController) UEExport(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.ueEventService.FindByPage(neInfo.NeType, query)
 	if total == 0 {
 		// 导出数据记录为空
@@ -167,8 +179,9 @@ func (s *AMFController) UEExport(c *gin.Context) {
 func (s *AMFController) NbInfoList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId string `form:"neId" binding:"required"`
-		NbId string `form:"id"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		NbId    string `form:"id"`
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -177,8 +190,8 @@ func (s *AMFController) NbInfoList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -210,15 +223,19 @@ func (s *AMFController) NbInfoList(c *gin.Context) {
 //	@Router			/neData/amf/nb/list-cfg [get]
 func (s *AMFController) NbStateList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Query("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}

src/modules/ne_data/controller/ims.go

@@ -55,13 +55,19 @@ func (s *IMSController) CDRList(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
@@ -125,13 +131,19 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	if total == 0 {
 		// 导出数据记录为空
@@ -166,15 +178,19 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 //	@Router			/neData/ims/session/num [get]
 func (s *IMSController) UeSessionNum(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Query("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("IMS", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -207,9 +223,10 @@ func (s *IMSController) UeSessionNum(c *gin.Context) {
 func (s *IMSController) UeSessionList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId   string `form:"neId" binding:"required"`
-		IMSI   string `form:"imsi"`
-		MSISDN string `form:"msisdn"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi"`
+		MSISDN  string `form:"msisdn"`
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -218,8 +235,8 @@ func (s *IMSController) UeSessionList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("IMS", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}

src/modules/ne_data/controller/mme.go

@@ -54,13 +54,19 @@ func (s *MMEController) UEList(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.ueEventService.FindByPage(neInfo.NeType, query)
 	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
@@ -124,13 +130,19 @@ func (s *MMEController) UEExport(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.ueEventService.FindByPage(neInfo.NeType, query)
 	if total == 0 {
 		// 导出数据记录为空
@@ -167,8 +179,9 @@ func (s *MMEController) UEExport(c *gin.Context) {
 func (s *MMEController) NbInfoList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId string `form:"neId" binding:"required"`
-		NbId string `form:"id"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		NbId    string `form:"id"`
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -177,8 +190,8 @@ func (s *MMEController) NbInfoList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -210,15 +223,19 @@ func (s *MMEController) NbInfoList(c *gin.Context) {
 //	@Router			/neData/mme/nb/list-cfg [get]
 func (s *MMEController) NbStateList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Query("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}

src/modules/ne_data/controller/n3iwf.go

@@ -41,8 +41,9 @@ type N3IWFController struct {
 func (s N3IWFController) SubUserList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId string `form:"neId" binding:"required"`
-		IMSI string `form:"imsi"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi"`
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -51,8 +52,8 @@ func (s N3IWFController) SubUserList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("N3IWF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}

src/modules/ne_data/controller/nssf.go

@@ -40,7 +40,8 @@ type NSSFController struct {
 func (s NSSFController) SubUserList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -49,8 +50,8 @@ func (s NSSFController) SubUserList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("NSSF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -81,7 +82,8 @@ func (s NSSFController) SubUserList(c *gin.Context) {
 func (s NSSFController) AvailableList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -90,8 +92,8 @@ func (s NSSFController) AvailableList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("NSSF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}

src/modules/ne_data/controller/pcf.go

@@ -28,7 +28,7 @@ type PCFController struct {
 //
 // GET /rule/list
 //
-//	@Tags			ne_data/pcf
+//	@Tags			network_data/pcf
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	query		string	true	"NE ID"	default(001)
@@ -38,13 +38,14 @@ type PCFController struct {
 //	@Security		TokenAuth
 //	@Summary		Policy Configuration List
 //	@Description	Policy Configuration List
-//	@Router			/neData/pcf/rule/list [get]
+//	@Router			/ne/link/pcf/rule/list [get]
 func (s PCFController) RuleInfoList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId   string `form:"neId" binding:"required"`
-		IMSI   string `form:"imsi"`
-		MSISDN string `form:"msisdn"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi"`
+		MSISDN  string `form:"msisdn"`
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -53,8 +54,8 @@ func (s PCFController) RuleInfoList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -76,7 +77,7 @@ func (s PCFController) RuleInfoList(c *gin.Context) {
 //
 // POST /rule
 //
-//	@Tags			ne_data/pcf
+//	@Tags			network_data/pcf
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -84,12 +85,13 @@ func (s PCFController) RuleInfoList(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Policy Configuration Additions
 //	@Description	Policy Configuration Additions
-//	@Router			/neData/pcf/rule [post]
+//	@Router			/ne/link/pcf/rule [post]
 func (s PCFController) RuleInfoAdd(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeId      string         `json:"neId" binding:"required"`      // 网元ID
-		Num       int64          `json:"num"`                          // 批量添加，默认0单条，大于1时imsi/msisdn会累加数值
+		CoreUID   string         `form:"coreUid" binding:"required"`   // 核心网唯一标识
+		NeUID     string         `form:"neUid" binding:"required"`     // 网元唯一标识
+		Num       int64          `json:"num"`                          // 批量添加 大于1时imsi/msisdn会累加数值
 		ParamData map[string]any `json:"paramData" binding:"required"` // 参数数据
 		// Imsi      string         `json:"imsi" binding:"required"`
 		// Msisdn    string         `json:"msisdn" binding:"required"`
@@ -109,15 +111,15 @@ func (s PCFController) RuleInfoAdd(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元直连
 	var err error
-	if body.Num > 0 { // 批量添加
+	if body.Num > 1 { // 批量添加
 		err = neFetchlink.PCFRuleAddBatch(neInfo, body.ParamData, body.Num)
 	} else { // 单条添加
 		err = neFetchlink.PCFRuleAdd(neInfo, body.ParamData)
@@ -133,7 +135,7 @@ func (s PCFController) RuleInfoAdd(c *gin.Context) {
 //
 // PUT /rule
 //
-//	@Tags			ne_data/pcf
+//	@Tags			network_data/pcf
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -141,11 +143,12 @@ func (s PCFController) RuleInfoAdd(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Policy Configuration Updates
 //	@Description	Policy Configuration Updates
-//	@Router			/neData/pcf/rule [put]
+//	@Router			/ne/link/pcf/rule [put]
 func (s PCFController) RuleInfoEdit(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeId      string         `json:"neId" binding:"required"`      // 网元ID
+		CoreUID   string         `json:"coreUid" binding:"required"`   // 核心网唯一标识
+		NeUID     string         `json:"neUid" binding:"required"`     // 网元唯一标识
 		Num       int64          `json:"num"`                          // 更新数量
 		ParamData map[string]any `json:"paramData" binding:"required"` // 参数数据
 		// Imsi      string         `json:"imsi" binding:"required"`
@@ -166,8 +169,8 @@ func (s PCFController) RuleInfoEdit(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -190,7 +193,7 @@ func (s PCFController) RuleInfoEdit(c *gin.Context) {
 //
 // DELETE /rule
 //
-//	@Tags			ne_data/pcf
+//	@Tags			network_data/pcf
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId		query		string	true	"NE ID"		default(001)
@@ -200,13 +203,14 @@ func (s PCFController) RuleInfoEdit(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Policy Configuration Deletion
 //	@Description	Policy Configuration Deletion
-//	@Router			/neData/pcf/rule [delete]
+//	@Router			/ne/link/pcf/rule [delete]
 func (s PCFController) RuleInfoRemove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId string `form:"neId" binding:"required"` // 网元ID
-		IMSI string `form:"imsi" binding:"required"` // IMSi, 带数量时为批量删除
-		Num  int64  `form:"num"`                     // 删除数量
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi" binding:"required"`    // IMSi, 带数量时为批量删除
+		Num     int64  `form:"num"`                        // 删除数量
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -215,15 +219,15 @@ func (s PCFController) RuleInfoRemove(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元直连
 	var err error
-	if query.Num > 0 { // 批量删除
+	if query.Num > 1 { // 批量删除
 		err = neFetchlink.PCFRuleDeleteBatch(neInfo, query.IMSI, query.Num)
 	} else { // 单条删除
 		err = neFetchlink.PCFRuleDelete(neInfo, query.IMSI)
@@ -239,7 +243,7 @@ func (s PCFController) RuleInfoRemove(c *gin.Context) {
 //
 // GET /rule/export
 //
-//	@Tags			ne_data/pcf
+//	@Tags			network_data/pcf
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	query		string	true	"NE ID"	default(001)
@@ -248,11 +252,12 @@ func (s PCFController) RuleInfoRemove(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Policy Configuration Export
 //	@Description	Policy Configuration Export
-//	@Router			/neData/pcf/rule/export [get]
+//	@Router			/ne/link/pcf/rule/export [get]
 func (s PCFController) RuleInfoExport(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId     string `form:"neId" binding:"required"`
+		CoreUID  string `form:"coreUid" binding:"required"`             // 核心网唯一标识
+		NeUID    string `form:"neUid" binding:"required"`               // 网元唯一标识
 		FileType string `form:"fileType"  binding:"required,oneof=txt"` // 文件类型
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
@@ -262,8 +267,8 @@ func (s PCFController) RuleInfoExport(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -284,7 +289,7 @@ func (s PCFController) RuleInfoExport(c *gin.Context) {
 //
 // PUT /rule/import
 //
-//	@Tags			ne_data/pcf
+//	@Tags			network_data/pcf
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	query		string	true	"NE ID"	default(001)
@@ -294,11 +299,12 @@ func (s PCFController) RuleInfoExport(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Policy Configuration Import
 //	@Description	Policy Configuration Import
-//	@Router			/neData/pcf/rule/import [put]
+//	@Router			/ne/link/pcf/rule/import [put]
 func (s PCFController) RuleInfoImport(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeId     string `json:"neId" binding:"required"`
+		CoreUID  string `json:"coreUid" binding:"required"`             // 核心网唯一标识
+		NeUID    string `json:"neUid" binding:"required"`               // 网元唯一标识
 		FileType string `json:"fileType"  binding:"required,oneof=txt"` // 文件类型
 		FilePath string `json:"filePath"  binding:"required"`           // 网元端文件所在绝对路径
 	}
@@ -309,8 +315,8 @@ func (s PCFController) RuleInfoImport(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("PCF", body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}

src/modules/ne_data/controller/sgwc.go

@@ -55,13 +55,19 @@ func (s *SGWCController) CDRList(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
@@ -125,13 +131,19 @@ func (s *SGWCController) CDRExport(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	if total == 0 {
 		// 导出数据记录为空

src/modules/ne_data/controller/smf.go

@@ -57,13 +57,19 @@ func (s *SMFController) CDRList(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
@@ -127,13 +133,19 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	if total == 0 {
 		// 导出数据记录为空
@@ -169,7 +181,8 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 func (s *SMFController) SubUserNum(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -178,8 +191,8 @@ func (s *SMFController) SubUserNum(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("SMF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -214,7 +227,8 @@ func (s *SMFController) SubUserNum(c *gin.Context) {
 func (s *SMFController) SubUserList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeId    string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 		IMSI    string `form:"imsi"`
 		MSISDN  string `form:"msisdn"`
 		Upstate string `form:"upstate"`
@@ -227,8 +241,8 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("SMF", query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
@@ -256,7 +270,7 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 				imsiStr = strings.TrimPrefix(imsiStr, "imsi-")
 				item["imsi"] = imsiStr
 				// 查UDM拓展信息
-				info := s.UDMExtendService.FindByIMSIAndNeID(imsiStr, "%")
+				info := s.UDMExtendService.FindByIMSIAndNeID(neInfo.CoreUID, "%", imsiStr)
 				item["remark"] = info.Remark
 			}
 			if v, ok := item["msisdn"]; ok && v != nil {

src/modules/ne_data/controller/smsc.go

@@ -54,13 +54,19 @@ func (s *SMSCController) CDRList(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
@@ -124,13 +130,19 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
 	if pageSize > 10000 {
 		query["pageSize"] = "10000"
 	}
-	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query["neType"], query["neId"])
-	if neInfo.NeType == "" {
+	coreUid := c.DefaultQuery("coreUid", "")
+	neUid := c.DefaultQuery("neUid", "")
+	if coreUid == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "coreUid or neUid is empty"))
+		return
+	}
+
+	// 查询网元获取IP
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-	query["rmUID"] = neInfo.RmUID
 	rows, total := s.cdrEventService.FindByPage(neInfo.NeType, query)
 	if total == 0 {
 		// 导出数据记录为空

src/modules/ne_data/controller/udm_auth.go

@@ -16,14 +16,14 @@ import (
 	neFetchlink "be.ems/src/modules/ne/fetch_link"
 	neService "be.ems/src/modules/ne/service"
 	"be.ems/src/modules/ne_data/model"
-	neDataService "be.ems/src/modules/ne_data/service"
+	"be.ems/src/modules/ne_data/service"
 
 	"github.com/gin-gonic/gin"
 )
 
 // 实例化控制层 UDMAuthController 结构体
 var NewUDMAuth = &UDMAuthController{
-	udmAuthService: neDataService.NewUDMAuthUser,
+	udmAuthService: service.NewUDMAuthUser,
 	neInfoService:  neService.NewNeInfo,
 }
 
@@ -31,15 +31,15 @@ var NewUDMAuth = &UDMAuthController{
 //
 // PATH /udm/auth
 type UDMAuthController struct {
-	udmAuthService *neDataService.UDMAuthUser // UDM鉴权信息服务
-	neInfoService  *neService.NeInfo          // 网元信息服务
+	udmAuthService *service.UDMAuthUser // UDM鉴权信息服务
+	neInfoService  *neService.NeInfo    // 网元信息服务
 }
 
 // UDM鉴权用户重载数据
 //
-// PUT /resetData/:neId
+// PUT /reset
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -47,15 +47,19 @@ type UDMAuthController struct {
 //	@Security		TokenAuth
 //	@Summary		UDM Authentication User Data Refresh
 //	@Description	UDM Authenticated User Data List Refresh Synchronization Latest
-//	@Router			/neData/udm/auth/resetData/{neId} [put]
+//	@Router			/ne/link/udm/auth/reset [put]
 func (s *UDMAuthController) ResetData(c *gin.Context) {
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	data := s.udmAuthService.ResetData(neId)
+	data := s.udmAuthService.ResetData(query.CoreUID, query.NeUID)
 	c.JSON(200, resp.OkData(data))
 }
 
@@ -63,7 +67,7 @@ func (s *UDMAuthController) ResetData(c *gin.Context) {
 //
 // GET /list
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId		query		string	true	"NE ID"	default(001)
@@ -74,44 +78,49 @@ func (s *UDMAuthController) ResetData(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authentication User List
 //	@Description	UDM Authentication User List
-//	@Router			/neData/udm/auth/list [get]
+//	@Router			/ne/link/udm/auth/list [get]
 func (s *UDMAuthController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	rows, total := s.udmAuthService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
+	total, rows := s.udmAuthService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // UDM鉴权用户信息
 //
 // GET /:neId/:imsi
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			value	path		string	true	"IMSI"
+//	@Param			coreUid	query		string	true	"NE ID"	default(001)
+//	@Param			neUid	query		string	true	"NE ID"	default(001)
+//	@Param			imsi	query		string	true	"IMSI"
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		UDM Authentication User Information
 //	@Description	UDM Authentication User Information
-//	@Router			/neData/udm/auth/{neId}/{value} [get]
+//	@Router			/ne/link/udm/auth [get]
 func (s *UDMAuthController) Info(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi := c.Param("imsi")
-	if neId == "" || imsi == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi" binding:"required"`    // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -119,7 +128,7 @@ func (s *UDMAuthController) Info(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("dsp authdat:imsi=%s", imsi)
+	cmd := fmt.Sprintf("dsp authdat:imsi=%s", query.IMSI)
 	data, err := telnet.ConvertToMap(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
@@ -132,16 +141,16 @@ func (s *UDMAuthController) Info(c *gin.Context) {
 	}
 
 	// 解析返回的数据
-	u := s.udmAuthService.ParseInfo(imsi, neId, data)
-	s.udmAuthService.Insert(neId, u)
+	u := s.udmAuthService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, query.IMSI, data)
+	s.udmAuthService.Insert(neInfo.CoreUID, neInfo.NeUID, u)
 	c.JSON(200, resp.OkData(u))
 }
 
 // UDM鉴权用户新增
 //
-// POST /:neId
+// POST /
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -150,12 +159,13 @@ func (s *UDMAuthController) Info(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authentication User Added
 //	@Description	UDM Authentication User Added
-//	@Router			/neData/udm/auth/{neId} [post]
+//	@Router			/ne/link/udm/auth [post]
 func (s *UDMAuthController) Add(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	// 传入数量大于0时，为批量新增
+	num := parse.Number(c.Query("num"))
+	if num < 0 {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: num is empty"))
 		return
 	}
 
@@ -171,19 +181,38 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
+	// 批量新增
+	if num > 1 {
+		// 发送MML
+		cmd := fmt.Sprintf("baa authdat:start_imsi=%s,sub_num=%d,", body.IMSI, num)
+		cmd += s.udmAuthService.ParseCommandParams(body)
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmAuthService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.IMSI, num)
+		}
+		c.JSON(200, resp.OkData(data))
+		return
+	}
+
 	// 发送MML
 	cmd := fmt.Sprintf("add authdat:imsi=%s,", body.IMSI)
 	cmd += s.udmAuthService.ParseCommandParams(body)
@@ -195,81 +224,16 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		s.udmAuthService.Insert(neId, body)
-	}
-	c.JSON(200, resp.OkData(data))
-}
-
-// UDM鉴权用户批量新增
-//
-// POST /:neId/:num
-//
-//	@Tags			ne_data/udm/auth
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			value	path		number	true	"Number of releases, value includes start imsi"
-//	@Param			data	body		object	true	"Request Param"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
-//	@Summary		UDM Authentication User Batch Add
-//	@Description	UDM Authentication User Batch Add
-//	@Router			/neData/udm/auth/{neId}/{value} [post]
-func (s *UDMAuthController) Adds(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	num := c.Param("num")
-	if neId == "" || num == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/num is empty"))
-		return
-	}
-
-	var body model.UDMAuthUser
-	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
-		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
-		return
-	}
-	if body.IMSI == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: imsi is empty"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	// 发送MML
-	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, resp.ErrMsg(err.Error()))
-		return
-	}
-
-	// 命令ok时
-	if strings.Contains(data, "ok") {
-		s.udmAuthService.LoadData(neId, body.IMSI, num)
+		s.udmAuthService.Insert(neInfo.CoreUID, neInfo.NeUID, body)
 	}
 	c.JSON(200, resp.OkData(data))
 }
 
 // UDM鉴权用户修改
 //
-// PUT /:neId
+// PUT /
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -278,15 +242,9 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authenticated User Modification
 //	@Description	UDM Authenticated User Modification
-//	@Router			/neData/udm/auth/{neId} [put]
+//	@Router			/ne/link/udm/auth [put]
 func (s *UDMAuthController) Edit(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
-		return
-	}
-
 	var body model.UDMAuthUser
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -299,13 +257,13 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -323,7 +281,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		s.udmAuthService.Insert(neId, body)
+		s.udmAuthService.Insert(neInfo.CoreUID, neInfo.NeUID, body)
 	}
 	c.JSON(200, resp.OkData(data))
 }
@@ -332,7 +290,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 //
 // DELETE /:neId/:imsi
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -341,38 +299,59 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authenticated User Deletion
 //	@Description	UDM Authenticated User Deletion
-//	@Router			/neData/udm/auth/{neId}/{value} [delete]
+//	@Router			/ne/link/udm/auth/{neId}/{value} [delete]
 func (s *UDMAuthController) Remove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi := c.Param("imsi")
-	if neId == "" || imsi == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi" binding:"required"`    // IMSi
+		Num     int64  `form:"num"`                        // 批量数量
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 处理字符转id数组后去重
-	imsiArr := strings.Split(imsi, ",")
-	uniqueIDs := parse.RemoveDuplicates(imsiArr)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, resp.Err(nil))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
+	if query.Num > 0 {
+		// 发送MML
+		cmd := fmt.Sprintf("bde authdat:start_imsi=%s,sub_num=%d", query.IMSI, query.Num)
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmAuthService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.IMSI, query.Num)
+		}
+		c.JSON(200, resp.OkData(data))
+		return
+	}
+
+	// 处理字符转id数组后去重
+	imsiArr := strings.Split(query.IMSI, ",")
+	uniqueIDs := parse.RemoveDuplicates(imsiArr)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, resp.Err(nil))
+		return
+	}
 	resultData := map[string]string{}
 	for _, imsi := range uniqueIDs {
 		// 发送MML
@@ -384,7 +363,7 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
 		}
 		// 命令ok时
 		if strings.Contains(data, "ok") {
-			s.udmAuthService.Delete(imsi, neId)
+			s.udmAuthService.Delete(neInfo.CoreUID, neInfo.NeUID, imsi)
 		}
 		resultData[imsi] = data
 	}
@@ -392,65 +371,11 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
 	c.JSON(200, resp.OkData(resultData))
 }
 
-// UDM鉴权用户批量删除
-//
-// DELETE /:neId/:imsi/:num
-//
-//	@Tags			ne_data/udm/auth
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			imsi	path		string	true	"IMSI"
-//	@Param			num		path		number	true	"Number of releases, value includes start imsi"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
-//	@Summary		UDM Authentication User Batch Deletion
-//	@Description	UDM Authentication User Batch Deletion
-//	@Router			/neData/udm/auth/{neId}/{imsi}/{num} [delete]
-func (s *UDMAuthController) Removes(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi := c.Param("imsi")
-	num := c.Param("num")
-	if neId == "" || imsi == "" || num == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi/num is empty"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	// 发送MML
-	cmd := fmt.Sprintf("bde authdat:start_imsi=%s,sub_num=%s", imsi, num)
-	data, err := telnet.ConvertToStr(telnetClient, cmd)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-
-	// 命令ok时
-	if strings.Contains(data, "ok") {
-		s.udmAuthService.LoadData(neId, imsi, num)
-	}
-	c.JSON(200, resp.OkData(data))
-}
-
 // UDM鉴权用户导出
 //
 // GET /export
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId		query		string	true	"NE ID"		default(001)
@@ -462,16 +387,15 @@ func (s *UDMAuthController) Removes(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authenticated User Export
 //	@Description	UDM Authenticated User Export
-//	@Router			/neData/udm/auth/export [get]
+//	@Router			/ne/link/udm/auth/export [get]
 func (s *UDMAuthController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	// 查询结果，根据查询条件结果，单页最大值限制
-	neId := c.Query("neId")
-	fileType := c.Query("type")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	neUid := c.Query("neUid")
+	if c.Query("coreUid") == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid or neUid is empty"))
 		return
 	}
+	fileType := c.Query("type")
 	if !(fileType == "csv" || fileType == "txt") {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
 		return
@@ -484,8 +408,6 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
-
-	// rows := s.udmAuthService.SelectList(model.UDMAuthUser{NeId: neId})
 	if len(rows) <= 0 {
 		// 导出数据记录为空
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
@@ -493,7 +415,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 	}
 
 	// 文件名
-	fileName := fmt.Sprintf("udm_auth_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType)
+	fileName := fmt.Sprintf("udm_auth_user_export_%s_%d.%s", neUid, time.Now().UnixMilli(), fileType)
 	filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName)
 
 	if fileType == "csv" {
@@ -538,7 +460,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 //
 // POST /import
 //
-//	@Tags			ne_data/udm/auth
+//	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -546,11 +468,12 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authenticated User Import
 //	@Description	UDM Authenticated User Import
-//	@Router			/neData/udm/auth/import [post]
+//	@Router			/ne/link/udm/auth/import [post]
 func (s *UDMAuthController) Import(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeId       string `json:"neId" binding:"required"`                     // 网元ID
+		CoreUID    string `json:"coreUid" binding:"required"`                  // 核心网唯一标识
+		NeUID      string `json:"neUid" binding:"required"`                    // 网元唯一标识
 		UploadPath string `json:"uploadPath" binding:"required"`               // 上传文件路径
 		TypeVal    string `json:"typeVal" binding:"required,oneof=default k4"` // default: 默认导入方式, k4: k4类型导入方式
 		TypeData   any    `json:"typeData"`                                    // k4类型的数据密钥
@@ -567,15 +490,14 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-
 	// 网元主机的SSH客户端
-	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -599,7 +521,7 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 	}
 
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -618,7 +540,7 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 
 	// K4类型发特定请求
 	if body.TypeVal == "k4" {
-		resultMsg, resultErr = neFetchlink.UDMImportAuth(neInfo.IP, map[string]any{
+		resultMsg, resultErr = neFetchlink.UDMImportAuth(neInfo.IPAddr, map[string]any{
 			"path": neFilePath, "k4": body.TypeData,
 		})
 	}
@@ -632,11 +554,11 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 	if strings.Contains(resultMsg, "ok") {
 		if strings.HasSuffix(body.UploadPath, ".csv") {
 			data := file.ReadFileCSV(localFilePath)
-			go s.udmAuthService.InsertData(neInfo.NeId, "csv", data)
+			go s.udmAuthService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data)
 		}
 		if strings.HasSuffix(body.UploadPath, ".txt") {
 			data := file.ReadFileTXTLine(",", localFilePath)
-			go s.udmAuthService.InsertData(neInfo.NeId, "txt", data)
+			go s.udmAuthService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data)
 		}
 	}
 	c.JSON(200, resp.OkMsg(resultMsg))

src/modules/ne_data/controller/udm_sub.go

@@ -15,14 +15,14 @@ import (
 	"be.ems/src/framework/utils/parse"
 	neService "be.ems/src/modules/ne/service"
 	"be.ems/src/modules/ne_data/model"
-	neDataService "be.ems/src/modules/ne_data/service"
+	"be.ems/src/modules/ne_data/service"
 
 	"github.com/gin-gonic/gin"
 )
 
 // 实例化控制层 UDMSubController 结构体
 var NewUDMSub = &UDMSubController{
-	udmSubService: neDataService.NewUDMSubUser,
+	udmSubService: service.NewUDMSubUser,
 	neInfoService: neService.NewNeInfo,
 }
 
@@ -30,15 +30,15 @@ var NewUDMSub = &UDMSubController{
 //
 // PATH /udm/sub
 type UDMSubController struct {
-	udmSubService *neDataService.UDMSubUser // UDM签约信息服务
-	neInfoService *neService.NeInfo         // 网元信息服务
+	udmSubService *service.UDMSubUser // UDM签约信息服务
+	neInfoService *neService.NeInfo   // 网元信息服务
 }
 
 // UDM签约用户重载数据
 //
-// PUT /resetData/:neId
+// PUT /reset
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -46,15 +46,19 @@ type UDMSubController struct {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Reload Data
 //	@Description	UDM Subscriber User Reload Data
-//	@Router			/neData/udm/sub/resetData/{neId} [put]
+//	@Router			/ne/link/udm/sub/reset [put]
 func (s *UDMSubController) ResetData(c *gin.Context) {
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	data := s.udmSubService.ResetData(neId)
+	data := s.udmSubService.ResetData(query.CoreUID, query.NeUID)
 	c.JSON(200, resp.OkData(data))
 }
 
@@ -62,7 +66,7 @@ func (s *UDMSubController) ResetData(c *gin.Context) {
 //
 // GET /list
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId		query		string	true	"NE ID"	default(001)
@@ -74,18 +78,18 @@ func (s *UDMSubController) ResetData(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User List
 //	@Description	UDM Subscriber User List
-//	@Router			/neData/udm/sub/list [get]
+//	@Router			/ne/link/udm/sub/list [get]
 func (s *UDMSubController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	rows, total := s.udmSubService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
+	total, rows := s.udmSubService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // UDM签约用户信息
 //
-// GET /:neId/:imsi
+// GET /
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -94,24 +98,28 @@ func (s *UDMSubController) List(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Information
 //	@Description	UDM Subscriber User Information
-//	@Router			/neData/udm/sub/{neId}/{value} [get]
+//	@Router			/ne/link/udm/sub  [get]
 func (s *UDMSubController) Info(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi := c.Param("imsi")
-	if neId == "" || imsi == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or imsi is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi" binding:"required"`    // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -119,7 +127,7 @@ func (s *UDMSubController) Info(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("dsp udmuser:imsi=%s", imsi)
+	cmd := fmt.Sprintf("dsp udmuser:imsi=%s", query.IMSI)
 	data, err := telnet.ConvertToMap(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
@@ -132,16 +140,16 @@ func (s *UDMSubController) Info(c *gin.Context) {
 	}
 
 	// 解析返回的数据
-	u := s.udmSubService.ParseInfo(imsi, neId, data)
-	s.udmSubService.Insert(neId, u)
+	u := s.udmSubService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, query.IMSI, data)
+	s.udmSubService.Insert(neInfo.CoreUID, neInfo.NeUID, u)
 	c.JSON(200, resp.OkData(u))
 }
 
 // UDM签约用户新增
 //
-// POST /:neId
+// POST /
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -150,12 +158,13 @@ func (s *UDMSubController) Info(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Added
 //	@Description	UDM Subscriber User Added
-//	@Router			/neData/udm/sub/{neId} [post]
+//	@Router			/ne/link/udm/sub [post]
 func (s *UDMSubController) Add(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	// 传入数量大于0时，为批量新增
+	num := parse.Number(c.Query("num"))
+	if num < 0 {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: num is empty"))
 		return
 	}
 
@@ -171,19 +180,41 @@ func (s *UDMSubController) Add(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
+	// 批量新增
+	if num > 1 {
+		// 发送MML
+		cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%d,", body.IMSI, body.MSISDN, num)
+		cmd += s.udmSubService.ParseCommandParams(body)
+		// 去除msisdn参数，避免重复
+		omemsisdn := fmt.Sprintf(",msisdn=%s,", body.MSISDN)
+		cmd = strings.Replace(cmd, omemsisdn, ",", 1)
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmSubService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.IMSI, num, body.Remark)
+		}
+		c.JSON(200, resp.OkData(data))
+		return
+	}
+
 	// 发送MML
 	cmd := fmt.Sprintf("add udmuser:imsi=%s,", body.IMSI)
 	cmd += s.udmSubService.ParseCommandParams(body)
@@ -195,85 +226,16 @@ func (s *UDMSubController) Add(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		body.NeId = neId
-		s.udmSubService.Insert(neId, body)
-	}
-	c.JSON(200, resp.OkData(data))
-}
-
-// UDM签约用户批量新增
-//
-// POST /:neId/:num
-//
-//	@Tags			ne_data/udm/sub
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"											default(001)
-//	@Param			value	path		number	true	"Number of releases, value includes start imsi"	default(1)
-//	@Param			data	body		object	true	"Request Param"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
-//	@Summary		UDM Subscriber User Batch Add
-//	@Description	UDM Subscriber User Batch Add
-//	@Router			/neData/udm/sub/{neId}/{value} [post]
-func (s *UDMSubController) Adds(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	num := c.Param("num")
-	if neId == "" || num == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/num is empty"))
-		return
-	}
-
-	var body model.UDMSubUser
-	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
-		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
-		return
-	}
-	if len(body.IMSI) != 15 {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: IMSI length is not 15 bits"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	// 发送MML
-	cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,", body.IMSI, body.MSISDN, num)
-	cmd += s.udmSubService.ParseCommandParams(body)
-	// 去除msisdn参数，避免重复
-	omemsisdn := fmt.Sprintf(",msisdn=%s,", body.MSISDN)
-	cmd = strings.Replace(cmd, omemsisdn, ",", 1)
-	data, err := telnet.ConvertToStr(telnetClient, cmd)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-
-	// 命令ok时
-	if strings.Contains(data, "ok") {
-		s.udmSubService.LoadData(neId, body.IMSI, num, body.Remark)
+		s.udmSubService.Insert(neInfo.CoreUID, neInfo.NeUID, body)
 	}
 	c.JSON(200, resp.OkData(data))
 }
 
 // UDM签约用户修改
 //
-// PUT /:neId
+// PUT /
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -282,7 +244,7 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Modification
 //	@Description	UDM Subscriber User Modification
-//	@Router			/neData/udm/sub/{neId} [put]
+//	@Router			/ne/link/udm/sub [put]
 func (s *UDMSubController) Edit(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
@@ -303,13 +265,13 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -327,17 +289,16 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		body.NeId = neId
-		s.udmSubService.Insert(neId, body)
+		s.udmSubService.Insert(neInfo.CoreUID, neInfo.NeUID, body)
 	}
 	c.JSON(200, resp.OkData(data))
 }
 
 // UDM签约用户删除
 //
-// DELETE /:neId/:imsi
+// DELETE /
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -346,38 +307,58 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Deletion
 //	@Description	UDM Subscriber User Deletion
-//	@Router			/neData/udm/sub/{neId}/{value} [delete]
+//	@Router			/ne/link/udm/sub [delete]
 func (s *UDMSubController) Remove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi := c.Param("imsi")
-	if neId == "" || len(imsi) < 15 {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		IMSI    string `form:"imsi" binding:"required"`    // IMSi
+		Num     int64  `form:"num"`                        // 批量数量
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 处理字符转id数组后去重
-	imsiArr := strings.Split(imsi, ",")
-	uniqueIDs := parse.RemoveDuplicates(imsiArr)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, resp.Err(nil))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
+	if query.Num > 0 {
+		// 发送MML
+		cmd := fmt.Sprintf("bde udmuser:start_imsi=%s,sub_num=%d", query.IMSI, query.Num)
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmSubService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.IMSI, query.Num, "-(Deleted)-")
+		}
+		c.JSON(200, resp.OkData(data))
+	}
+
+	// 处理字符转id数组后去重
+	imsiArr := strings.Split(query.IMSI, ",")
+	uniqueIDs := parse.RemoveDuplicates(imsiArr)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, resp.Err(nil))
+		return
+	}
 	resultData := map[string]string{}
 	for _, imsi := range uniqueIDs {
 		// 发送MML
@@ -389,7 +370,7 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 		}
 		// 命令ok时
 		if strings.Contains(data, "ok") {
-			s.udmSubService.Delete(neId, imsi)
+			s.udmSubService.Delete(neInfo.CoreUID, neInfo.NeUID, imsi)
 		}
 		resultData[imsi] = data
 	}
@@ -397,65 +378,11 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 	c.JSON(200, resp.OkData(resultData))
 }
 
-// UDM签约用户批量删除
-//
-// DELETE /:neId/:imsi/:num
-//
-//	@Tags			ne_data/udm/sub
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			imsi	path		string	true	"IMSI"
-//	@Param			num		path		number	true	"Number of releases, value includes start imsi"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
-//	@Summary		UDM Subscriber User Batch Deletion
-//	@Description	UDM Subscriber User Batch Deletion
-//	@Router			/neData/udm/sub/{neId}/{imsi}/{num} [delete]
-func (s *UDMSubController) Removes(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi := c.Param("imsi")
-	num := c.Param("num")
-	if neId == "" || len(imsi) < 15 || num == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi/num is empty"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	// 发送MML
-	cmd := fmt.Sprintf("bde udmuser:start_imsi=%s,sub_num=%s", imsi, num)
-	data, err := telnet.ConvertToStr(telnetClient, cmd)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-
-	// 命令ok时
-	if strings.Contains(data, "ok") {
-		s.udmSubService.LoadData(neId, imsi, num, "-(Deleted)-")
-	}
-	c.JSON(200, resp.OkData(data))
-}
-
 // UDM签约用户导出
 //
 // GET /export
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId		query		string	true	"NE ID"		default(001)
@@ -468,16 +395,15 @@ func (s *UDMSubController) Removes(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Export
 //	@Description	UDM Subscriber User Export
-//	@Router			/neData/udm/sub/export [post]
+//	@Router			/ne/link/udm/sub/export [post]
 func (s *UDMSubController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	// 查询结果，根据查询条件结果，单页最大值限制
-	neId := c.Query("neId")
-	fileType := c.Query("type")
-	if neId == "" || fileType == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or type is empty"))
+	neUid := c.Query("neUid")
+	if c.Query("coreUid") == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid or neUid is empty"))
 		return
 	}
+	fileType := c.Query("type")
 	if !(fileType == "csv" || fileType == "txt") {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
 		return
@@ -490,8 +416,6 @@ func (s *UDMSubController) Export(c *gin.Context) {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
-
-	// rows := s.udmSubService.SelectList(model.UDMSubUser{NeId: neId})
 	if len(rows) <= 0 {
 		// 导出数据记录为空
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
@@ -499,7 +423,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 	}
 
 	// 文件名
-	fileName := fmt.Sprintf("udm_sub_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType)
+	fileName := fmt.Sprintf("udm_sub_user_export_%s_%d.%s", neUid, time.Now().UnixMilli(), fileType)
 	filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName)
 
 	if fileType == "csv" {
@@ -538,7 +462,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 //
 // POST /import
 //
-//	@Tags			ne_data/udm/sub
+//	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -546,11 +470,12 @@ func (s *UDMSubController) Export(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Import
 //	@Description	UDM Subscriber User Import
-//	@Router			/neData/udm/sub/import [post]
+//	@Router			/ne/link/udm/sub/import [post]
 func (s *UDMSubController) Import(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeId       string `json:"neId" binding:"required"`
+		CoreUID    string `json:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID      string `json:"neUid" binding:"required"`   // 网元唯一标识
 		UploadPath string `json:"uploadPath" binding:"required"`
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
@@ -565,15 +490,14 @@ func (s *UDMSubController) Import(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-
 	// 网元主机的SSH客户端
-	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -597,7 +521,7 @@ func (s *UDMSubController) Import(c *gin.Context) {
 	}
 
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -616,11 +540,11 @@ func (s *UDMSubController) Import(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		if strings.HasSuffix(body.UploadPath, ".csv") {
 			data := file.ReadFileCSV(localFilePath)
-			go s.udmSubService.InsertData(neInfo.NeId, "csv", data)
+			go s.udmSubService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data)
 		}
 		if strings.HasSuffix(body.UploadPath, ".txt") {
 			data := file.ReadFileTXTLine(",", localFilePath)
-			go s.udmSubService.InsertData(neInfo.NeId, "txt", data)
+			go s.udmSubService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data)
 		}
 	}
 	c.JSON(200, resp.OkMsg(data))

src/modules/ne_data/controller/udm_voip.go

@@ -15,14 +15,14 @@ import (
 	"be.ems/src/framework/utils/parse"
 	neService "be.ems/src/modules/ne/service"
 	"be.ems/src/modules/ne_data/model"
-	neDataService "be.ems/src/modules/ne_data/service"
+	"be.ems/src/modules/ne_data/service"
 
 	"github.com/gin-gonic/gin"
 )
 
 // 实例化控制层 UDMVOIPController 结构体
 var NewUDMVOIP = &UDMVOIPController{
-	udmVOIPService: neDataService.NewUDMVOIPUser,
+	udmVOIPService: service.NewUDMVOIPUser,
 	neInfoService:  neService.NewNeInfo,
 }
 
@@ -30,31 +30,36 @@ var NewUDMVOIP = &UDMVOIPController{
 //
 // PATH /udm/voip
 type UDMVOIPController struct {
-	udmVOIPService *neDataService.UDMVOIPUser // UDMVOIP信息服务
-	neInfoService  *neService.NeInfo          // 网元信息服务
+	udmVOIPService *service.UDMVOIPUser // UDMVOIP信息服务
+	neInfoService  *neService.NeInfo    // 网元信息服务
 }
 
 // UDMVOIP用户重载数据
 //
-// PUT /resetData/:neId
+// PUT /reset
 //
-//	@Tags			ne_data/udm/voip
+//	@Tags			network_data/udm/voip
 //	@Accept			json
 //	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(001)
+//	@Param			neUid	query		string	true	"NeUID"	default(001)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		UDM VOIP User Data Refresh
 //	@Description	UDM VOIP User Data List Refresh Synchronization Latest
-//	@Router			/neData/udm/voip/resetData/{neId} [put]
+//	@Router			/ne/link/udm/voip/reset [put]
 func (s *UDMVOIPController) ResetData(c *gin.Context) {
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	data := s.udmVOIPService.ResetData(neId)
+	data := s.udmVOIPService.ResetData(query.CoreUID, query.NeUID)
 	c.JSON(200, resp.OkData(data))
 }
 
@@ -62,10 +67,11 @@ func (s *UDMVOIPController) ResetData(c *gin.Context) {
 //
 // GET /list
 //
-//	@Tags			ne_data/udm/voip
+//	@Tags			network_data/udm/voip
 //	@Accept			json
 //	@Produce		json
-//	@Param			neId		query		string	true	"NE ID"	default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(001)
+//	@Param			neUid	query		string	true	"NeUID"	default(001)
 //	@Param			username		query		string	false	"User Name"
 //	@Param			pageNum		query		number	true	"pageNum"	default(1)
 //	@Param			pageSize	query		number	true	"pageSize"	default(10)
@@ -73,18 +79,18 @@ func (s *UDMVOIPController) ResetData(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VOIP User List
 //	@Description	UDM VOIP User List
-//	@Router			/neData/udm/voip/list [get]
+//	@Router			/ne/link/udm/voip/list [get]
 func (s *UDMVOIPController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	rows, total := s.udmVOIPService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
+	total, rows := s.udmVOIPService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // UDMVOIP用户信息
 //
-// GET /:neId/:username
+// GET /
 //
-//	@Tags			ne_data/udm/voip
+//	@Tags			network_data/udm/voip
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -93,24 +99,28 @@ func (s *UDMVOIPController) List(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VOIP User Information
 //	@Description	UDM VOIP User Information
-//	@Router			/neData/udm/voip/{neId}/{value} [get]
+//	@Router			/ne/link/udm/voip [get]
 func (s *UDMVOIPController) Info(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	username := c.Param("username")
-	if neId == "" || username == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or username is empty"))
+	var query struct {
+		CoreUID  string `form:"coreUid" binding:"required"`  // 核心网唯一标识
+		NeUID    string `form:"neUid" binding:"required"`    // 网元唯一标识
+		UserName string `form:"username" binding:"required"` // 用户名
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -118,7 +128,7 @@ func (s *UDMVOIPController) Info(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("dsp voip:username=%s", username)
+	cmd := fmt.Sprintf("dsp voip:username=%s", query.UserName)
 	data, err := telnet.ConvertToMap(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
@@ -131,9 +141,9 @@ func (s *UDMVOIPController) Info(c *gin.Context) {
 	}
 
 	// 解析返回的数据
-	u := s.udmVOIPService.ParseInfo(neId, data)
-	if u.ID != "" {
-		s.udmVOIPService.Insert(neId, u.UserName)
+	u := s.udmVOIPService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, data)
+	if u.ID > 0 {
+		s.udmVOIPService.Insert(neInfo.CoreUID, neInfo.NeUID, u.UserName)
 		c.JSON(200, resp.OkData(u))
 		return
 	}
@@ -142,9 +152,9 @@ func (s *UDMVOIPController) Info(c *gin.Context) {
 
 // UDMVOIP用户新增
 //
-// POST /:neId
+// POST /
 //
-//	@Tags			ne_data/udm/voip
+//	@Tags			network_data/udm/voip
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -153,12 +163,13 @@ func (s *UDMVOIPController) Info(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VOIP User Added
 //	@Description	UDM VOIP User Added
-//	@Router			/neData/udm/voip/{neId} [post]
+//	@Router			/ne/link/udm/voip  [post]
 func (s *UDMVOIPController) Add(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	// 传入数量大于0时，为批量新增
+	num := parse.Number(c.Query("num"))
+	if num < 1 {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: num is empty"))
 		return
 	}
 
@@ -173,20 +184,38 @@ func (s *UDMVOIPController) Add(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
+	// 批量新增
+	if num > 1 {
+		// 发送MML
+		cmd := fmt.Sprintf("baa voip:sub_num=%d,start_username=%s,password=%s", num, body.UserName, body.Password)
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmVOIPService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.UserName, num)
+		}
+		c.JSON(200, resp.OkData(data))
+		return
+	}
+
 	// 发送MML
 	cmd := fmt.Sprintf("add voip:username=%s,password=%s", body.UserName, body.Password)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
@@ -197,80 +226,16 @@ func (s *UDMVOIPController) Add(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		s.udmVOIPService.Insert(neId, body.UserName)
-	}
-	c.JSON(200, resp.OkData(data))
-}
-
-// UDMVOIP用户批量新增
-//
-// POST /:neId/:num
-//
-//	@Tags			ne_data/udm/voip
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			value	path		number	true	"Number of releases, value includes start username"
-//	@Param			data	body		object	true	"Request Param"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
-//	@Summary		UDM VOIP User Batch Add
-//	@Description	UDM VOIP User Batch Add
-//	@Router			/neData/udm/voip/{neId}/{value} [post]
-func (s *UDMVOIPController) Adds(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	num := c.Param("num")
-	if neId == "" || num == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or num is empty"))
-		return
-	}
-
-	var body model.UDMVOIPUser
-	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
-		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
-		return
-	}
-	if body.UserName == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: username is empty"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	// 发送MML
-	cmd := fmt.Sprintf("baa voip:sub_num=%s,start_username=%s,password=%s", num, body.UserName, body.Password)
-	data, err := telnet.ConvertToStr(telnetClient, cmd)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-
-	// 命令ok时
-	if strings.Contains(data, "ok") {
-		s.udmVOIPService.LoadData(neId, body.UserName, num)
+		s.udmVOIPService.Insert(neInfo.CoreUID, neInfo.NeUID, body.UserName)
 	}
 	c.JSON(200, resp.OkData(data))
 }
 
 // UDMVOIP用户删除
 //
-// DELETE /:neId/:username
+// DELETE /
 //
-//	@Tags			ne_data/udm/voip
+//	@Tags			network_data/udm/voip
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -279,38 +244,59 @@ func (s *UDMVOIPController) Adds(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VOIP User Deletion
 //	@Description	UDM VOIP User Deletion
-//	@Router			/neData/udm/voip/{neId}/{value} [delete]
+//	@Router			/ne/link/udm/voip [delete]
 func (s *UDMVOIPController) Remove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	username := c.Param("username")
-	if neId == "" || username == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or username is empty"))
+	var query struct {
+		CoreUID  string `form:"coreUid" binding:"required"`  // 核心网唯一标识
+		NeUID    string `form:"neUid" binding:"required"`    // 网元唯一标识
+		UserName string `form:"username" binding:"required"` // 用户名
+		Num      int64  `form:"num"`                         // 批量数量
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 处理字符转id数组后去重
-	usernameArr := strings.Split(username, ",")
-	uniqueIDs := parse.RemoveDuplicates(usernameArr)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, resp.Err(nil))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
+	if query.Num > 1 {
+		// 发送MML
+		cmd := fmt.Sprintf("bde voip:start_username=%s,sub_num=%d", query.UserName, query.Num)
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmVOIPService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.UserName, query.Num)
+		}
+		c.JSON(200, resp.OkData(data))
+		return
+	}
+
+	// 处理字符转id数组后去重
+	imsiArr := strings.Split(query.UserName, ",")
+	uniqueIDs := parse.RemoveDuplicates(imsiArr)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, resp.Err(nil))
+		return
+	}
 	resultData := map[string]string{}
 	for _, v := range uniqueIDs {
 		// 发送MML
@@ -322,7 +308,7 @@ func (s *UDMVOIPController) Remove(c *gin.Context) {
 		}
 		// 命令ok时
 		if strings.Contains(data, "ok") {
-			s.udmVOIPService.Delete(v, neId)
+			s.udmVOIPService.Delete(neInfo.CoreUID, neInfo.NeUID, v)
 		}
 		resultData[v] = data
 	}
@@ -330,65 +316,11 @@ func (s *UDMVOIPController) Remove(c *gin.Context) {
 	c.JSON(200, resp.OkData(resultData))
 }
 
-// UDMVOIP用户批量删除
-//
-// DELETE /:neId/:username/:num
-//
-//	@Tags			ne_data/udm/voip
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			username	path		string	true	"User Name"
-//	@Param			num		path		number	true	"Number of releases, value includes start username"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
-//	@Summary		UDM VOIP User Batch Deletion
-//	@Description	UDM VOIP User Batch Deletion
-//	@Router			/neData/udm/voip/{neId}/{username}/{num} [delete]
-func (s *UDMVOIPController) Removes(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	username := c.Param("username")
-	num := c.Param("num")
-	if neId == "" || username == "" || num == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/username/num is empty"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	// 发送MML
-	cmd := fmt.Sprintf("bde voip:start_username=%s,sub_num=%s", username, num)
-	data, err := telnet.ConvertToStr(telnetClient, cmd)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-
-	// 命令ok时
-	if strings.Contains(data, "ok") {
-		s.udmVOIPService.LoadData(neId, username, num)
-	}
-	c.JSON(200, resp.OkData(data))
-}
-
 // UDMVOIP用户导出
 //
 // GET /export
 //
-//	@Tags			ne_data/udm/voip
+//	@Tags			network_data/udm/voip
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId		query		string	true	"NE ID"		default(001)
@@ -400,7 +332,7 @@ func (s *UDMVOIPController) Removes(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VOIP User Export
 //	@Description	UDM VOIP User Export
-//	@Router			/neData/udm/voip/export [get]
+//	@Router			/ne/link/udm/voip/export [get]
 func (s *UDMVOIPController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
@@ -468,7 +400,7 @@ func (s *UDMVOIPController) Export(c *gin.Context) {
 //
 // POST /import
 //
-//	@Tags			ne_data/udm/voip
+//	@Tags			network_data/udm/voip
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -476,11 +408,12 @@ func (s *UDMVOIPController) Export(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VOIP User Import
 //	@Description	UDM VOIP User Import
-//	@Router			/neData/udm/voip/import [post]
+//	@Router			/ne/link/udm/voip/import [post]
 func (s *UDMVOIPController) Import(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeId       string `json:"neId" binding:"required"`       // 网元ID
+		CoreUID    string `json:"coreUid" binding:"required"`    // 核心网唯一标识
+		NeUID      string `json:"neUid" binding:"required"`      // 网元唯一标识
 		UploadPath string `json:"uploadPath" binding:"required"` // 上传文件路径
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
@@ -495,15 +428,14 @@ func (s *UDMVOIPController) Import(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-
 	// 网元主机的SSH客户端
-	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -527,7 +459,7 @@ func (s *UDMVOIPController) Import(c *gin.Context) {
 	}
 
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -550,11 +482,11 @@ func (s *UDMVOIPController) Import(c *gin.Context) {
 	if strings.Contains(resultMsg, "ok") {
 		if strings.HasSuffix(body.UploadPath, ".csv") {
 			data := file.ReadFileCSV(localFilePath)
-			go s.udmVOIPService.InsertData(neInfo.NeId, "csv", data)
+			go s.udmVOIPService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data)
 		}
 		if strings.HasSuffix(body.UploadPath, ".txt") {
 			data := file.ReadFileTXTLine(",", localFilePath)
-			go s.udmVOIPService.InsertData(neInfo.NeId, "txt", data)
+			go s.udmVOIPService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data)
 		}
 	}
 	c.JSON(200, resp.OkMsg(resultMsg))

src/modules/ne_data/controller/udm_volte_ims.go

@@ -15,14 +15,14 @@ import (
 	"be.ems/src/framework/utils/parse"
 	neService "be.ems/src/modules/ne/service"
 	"be.ems/src/modules/ne_data/model"
-	neDataService "be.ems/src/modules/ne_data/service"
+	"be.ems/src/modules/ne_data/service"
 
 	"github.com/gin-gonic/gin"
 )
 
 // 实例化控制层 UDMVolteIMSController 结构体
 var NewUDMVolteIMS = &UDMVolteIMSController{
-	udmVolteIMSService: neDataService.NewUDMVolteIMSUser,
+	udmVolteIMSService: service.NewUDMVolteIMSUser,
 	neInfoService:      neService.NewNeInfo,
 }
 
@@ -30,31 +30,36 @@ var NewUDMVolteIMS = &UDMVolteIMSController{
 //
 // PATH /udm/volte-ims
 type UDMVolteIMSController struct {
-	udmVolteIMSService *neDataService.UDMVolteIMSUser // UDMVolteIMS信息服务
-	neInfoService      *neService.NeInfo              // 网元信息服务
+	udmVolteIMSService *service.UDMVolteIMSUser // UDMVolteIMS信息服务
+	neInfoService      *neService.NeInfo        // 网元信息服务
 }
 
 // UDMVolteIMS用户重载数据
 //
-// PUT /resetData/:neId
+// PUT /reset
 //
-//	@Tags			ne_data/udm/volte-ims
+//	@Tags			network_data/udm/volte-ims
 //	@Accept			json
 //	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(001)
+//	@Param			neUid	query		string	true	"NeUID"	default(001)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		UDM VolteIMS User Data Refresh
 //	@Description	UDM Authenticated User Data List Refresh Synchronization Latest
-//	@Router			/neData/udm/volte-ims/resetData/{neId} [put]
+//	@Router			/ne/link/udm/volte-ims/reset [put]
 func (s *UDMVolteIMSController) ResetData(c *gin.Context) {
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	data := s.udmVolteIMSService.ResetData(neId)
+	data := s.udmVolteIMSService.ResetData(query.CoreUID, query.NeUID)
 	c.JSON(200, resp.OkData(data))
 }
 
@@ -62,7 +67,7 @@ func (s *UDMVolteIMSController) ResetData(c *gin.Context) {
 //
 // GET /list
 //
-//	@Tags			ne_data/udm/volte-ims
+//	@Tags			network_data/udm/volte-ims
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId		query		string	true	"NE ID"	default(001)
@@ -73,18 +78,18 @@ func (s *UDMVolteIMSController) ResetData(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VolteIMS User List
 //	@Description	UDM VolteIMS User List
-//	@Router			/neData/udm/volte-ims/list [get]
+//	@Router			/ne/link/udm/volte-ims/list [get]
 func (s *UDMVolteIMSController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
-	rows, total := s.udmVolteIMSService.FindByPage(query)
-	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
+	total, rows := s.udmVolteIMSService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // UDMVolteIMS用户信息
 //
-// GET /:neId/:imsi
+// GET /
 //
-//	@Tags			ne_data/udm/volte-ims
+//	@Tags			network_data/udm/volte-ims
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -94,34 +99,30 @@ func (s *UDMVolteIMSController) List(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VolteIMS User Information
 //	@Description	UDM VolteIMS User Information
-//	@Router			/neData/udm/volte-ims/{neId}/{value} [get]
+//	@Router			/ne/link/udm/volte-ims [get]
 func (s *UDMVolteIMSController) Info(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi := c.Param("imsi")
-	msisdn := c.Query("msisdn")
-	volte := c.Query("volte")
-	if neId == "" || imsi == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId or imsi is empty"))
-		return
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"`         // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`           // 网元唯一标识
+		IMSI    string `form:"imsi" binding:"required"`            // IMSi
+		MSISDN  string `form:"msisdn" binding:"required"`          // MSISDN
+		Volte   string `form:"volte" binding:"required,oneof=0 1"` // Volte
 	}
-	if msisdn == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: msisdn is required"))
-		return
-	}
-	if volte == "" || !(volte == "0" || volte == "1") {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: volte is required"))
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -129,7 +130,7 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) {
 	defer telnetClient.Close()
 
 	// 发送MML
-	cmd := fmt.Sprintf("dsp imsuser:imsi=%s,msisdn=%s,volte=%s", imsi, msisdn, volte)
+	cmd := fmt.Sprintf("dsp imsuser:imsi=%s,msisdn=%s,volte=%s", query.IMSI, query.MSISDN, query.Volte)
 	data, err := telnet.ConvertToMap(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
@@ -142,9 +143,9 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) {
 	}
 
 	// 解析返回的数据
-	u := s.udmVolteIMSService.ParseInfo(neId, data)
-	if u.ID != "" {
-		s.udmVolteIMSService.InsertByIMSI(imsi, neId)
+	u := s.udmVolteIMSService.ParseInfo(neInfo.CoreUID, neInfo.NeUID, data)
+	if u.ID > 0 {
+		s.udmVolteIMSService.InsertByIMSI(neInfo.CoreUID, neInfo.NeUID, query.IMSI)
 		c.JSON(200, resp.OkData(u))
 		return
 	}
@@ -153,9 +154,9 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) {
 
 // UDMVolteIMS用户新增
 //
-// POST /:neId
+// POST /
 //
-//	@Tags			ne_data/udm/volte-ims
+//	@Tags			network_data/udm/volte-ims
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	path		string	true	"NE ID"	default(001)
@@ -164,12 +165,13 @@ func (s *UDMVolteIMSController) Info(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM VolteIMS User Added
 //	@Description	UDM VolteIMS User Added If VoIP tag=0, then MSISDN and IMSI need to be the same.
-//	@Router			/neData/udm/volte-ims/{neId} [post]
+//	@Router			/ne/link/udm/volte-ims [post]
 func (s *UDMVolteIMSController) Add(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	// 传入数量大于0时，为批量新增
+	num := parse.Number(c.Query("num"))
+	if num < 0 {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: num is less than 0"))
 		return
 	}
 
@@ -184,22 +186,40 @@ func (s *UDMVolteIMSController) Add(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
+	// 批量新增
+	if num > 1 {
+		// 发送MML
+		cmd := fmt.Sprintf("baa imsuser:sub_num=%d,start_imsi=%s,start_msisdn=%s,volte=%s,vni=%s", num, body.IMSI, body.MSISDN, body.Tag, body.VNI)
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmVolteIMSService.LoadData(neInfo.CoreUID, neInfo.NeUID, body.IMSI, num)
+		}
+		c.JSON(200, resp.OkData(data))
+		return
+	}
+
 	// 检查同IMSI下msisdn是否存在
-	hasMsisdns := s.udmVolteIMSService.Find(model.UDMVolteIMSUser{IMSI: body.IMSI, MSISDN: body.MSISDN, NeId: neId})
+	hasMsisdns := s.udmVolteIMSService.Find(model.UDMVolteIMSUser{IMSI: body.IMSI, MSISDN: body.MSISDN, NeUID: neInfo.NeUID})
 	if len(hasMsisdns) > 0 {
 		c.JSON(200, resp.ErrMsg("IMSI and MSISDN already exist"))
 		return
@@ -215,217 +235,92 @@ func (s *UDMVolteIMSController) Add(c *gin.Context) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		s.udmVolteIMSService.InsertByIMSI(body.IMSI, neId)
-	}
-	c.JSON(200, resp.OkData(data))
-}
-
-// UDMVolteIMS用户批量新增
-//
-// POST /:neId/:num
-//
-//	@Tags			ne_data/udm/volte-ims
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			value	path		number	true	"Number of releases, value includes start imsi"
-//	@Param			data	body		object	true	"Request Param"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
-//	@Summary		UDM VolteIMS User Batch Add
-//	@Description	UDM VolteIMS User Batch Add
-//	@Router			/neData/udm/volte-ims/{neId}/{value} [post]
-func (s *UDMVolteIMSController) Adds(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	num := c.Param("num")
-	if neId == "" || num == "" {
-		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-		return
-	}
-
-	var body model.UDMVolteIMSUser
-	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
-		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
-		return
-	}
-	if body.IMSI == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: imsi is empty"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	// 发送MML
-	cmd := fmt.Sprintf("baa imsuser:sub_num=%s,start_imsi=%s,start_msisdn=%s,volte=%s,vni=%s", num, body.IMSI, body.MSISDN, body.Tag, body.VNI)
-	data, err := telnet.ConvertToStr(telnetClient, cmd)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-
-	// 命令ok时
-	if strings.Contains(data, "ok") {
-		s.udmVolteIMSService.LoadData(neId, body.IMSI, num)
+		s.udmVolteIMSService.InsertByIMSI(neInfo.CoreUID, neInfo.NeUID, body.IMSI)
 	}
 	c.JSON(200, resp.OkData(data))
 }
 
 // UDMVolteIMS用户删除
 //
-// DELETE /:neId/:imsi
+// DELETE /
 //
-//	@Tags			ne_data/udm/volte-ims
+//	@Tags			network_data/udm/volte-ims
 //	@Accept			json
 //	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			value	path		string	true	"IMSI, multiple separated by a , sign"
+//	@Param			coreUid	query		string	true	"CoreUID"	default(001)
+//	@Param			neUid	query		string	true	"NeUID"	default(001)
+//	@Param			imsi	query		string	true	"IMSI"
+//	@Param			num		query		number	true	"Number of releases, value includes start imsi"
 //	@Param			msisdn		query		string	false	"MSISDN"
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
-//	@Summary		UDM Authenticated User Deletion
-//	@Description	UDM Authenticated User Deletion
-//	@Router			/neData/udm/volte-ims/{neId}/{value} [delete]
-func (s *UDMVolteIMSController) Remove(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi_msisdn := c.Param("imsi")
-	volte := c.Query("volte")
-	if neId == "" || imsi_msisdn == "" {
-		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-		return
-	}
-	if volte == "" || !(volte == "0" || volte == "1") {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: volte is required"))
-		return
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
-	if err != nil {
-		c.JSON(200, resp.ErrMsg(err.Error()))
-		return
-	}
-	defer telnetClient.Close()
-
-	imsiArr := strings.Split(imsi_msisdn, ",")
-	// 处理字符转id数组后去重
-	uniqueIDs := parse.RemoveDuplicates(imsiArr)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, resp.Err(nil))
-		return
-	}
-	resultData := map[string]string{}
-	for _, im := range uniqueIDs {
-		imArr := strings.SplitN(im, "_", 2)
-		if len(imArr) != 2 {
-			resultData[im] = "format should be imsi_msisdn"
-			continue
-		}
-		// 发送MML
-		cmd := fmt.Sprintf("del imsuser:imsi=%s,msisdn=%s,volte=%s", imArr[0], imArr[1], volte)
-		data, err := telnet.ConvertToStr(telnetClient, cmd)
-		if err != nil {
-			resultData[im] = err.Error()
-			continue
-		}
-		// 命令ok时
-		if strings.Contains(data, "ok") {
-			s.udmVolteIMSService.Delete(imArr[0], neId)
-		}
-		resultData[im] = data
-	}
-	c.JSON(200, resp.OkData(resultData))
-}
-
-// UDMVolteIMS用户批量删除
-//
-// DELETE /:neId/:imsi/:num
-//
-//	@Tags			ne_data/udm/volte-ims
-//	@Accept			json
-//	@Produce		json
-//	@Param			neId	path		string	true	"NE ID"	default(001)
-//	@Param			imsi	path		string	true	"IMSI"
-//	@Param			num		path		number	true	"Number of releases, value includes start imsi"
-//	@Success		200		{object}	object	"Response Results"
-//	@Security		TokenAuth
 //	@Summary		UDM VolteIMS User Batch Deletion
 //	@Description	UDM VolteIMS User Batch Deletion
-//	@Router			/neData/udm/volte-ims/{neId}/{imsi}/{num} [delete]
-func (s *UDMVolteIMSController) Removes(c *gin.Context) {
+//	@Router			/ne/link/udm/volte-ims [delete]
+func (s *UDMVolteIMSController) Remove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	neId := c.Param("neId")
-	imsi_msisdn := c.Param("imsi")
-	num := c.Param("num")
-	volte := c.Query("volte")
-	if neId == "" || imsi_msisdn == "" || num == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId/imsi/num is empty"))
-		return
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"`         // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`           // 网元唯一标识
+		IMSI    string `form:"imsi" binding:"required"`            // IMSi, 带数量时为批量
+		MSISDN  string `form:"msisdn" binding:"required"`          // MSISDN, 带数量时为批量
+		Volte   string `form:"volte" binding:"required,oneof=0 1"` // volte
+		Num     int64  `form:"num"`                                // 批量数量
 	}
-	if volte == "" || !(volte == "0" || volte == "1") {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: volte is required"))
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
-	if neInfo.NeId != neId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(query.CoreUID, query.NeUID)
+	if neInfo.CoreUID != query.CoreUID || neInfo.NeUID != query.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
 
-	imArr := strings.SplitN(imsi_msisdn, "_", 2)
-	if len(imArr) != 2 {
-		c.JSON(200, resp.ErrMsg("format should be imsi_msisdn"))
+	// 批量更新
+	if query.Num > 1 {
+		// 发送MML
+		cmd := ""
+		if query.Volte == "0" {
+			cmd = fmt.Sprintf("bde imsuser:start_msisdn=%s,sub_num=%d,volte=0", query.MSISDN, query.Num)
+		}
+		if query.Volte == "1" {
+			cmd = fmt.Sprintf("bde imsuser:start_imsi=%s,start_msisdn=%s,sub_num=%d,volte=1", query.IMSI, query.MSISDN, query.Num)
+		}
+		data, err := telnet.ConvertToStr(telnetClient, cmd)
+		if err != nil {
+			c.JSON(200, resp.ErrMsg(err.Error()))
+			return
+		}
+
+		// 命令ok时
+		if strings.Contains(data, "ok") {
+			s.udmVolteIMSService.LoadData(neInfo.CoreUID, neInfo.NeUID, query.IMSI, query.Num)
+		}
+		c.JSON(200, resp.OkData(data))
 		return
 	}
-	imsi := imArr[0]
-	msisdn := imArr[1]
 
 	// 发送MML
-	cmd := ""
-	if volte == "0" {
-		cmd = fmt.Sprintf("bde imsuser:start_msisdn=%s,sub_num=%s,volte=0", msisdn, num)
-	}
-	if volte == "1" {
-		cmd = fmt.Sprintf("bde imsuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,volte=1", imsi, msisdn, num)
-	}
+	cmd := fmt.Sprintf("del imsuser:imsi=%s,msisdn=%s,volte=%s", query.IMSI, query.MSISDN, query.Volte)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
-
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		s.udmVolteIMSService.LoadData(neId, imsi, num)
+		s.udmVolteIMSService.Delete(neInfo.CoreUID, neInfo.NeUID, query.IMSI)
 	}
 	c.JSON(200, resp.OkData(data))
 }
@@ -434,10 +329,11 @@ func (s *UDMVolteIMSController) Removes(c *gin.Context) {
 //
 // GET /export
 //
-//	@Tags			ne_data/udm/volte-ims
+//	@Tags			network_data/udm/volte-ims
 //	@Accept			json
 //	@Produce		json
-//	@Param			neId		query		string	true	"NE ID"		default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(001)
+//	@Param			neUid	query		string	true	"NeUID"	default(001)
 //	@Param			type		query		string	true	"File Type"	Enums(csv,txt)	default(txt)
 //	@Param			imsi		query		string	false	"IMSI"
 //	@Param			pageNum		query		number	true	"pageNum"	default(1)
@@ -446,16 +342,15 @@ func (s *UDMVolteIMSController) Removes(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authenticated User Export
 //	@Description	UDM Authenticated User Export
-//	@Router			/neData/udm/volte-ims/export [get]
+//	@Router			/ne/link/udm/volte-ims/export [get]
 func (s *UDMVolteIMSController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	// 查询结果，根据查询条件结果，单页最大值限制
-	neId := c.Query("neId")
-	fileType := c.Query("type")
-	if neId == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: neId is empty"))
+	neUid := c.Query("neUid")
+	if c.Query("coreUid") == "" || neUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid or neUid is empty"))
 		return
 	}
+	fileType := c.Query("type")
 	if !(fileType == "csv" || fileType == "txt") {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
 		return
@@ -475,7 +370,7 @@ func (s *UDMVolteIMSController) Export(c *gin.Context) {
 	}
 
 	// 文件名
-	fileName := fmt.Sprintf("udm_volte_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType)
+	fileName := fmt.Sprintf("udm_volte_user_export_%s_%d.%s", neUid, time.Now().UnixMilli(), fileType)
 	filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName)
 
 	if fileType == "csv" {
@@ -512,7 +407,7 @@ func (s *UDMVolteIMSController) Export(c *gin.Context) {
 //
 // POST /import
 //
-//	@Tags			ne_data/udm/volte-ims
+//	@Tags			network_data/udm/volte-ims
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -520,11 +415,12 @@ func (s *UDMVolteIMSController) Export(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		UDM Authenticated User Import
 //	@Description	UDM Authenticated User Import
-//	@Router			/neData/udm/volte-ims/import [post]
+//	@Router			/ne/link/udm/volte-ims/import [post]
 func (s *UDMVolteIMSController) Import(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeId       string `json:"neId" binding:"required"`       // 网元ID
+		CoreUID    string `json:"coreUid" binding:"required"`    // 核心网唯一标识
+		NeUID      string `json:"neUid" binding:"required"`      // 网元唯一标识
 		UploadPath string `json:"uploadPath" binding:"required"` // 上传文件路径
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
@@ -539,15 +435,14 @@ func (s *UDMVolteIMSController) Import(c *gin.Context) {
 		return
 	}
 
-	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
+	// 查询网元信息
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neInfo.CoreUID != body.CoreUID || neInfo.NeUID != body.NeUID || neInfo.NeType != "UDM" {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
-
 	// 网元主机的SSH客户端
-	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -571,7 +466,7 @@ func (s *UDMVolteIMSController) Import(c *gin.Context) {
 	}
 
 	// 网元主机的Telnet客户端
-	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1)
+	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.CoreUID, neInfo.NeUID, 1)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -594,11 +489,11 @@ func (s *UDMVolteIMSController) Import(c *gin.Context) {
 	if strings.Contains(resultMsg, "ok") {
 		if strings.HasSuffix(body.UploadPath, ".csv") {
 			data := file.ReadFileCSV(localFilePath)
-			go s.udmVolteIMSService.InsertData(neInfo.NeId, "csv", data)
+			go s.udmVolteIMSService.InsertData(neInfo.CoreUID, neInfo.NeUID, "csv", data)
 		}
 		if strings.HasSuffix(body.UploadPath, ".txt") {
 			data := file.ReadFileTXTLine(",", localFilePath)
-			go s.udmVolteIMSService.InsertData(neInfo.NeId, "txt", data)
+			go s.udmVolteIMSService.InsertData(neInfo.CoreUID, neInfo.NeUID, "txt", data)
 		}
 	}
 	c.JSON(200, resp.OkMsg(resultMsg))

src/modules/ne_data/controller/upf.go

@@ -31,7 +31,7 @@ type UPFController struct {
 //
 // GET /flow-total
 //
-//	@Tags			ne_data/upf
+//	@Tags			network_data/upf
 //	@Accept			json
 //	@Produce		json
 //	@Param			neId	query		string	true	"NE ID"									default(001)
@@ -40,26 +40,32 @@ type UPFController struct {
 //	@Security		TokenAuth
 //	@Summary		Total number of flows N3 upstream N6 downstream
 //	@Description	Total number of flows N3 upstream N6 downstream
-//	@Router			/neData/upf/flow-total [get]
+//	@Router			/ne/link/upf/flow-total [get]
 func (s UPFController) FlowTotal(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
-		NeID string `form:"neId" binding:"required"`
-		Day  int    `form:"day"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		Day     int    `form:"day"`
 	}
-	if err := c.ShouldBindQuery(&querys); querys.Day < 0 || err != nil {
+	if err := c.ShouldBindQuery(&querys); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
 		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_PARSER, errMsgs))
 		return
 	}
 
+	if querys.Day < 0 || querys.Day > 30 {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "day must be between 0 and 30"))
+		return
+	}
+
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID("UPF", querys.NeID)
-	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neInfo.CoreUID != querys.CoreUID || neInfo.NeUID != querys.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
-	up, down := s.kpiReportService.UPFTodayFlowFind(neInfo.RmUID, querys.Day)
+	up, down := s.kpiReportService.UPFTodayFlowFind(neInfo.NeUID, querys.Day)
 	c.JSON(200, resp.OkData(map[string]int64{"up": up, "down": down}))
 }

src/modules/ne_data/model/alarm.go

@@ -3,11 +3,9 @@ package model
 // Alarm 告警记录
 type Alarm struct {
 	ID                int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	CoreUID           string `json:"coreUid" gorm:"column:core_uid"`                      // 核心网唯一标识
+	NeUID             string `json:"neUid" gorm:"column:ne_uid"`                          // 网元唯一标识
 	NeType            string `json:"neType" gorm:"column:ne_type"`                        // 网元类型
-	NeId              string `json:"neId" gorm:"column:ne_id"`                            // 网元ID
-	NeName            string `json:"neName" gorm:"column:ne_name"`                        // 网元名称
-	Province          string `json:"province" gorm:"column:province"`                     // 网元省份地域
-	PvFlag            string `json:"pvFlag" gorm:"column:pv_flag"`                        // 网元标识虚拟化标识
 	AlarmSeq          int64  `json:"alarmSeq" gorm:"column:alarm_seq"`                    // 告警序号 连续递增
 	AlarmId           string `json:"alarmId" gorm:"column:alarm_id"`                      // 告警ID
 	AlarmTitle        string `json:"alarmTitle" gorm:"column:alarm_title"`                // 告警标题
@@ -30,7 +28,7 @@ type Alarm struct {
 	ClearType         string `json:"clearType" gorm:"column:clear_type"`                  // 清除状态
 	ClearTime         int64  `json:"clearTime" gorm:"column:clear_time"`                  // 清除时间
 	ClearUser         string `json:"clearUser" gorm:"column:clear_user"`                  // 清除用户
-	Timestamp         int64  `json:"timestamp" gorm:"column:timestamp"`                   // 创建时间
+	CreatedAt         int64  `json:"createdAt" gorm:"column:created_at"`                  // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -40,10 +38,9 @@ func (*Alarm) TableName() string {
 
 // AlarmQuery 告警数据查询参数结构体
 type AlarmQuery struct {
-	NeType       string `json:"neType" form:"neType"` // 网元类型
-	NeID         string `json:"neId" form:"neId"`     // 网元ID
-	NeName       string `json:"neName" form:"neName"`
-	PvFlag       string `json:"pvFlag" form:"pvFlag"`
+	CoreUID      string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+	NeUID        string `json:"neUid" form:"neUid"`                        // 网元唯一标识
+	NeType       string `json:"neType" form:"neType"`                      // 网元类型
 	AlarmCode    string `json:"alarmCode" form:"alarmCode"`
 	AlarmType    string `json:"alarmType" form:"alarmType"`
 	AlarmStatus  string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=Clear Active"` // 告警状态

src/modules/ne_data/model/alarm_event.go

@@ -3,9 +3,10 @@ package model
 // AlarmEvent 告警_事件记录表
 type AlarmEvent struct {
 	ID                int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	CoreUID           string `json:"coreUid" gorm:"column:core_uid"`                      // 核心网唯一标识
+	NeUID             string `json:"neUid" gorm:"column:ne_uid"`                          // 网元唯一标识
 	NeType            string `json:"neType" gorm:"column:ne_type"`                        // 网元类型
-	NeId              string `json:"neId" gorm:"column:ne_id"`                            // 网元ID
-	AlarmSeq          int64  `json:"alarmSeq" gorm:"column:alarm_seq"`                    // 告警序号 同网元类型连续递增
+	AlarmSeq          int64  `json:"alarmSeq" gorm:"column:alarm_seq"`                    // 告警序号 连续递增
 	AlarmId           string `json:"alarmId" gorm:"column:alarm_id"`                      // 告警ID
 	AlarmTitle        string `json:"alarmTitle" gorm:"column:alarm_title"`                // 告警标题
 	AlarmCode         int64  `json:"alarmCode" gorm:"column:alarm_code"`                  // 告警状态码
@@ -21,7 +22,7 @@ type AlarmEvent struct {
 	ClearType         string `json:"clearType" gorm:"column:clear_type"`                  // 清除状态
 	ClearTime         int64  `json:"clearTime" gorm:"column:clear_time"`                  // 清除时间
 	ClearUser         string `json:"clearUser" gorm:"column:clear_user"`                  // 清除用户
-	Timestamp         int64  `json:"timestamp" gorm:"column:timestamp"`                   // 创建时间
+	CreatedAt         int64  `json:"createdAt" gorm:"column:created_at"`                  // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -31,8 +32,9 @@ func (*AlarmEvent) TableName() string {
 
 // AlarmEventQuery 告警事件数据查询参数结构体
 type AlarmEventQuery struct {
-	NeType      string `json:"neType" form:"neType"` // 网元类型
-	NeID        string `json:"neId" form:"neId"`     // 网元ID
+	CoreUID     string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+	NeUID       string `json:"neUid" form:"neUid"`                        // 网元唯一标识
+	NeType      string `json:"neType" form:"neType"`                      // 网元类型
 	AlarmCode   string `json:"alarmCode" form:"alarmCode"`
 	AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=Clear Active"` // 告警状态
 	BeginTime   int64  `json:"beginTime" form:"beginTime"`                                            // 开始时间 查event_time

src/modules/ne_data/model/alarm_forward_log.go

@@ -3,8 +3,9 @@ package model
 // AlarmForwardLog 告警_转发日志记录
 type AlarmForwardLog struct {
 	ID           int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType       string `json:"neType" gorm:"column:ne_type"`
-	NeId         string `json:"neId" gorm:"column:ne_id"`
+	CoreUID      string `json:"coreUid" gorm:"column:core_uid"`           // 核心网唯一标识
+	NeUID        string `json:"neUid" gorm:"column:ne_uid"`               // 网元唯一标识
+	NeType       string `json:"neType" gorm:"column:ne_type"`             // 网元类型
 	AlarmSeq     int64  `json:"alarmSeq" gorm:"column:alarm_seq"`         // 告警序号 连续递增
 	AlarmId      string `json:"alarmId" gorm:"column:alarm_id"`           // 告警ID
 	AlarmCode    int64  `json:"alarmCode" gorm:"column:alarm_code"`       // 告警状态码
@@ -26,9 +27,10 @@ func (*AlarmForwardLog) TableName() string {
 
 // AlarmForwardLogQuery 告警转发日志数据查询参数结构体
 type AlarmForwardLogQuery struct {
-	NeType    string `json:"neType" form:"neType"`       // 网元类型
-	NeID      string `json:"neId" form:"neId"`           // 网元ID
-	BeginTime int64  `json:"beginTime" form:"beginTime"` // 开始时间
+	CoreUID   string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+	NeUID     string `json:"neUid" form:"neUid"`                        // 网元唯一标识
+	NeType    string `json:"neType" form:"neType"`                      // 网元类型
+	BeginTime int64  `json:"beginTime" form:"beginTime"`                // 开始时间
 	EndTime   int64  `json:"endTime" form:"endTime"`
 	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=event_time id"` // 排序字段，填写结果字段
 	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`      // 排序升降序，asc desc

src/modules/ne_data/model/alarm_log.go

@@ -3,8 +3,9 @@ package model
 // AlarmLog 告警_日志记录
 type AlarmLog struct {
 	ID           int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType       string `json:"neType" gorm:"column:ne_type"`
-	NeId         string `json:"neId" gorm:"column:ne_id"`
+	CoreUID      string `json:"coreUid" gorm:"column:core_uid"`           // 核心网唯一标识
+	NeUID        string `json:"neUid" gorm:"column:ne_uid"`               // 网元唯一标识
+	NeType       string `json:"neType" gorm:"column:ne_type"`             // 网元类型
 	AlarmSeq     int64  `json:"alarmSeq" gorm:"column:alarm_seq"`         // 告警序号 连续递增
 	AlarmId      string `json:"alarmId" gorm:"column:alarm_id"`           // 告警ID
 	AlarmCode    int64  `json:"alarmCode" gorm:"column:alarm_code"`       // 告警状态码
@@ -23,8 +24,9 @@ func (*AlarmLog) TableName() string {
 
 // AlarmLogQuery 告警日志数据查询参数结构体
 type AlarmLogQuery struct {
+	CoreUID      string `json:"coreUid" form:"coreUid" binding:"required"`                             // 核心网唯一标识
+	NeUID        string `json:"neUid" form:"neUid"`                                                    // 网元唯一标识
 	NeType       string `json:"neType" form:"neType"`                                                  // 网元类型
-	NeID         string `json:"neId" form:"neId"`                                                      // 网元ID
 	AlarmStatus  string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=Clear Active"` // 告警状态
 	OrigSeverity string `json:"origSeverity" form:"origSeverity"`                                      // 告警类型
 	BeginTime    int64  `json:"beginTime" form:"beginTime"`                                            // 开始时间 查event_time

src/modules/ne_data/model/cdr_event.go

@@ -3,9 +3,9 @@ package model
 // CDREvent CDR会话对象 cdr_event
 type CDREvent struct {
 	ID        int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType    string `json:"neType" gorm:"column:ne_type"`
-	NeName    string `json:"neName" gorm:"column:ne_name"`
-	RmUid     string `json:"rmUid" gorm:"column:rm_uid"`         // 可能没有
+	CoreUID   string `json:"coreUid" gorm:"column:core_uid"`     // 核心网唯一标识
+	NeUID     string `json:"neUid" gorm:"column:ne_uid"`         // 网元唯一标识
+	NeType    string `json:"neType" gorm:"column:ne_type"`       // 网元类型
 	Timestamp int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到的timestamp秒级存储毫秒时间戳
 	CdrJson   string `json:"cdrJSON" gorm:"column:cdr_json"`     // data JSON String
 	CreatedAt int64  `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒

src/modules/ne_data/model/kpi_c_report.go

@@ -22,9 +22,9 @@ func (*KpiCTitle) TableName() string {
 // KpiCReport 自定义指标报表信息对象
 type KpiCReport struct {
 	ID          int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType      string `json:"neType" gorm:"column:ne_type"`
-	NeName      string `json:"neName" gorm:"column:ne_name"`
-	RmUid       string `json:"rmUid" gorm:"column:rm_uid"`
+	CoreUID     string `json:"coreUid" gorm:"column:core_uid"`        // 核心网唯一标识
+	NeUID       string `json:"neUid" gorm:"column:ne_uid"`            // 网元唯一标识
+	NeType      string `json:"neType" gorm:"column:ne_type"`          // 网元类型
 	Date        string `json:"date" gorm:"column:date"`               // Date of the report yyyy-mm-dd hh:mi:ss
 	StartTime   string `json:"startTime" gorm:"column:start_time"`    // Start time of the report hh:mi:ss
 	EndTime     string `json:"endTime" gorm:"column:end_time"`        // End time of the report hh:mi:ss
@@ -41,10 +41,11 @@ func (*KpiCReport) TableName() string {
 
 // KPICQuery 指标查询参数结构体
 type KPICQuery struct {
-	NeType    string `form:"neType" binding:"required"`
-	NeID      string `form:"neId" binding:"required"`
-	BeginTime int64  `form:"beginTime" binding:"required"` // 开始时间戳（毫秒）1739361200999
-	EndTime   int64  `form:"endTime" binding:"required"`   // 结束时间戳（毫秒）1739361210088
+	CoreUID   string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+	NeUID     string `json:"neUid" form:"neUid" binding:"required"`     // 网元唯一标识
+	NeType    string `json:"neType" form:"neType" binding:"required"`   // 网元类型
+	BeginTime int64  `form:"beginTime" binding:"required"`              // 开始时间戳（毫秒）1739361200999
+	EndTime   int64  `form:"endTime" binding:"required"`                // 结束时间戳（毫秒）1739361210088
 	Interval  int64  `form:"interval" binding:"required,oneof=5 60 300 900 1800 3600"`
 	RmUID     string `form:"rmUID"`
 	SortField string `form:"sortField" binding:"omitempty,oneof=timeGroup"`

src/modules/ne_data/model/kpi_report.go

@@ -19,9 +19,9 @@ func (*KpiTitle) TableName() string {
 // KpiReport 指标报表信息对象
 type KpiReport struct {
 	ID          int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType      string `json:"neType" gorm:"column:ne_type"`
-	NeName      string `json:"neName" gorm:"column:ne_name"`
-	RmUid       string `json:"rmUid" gorm:"column:rm_uid"`
+	CoreUID     string `json:"coreUid" gorm:"column:core_uid"`        // 核心网唯一标识
+	NeUID       string `json:"neUid" gorm:"column:ne_uid"`            // 网元唯一标识
+	NeType      string `json:"neType" gorm:"column:ne_type"`          // 网元类型
 	Date        string `json:"date" gorm:"column:date"`               // Date of the report yyyy-mm-dd hh:mi:ss
 	StartTime   string `json:"startTime" gorm:"column:start_time"`    // Start time of the report hh:mi:ss
 	EndTime     string `json:"endTime" gorm:"column:end_time"`        // End time of the report hh:mi:ss
@@ -38,12 +38,12 @@ func (*KpiReport) TableName() string {
 
 // KPIQuery 指标查询参数结构体
 type KPIQuery struct {
-	NeType    string `form:"neType" binding:"required"`
-	NeID      string `form:"neId" binding:"required"`
-	BeginTime int64  `form:"beginTime" binding:"required"` // 开始时间戳（毫秒）1739361200999
-	EndTime   int64  `form:"endTime" binding:"required"`   // 结束时间戳（毫秒）1739361210088
+	CoreUID   string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+	NeUID     string `json:"neUid" form:"neUid" binding:"required"`     // 网元唯一标识
+	NeType    string `json:"neType" form:"neType" binding:"required"`   // 网元类型
+	BeginTime int64  `form:"beginTime" binding:"required"`              // 开始时间戳（毫秒）1739361200999
+	EndTime   int64  `form:"endTime" binding:"required"`                // 结束时间戳（毫秒）1739361210088
 	Interval  int64  `form:"interval" binding:"required,oneof=5 60 300 900 1800 3600"`
-	RmUID     string `form:"rmUID"`
 	SortField string `form:"sortField" binding:"omitempty,oneof=timeGroup"`
 	SortOrder string `form:"sortOrder" binding:"omitempty,oneof=asc desc"`
 }

src/modules/ne_data/model/nb_state.go

@@ -3,9 +3,9 @@ package model
 // NBState 基站状态记录表 nb_state
 type NBState struct {
 	ID         int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType     string `json:"neType" gorm:"column:ne_type"`         // 网元类型 AMF MME
-	NeId       string `json:"neId" gorm:"column:ne_id"`             // 网元ID
-	RmUid      string `json:"rmUid" gorm:"column:rm_uid"`           // 资源唯一标识
+	CoreUID    string `json:"coreUid" gorm:"column:core_uid"`       // 核心网唯一标识
+	NeUID      string `json:"neUid" gorm:"column:ne_uid"`           // 网元唯一标识
+	NeType     string `json:"neType" gorm:"column:ne_type"`         // 网元类型
 	CreateTime int64  `json:"createTime" gorm:"column:create_time"` // 创建时间
 	Address    string `json:"address" gorm:"column:address"`        // 基站IP地址
 	NbName     string `json:"nbName" gorm:"column:nb_name"`         // 基站设备名称
@@ -22,8 +22,9 @@ func (*NBState) TableName() string {
 
 // NBStateQuery 查询参数结构体
 type NBStateQuery struct {
-	NeType    string `json:"neType" form:"neType" binding:"required"`
-	NeID      string `json:"neId" form:"neId" binding:"required"`
+	CoreUID   string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+	NeUID     string `json:"neUid" form:"neUid" binding:"required"`     // 网元唯一标识
+	NeType    string `json:"neType" form:"neType"`                      // 网元类型
 	PageNum   int64  `json:"pageNum" form:"pageNum" binding:"required"`
 	PageSize  int64  `json:"pageSize" form:"pageSize" binding:"required"`
 	Status    string `json:"status" form:"status"`
@@ -31,5 +32,4 @@ type NBStateQuery struct {
 	EndTime   string `json:"endTime" form:"endTime"`
 	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=id create_time"` // 排序字段，填写结果字段
 	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`       // 排序升降序，asc desc
-	RmUID     string `json:"rmUID" form:"rmUID"`
 }

src/modules/ne_data/model/ne_state.go

@@ -3,8 +3,9 @@ package model
 // NEState 网元状态记录表 ne_state
 type NEState struct {
 	ID           int64   `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType       string  `json:"neType" gorm:"column:ne_type"`
-	NeId         string  `json:"neId" gorm:"column:ne_id"`
+	CoreUID      string  `json:"coreUid" gorm:"column:core_uid"`            // 核心网唯一标识
+	NeUID        string  `json:"neUid" gorm:"column:ne_uid"`                // 网元唯一标识
+	NeType       string  `json:"neType" gorm:"column:ne_type"`              // 网元类型
 	Version      string  `json:"version" gorm:"column:version"`             // 版本
 	Capability   int64   `json:"capability" gorm:"column:capability"`       // 用户容量
 	SerialNum    string  `json:"serialNum" gorm:"column:serial_num"`        // 序列号
@@ -24,8 +25,9 @@ func (*NEState) TableName() string {
 
 // NEStateQuery 查询参数结构体
 type NEStateQuery struct {
-	NeType    string `json:"neType" form:"neType" binding:"required"`
-	NeID      string `json:"neId" form:"neId" binding:"required"`
+	CoreUID   string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
+	NeUID     string `json:"neUid" form:"neUid" binding:"required"`     // 网元唯一标识
+	NeType    string `json:"neType" form:"neType"`                      // 网元类型
 	PageNum   int64  `json:"pageNum" form:"pageNum" binding:"required"`
 	PageSize  int64  `json:"pageSize" form:"pageSize" binding:"required"`
 	BeginTime string `json:"beginTime" form:"beginTime"`

src/modules/ne_data/model/udm_auth.go

@@ -2,9 +2,11 @@ package model
 
 // UDMAuthUser UDM鉴权用户 udm_auth
 type UDMAuthUser struct {
-	ID        string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID
+	ID        int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
+	CoreUID   string `json:"coreUid" gorm:"column:core_uid"`               // 核心网唯一标识
+	NeUID     string `json:"neUid" gorm:"column:ne_uid"`                   // 网元唯一标识
+	NeType    string `json:"neType" gorm:"column:ne_type"`                 // 网元类型
 	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
 	Ki        string `json:"ki" gorm:"column:ki"`                          // ki
 	AlgoIndex string `json:"algoIndex" gorm:"column:algo_index"`           // algoIndex

src/modules/ne_data/model/udm_extend.go

@@ -2,11 +2,14 @@ package model
 
 // UDMExtend UDM用户IMSI扩展信息 udm_extend
 type UDMExtend struct {
-	ID     string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID
-	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网元标识-子系统
-	Remark string `json:"remark" gorm:"column:remark"`                  // 备注
+	ID      int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
+	CoreUID string `json:"coreUid" gorm:"column:core_uid"`               // 核心网唯一标识
+	NeUID   string `json:"neUid" gorm:"column:ne_uid"`                   // 网元唯一标识
+	NeType  string `json:"neType" gorm:"column:ne_type"`                 // 网元类型
+	IMSI    string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
+	MSISDN  string `json:"msisdn" gorm:"column:msisdn"`                  // 用户电话号码
+
+	Remark string `json:"remark" gorm:"column:remark"` // 备注
 }
 
 // TableName 表名称

src/modules/ne_data/model/udm_sub.go

@@ -2,10 +2,12 @@ package model
 
 // UDMSubUser UDM签约用户 udm_sub
 type UDMSubUser struct {
-	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网元标识
+	ID      int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
+	CoreUID string `json:"coreUid" gorm:"column:core_uid"`               // 核心网唯一标识
+	NeUID   string `json:"neUid" gorm:"column:ne_uid"`                   // 网元唯一标识
+	NeType  string `json:"neType" gorm:"column:ne_type"`                 // 网元类型
+	IMSI    string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
+	MSISDN  string `json:"msisdn" gorm:"column:msisdn"`                  // 用户电话号码
 
 	AmDat                     string `json:"amDat" gorm:"column:am_dat"`              // AmData
 	UeAmbrTpl                 string `json:"ambr" gorm:"column:ambr"`                 // AmData SubUeAMBRTemp

src/modules/ne_data/model/udm_voip.go

@@ -2,8 +2,10 @@ package model
 
 //  UDMVOIPUser UDMVOIP用户 udm_voip
 type UDMVOIPUser struct {
-	ID   string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
-	NeId string `json:"neId" gorm:"column:ne_id"`                     // UDM网元标识
+	ID      int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
+	CoreUID string `json:"coreUid" gorm:"column:core_uid"`               // 核心网唯一标识
+	NeUID   string `json:"neUid" gorm:"column:ne_uid"`                   // 网元唯一标识
+	NeType  string `json:"neType" gorm:"column:ne_type"`                 // 网元类型
 
 	UserName string `json:"username" gorm:"column:username"` // 用户名
 	Password string `json:"password" gorm:"column:password"` // 密码

src/modules/ne_data/model/udm_volte_ims.go

@@ -2,10 +2,12 @@ package model
 
 //  UDMVolteIMSUser UDMVolteIMS用户 udm_volte_ims
 type UDMVolteIMSUser struct {
-	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网元标识
+	ID      int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
+	CoreUID string `json:"coreUid" gorm:"column:core_uid"`               // 核心网唯一标识
+	NeUID   string `json:"neUid" gorm:"column:ne_uid"`                   // 网元唯一标识
+	NeType  string `json:"neType" gorm:"column:ne_type"`                 // 网元类型
+	IMSI    string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
+	MSISDN  string `json:"msisdn" gorm:"column:msisdn"`                  // 用户电话号码
 
 	Tag string `json:"tag" gorm:"column:tag"` // 0=VoIP, 1=VoLTE
 	VNI string `json:"vni" gorm:"column:vni"` // VNI

src/modules/ne_data/model/ue_event.go

@@ -3,9 +3,9 @@ package model
 // UEEvent UE会话对象 ue_event
 type UEEvent struct {
 	ID           int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType       string `json:"neType" gorm:"column:ne_type"`
-	NeName       string `json:"neName" gorm:"column:ne_name"`
-	RmUID        string `json:"rmUID" gorm:"column:rm_uid"`         // 可能没有
+	CoreUID      string `json:"coreUid" gorm:"column:core_uid"`     // 核心网唯一标识
+	NeUID        string `json:"neUid" gorm:"column:ne_uid"`         // 网元唯一标识
+	NeType       string `json:"neType" gorm:"column:ne_type"`       // 网元类型
 	Timestamp    int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到时间
 	EventType    string `json:"eventType" gorm:"column:event_type"` // 事件类型
 	EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` // data JSON String

src/modules/ne_data/ne_data.go

@@ -108,9 +108,9 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewAlarm.CountSeverity,
 		)
-		alarmGroup.GET("/count/ne",
+		alarmGroup.GET("/count/top",
 			middleware.AuthorizeUser(nil),
-			controller.NewAlarm.CountNe,
+			controller.NewAlarm.CountTop,
 		)
 	}
 
@@ -137,8 +137,8 @@ func Setup(router *gin.Engine) {
 		)
 	}
 
-	// 网元状态记录信息
-	neStateGroup := neDataGroup.Group("/ne-state")
+	// 网元状态历史记录信息
+	neStateGroup := neDataGroup.Group("/state/ne")
 	{
 		neStateGroup.GET("/list",
 			middleware.AuthorizeUser(nil),
@@ -147,7 +147,7 @@ func Setup(router *gin.Engine) {
 	}
 
 	// 基站状态历史记录信息 含AMF/MME
-	nbStateGroup := neDataGroup.Group("/nb-state")
+	nbStateGroup := neDataGroup.Group("/state/nb")
 	{
 		nbStateGroup.GET("/list",
 			middleware.AuthorizeUser(nil),
@@ -159,6 +159,25 @@ func Setup(router *gin.Engine) {
 		)
 	}
 
+	// 备份数据
+	backupGroup := neDataGroup.Group("/backup")
+	{
+		backupGroup.GET("/ftp",
+			middleware.AuthorizeUser(nil),
+			controller.NewBackup.FTPInfo,
+		)
+		backupGroup.PUT("/ftp",
+			middleware.AuthorizeUser(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.backup", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewBackup.FTPUpdate,
+		)
+		backupGroup.POST("/ftp",
+			middleware.AuthorizeUser(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.backup", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewBackup.FTPPush,
+		)
+	}
+
 	// 网元IMS
 	imsGroup := neDataGroup.Group("/ims")
 	{
@@ -253,7 +272,7 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewAMF.NbInfoList,
 		)
-		amfGroup.GET("/nb/list-cfg",
+		amfGroup.GET("/nb/addrs",
 			middleware.AuthorizeUser(nil),
 			controller.NewAMF.NbStateList,
 		)
@@ -291,29 +310,10 @@ func Setup(router *gin.Engine) {
 		)
 	}
 
-	// 备份数据
-	backupGroup := neDataGroup.Group("/backup")
-	{
-		backupGroup.GET("/ftp",
-			middleware.AuthorizeUser(nil),
-			controller.NewBackup.FTPInfo,
-		)
-		backupGroup.PUT("/ftp",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.backup", collectlogs.BUSINESS_TYPE_OTHER)),
-			controller.NewBackup.FTPUpdate,
-		)
-		backupGroup.POST("/ftp",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.backup", collectlogs.BUSINESS_TYPE_OTHER)),
-			controller.NewBackup.FTPPush,
-		)
-	}
-
 	// 网元UDM 鉴权用户信息
 	udmAuthGroup := neDataGroup.Group("/udm/auth")
 	{
-		udmAuthGroup.PUT("/resetData/:neId",
+		udmAuthGroup.PUT("/reset",
 			repeat.RepeatSubmit(5),
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_CLEAN)),
@@ -323,35 +323,25 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMAuth.List,
 		)
-		udmAuthGroup.GET("/:neId/:imsi",
+		udmAuthGroup.GET("",
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMAuth.Info,
 		)
-		udmAuthGroup.POST("/:neId",
+		udmAuthGroup.POST("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)),
 			controller.NewUDMAuth.Add,
 		)
-		udmAuthGroup.POST("/:neId/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMAuth.Adds,
-		)
-		udmAuthGroup.PUT("/:neId",
+		udmAuthGroup.PUT("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_UPDATE)),
 			controller.NewUDMAuth.Edit,
 		)
-		udmAuthGroup.DELETE("/:neId/:imsi",
+		udmAuthGroup.DELETE("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewUDMAuth.Remove,
 		)
-		udmAuthGroup.DELETE("/:neId/:imsi/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMAuth.Removes,
-		)
 		udmAuthGroup.GET("/export",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_EXPORT)),
@@ -367,7 +357,7 @@ func Setup(router *gin.Engine) {
 	// 网元UDM 签约用户信息
 	udmSubGroup := neDataGroup.Group("/udm/sub")
 	{
-		udmSubGroup.PUT("/resetData/:neId",
+		udmSubGroup.PUT("/reset",
 			repeat.RepeatSubmit(5),
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_CLEAN)),
@@ -377,35 +367,25 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMSub.List,
 		)
-		udmSubGroup.GET("/:neId/:imsi",
+		udmSubGroup.GET("",
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMSub.Info,
 		)
-		udmSubGroup.POST("/:neId",
+		udmSubGroup.POST("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)),
 			controller.NewUDMSub.Add,
 		)
-		udmSubGroup.POST("/:neId/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMSub.Adds,
-		)
-		udmSubGroup.PUT("/:neId",
+		udmSubGroup.PUT("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_UPDATE)),
 			controller.NewUDMSub.Edit,
 		)
-		udmSubGroup.DELETE("/:neId/:imsi",
+		udmSubGroup.DELETE("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewUDMSub.Remove,
 		)
-		udmSubGroup.DELETE("/:neId/:imsi/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMSub.Removes,
-		)
 		udmSubGroup.GET("/export",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_EXPORT)),
@@ -421,7 +401,7 @@ func Setup(router *gin.Engine) {
 	// 网元UDM VOIP用户信息
 	udmVOIPGroup := neDataGroup.Group("/udm/voip")
 	{
-		udmVOIPGroup.PUT("/resetData/:neId",
+		udmVOIPGroup.PUT("/reset",
 			repeat.RepeatSubmit(5),
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_CLEAN)),
@@ -431,30 +411,20 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMVOIP.List,
 		)
-		udmVOIPGroup.GET("/:neId/:username",
+		udmVOIPGroup.GET("",
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMVOIP.Info,
 		)
-		udmVOIPGroup.POST("/:neId",
+		udmVOIPGroup.POST("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_INSERT)),
 			controller.NewUDMVOIP.Add,
 		)
-		udmVOIPGroup.POST("/:neId/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMVOIP.Adds,
-		)
-		udmVOIPGroup.DELETE("/:neId/:username",
+		udmVOIPGroup.DELETE("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewUDMVOIP.Remove,
 		)
-		udmVOIPGroup.DELETE("/:neId/:username/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMVOIP.Removes,
-		)
 		udmVOIPGroup.GET("/export",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVOIP", collectlogs.BUSINESS_TYPE_EXPORT)),
@@ -470,7 +440,7 @@ func Setup(router *gin.Engine) {
 	// 网元UDM VolteIMS用户信息
 	udmVolteIMSGroup := neDataGroup.Group("/udm/volte-ims")
 	{
-		udmVolteIMSGroup.PUT("/resetData/:neId",
+		udmVolteIMSGroup.PUT("/reset",
 			repeat.RepeatSubmit(5),
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_CLEAN)),
@@ -480,30 +450,20 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMVolteIMS.List,
 		)
-		udmVolteIMSGroup.GET("/:neId/:imsi",
+		udmVolteIMSGroup.GET("",
 			middleware.AuthorizeUser(nil),
 			controller.NewUDMVolteIMS.Info,
 		)
-		udmVolteIMSGroup.POST("/:neId",
+		udmVolteIMSGroup.POST("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_INSERT)),
 			controller.NewUDMVolteIMS.Add,
 		)
-		udmVolteIMSGroup.POST("/:neId/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMVolteIMS.Adds,
-		)
-		udmVolteIMSGroup.DELETE("/:neId/:imsi",
+		udmVolteIMSGroup.DELETE("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewUDMVolteIMS.Remove,
 		)
-		udmVolteIMSGroup.DELETE("/:neId/:imsi/:num",
-			middleware.AuthorizeUser(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMVolteIMS.Removes,
-		)
 		udmVolteIMSGroup.GET("/export",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmVolteIMS", collectlogs.BUSINESS_TYPE_EXPORT)),
@@ -537,7 +497,7 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewMME.NbInfoList,
 		)
-		mmeGroup.GET("/nb/list-cfg",
+		mmeGroup.GET("/nb/addrs",
 			middleware.AuthorizeUser(nil),
 			controller.NewMME.NbStateList,
 		)

src/modules/ne_data/repository/alarm.go

@@ -1,7 +1,6 @@
 package repository
 
 import (
-	"fmt"
 	"strings"
 	"time"
 
@@ -23,17 +22,14 @@ func (r Alarm) SelectByPage(query model.AlarmQuery) ([]model.Alarm, int64) {
 	if query.NeType != "" {
 		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if query.NeID != "" {
-		tx = tx.Where("ne_id = ?", query.NeID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
 	}
-	if query.NeName != "" {
-		tx = tx.Where("ne_name = ?", query.NeName)
-	}
-	if query.PvFlag != "" {
-		tx = tx.Where("pv_flag = ?", query.PvFlag)
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.AlarmCode != "" {
-		tx = tx.Where("alarm_code like ?", fmt.Sprintf("%%%s%%", query.AlarmCode))
+		tx = tx.Where("alarm_code = ?", query.AlarmCode)
 	}
 	if query.AlarmType != "" {
 		tx = tx.Where("alarm_type in (?)", strings.Split(query.AlarmType, ","))
@@ -88,11 +84,11 @@ func (r Alarm) Select(param model.Alarm) []model.Alarm {
 	if param.NeType != "" {
 		tx = tx.Where("ne_type = ?", param.NeType)
 	}
-	if param.NeId != "" {
-		tx = tx.Where("ne_id = ?", param.NeId)
+	if param.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", param.NeUID)
 	}
-	if param.NeName != "" {
-		tx = tx.Where("ne_name = ?", param.NeName)
+	if param.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", param.CoreUID)
 	}
 	if param.AlarmCode > 0 {
 		tx = tx.Where("alarm_code = ?", param.AlarmCode)
@@ -107,9 +103,6 @@ func (r Alarm) Select(param model.Alarm) []model.Alarm {
 		eventTypes := strings.Split(param.OrigSeverity, ",")
 		tx = tx.Where("orig_severity in (%s)", eventTypes)
 	}
-	if param.PvFlag != "" {
-		tx = tx.Where("pv_flag = ?", param.PvFlag)
-	}
 
 	// 查询数据
 	rows := []model.Alarm{}
@@ -139,8 +132,8 @@ func (r Alarm) SelectByIds(ids []int64) []model.Alarm {
 
 // Insert 新增信息 返回新增数据ID
 func (r Alarm) Insert(param model.Alarm) int64 {
-	if param.Timestamp == 0 {
-		param.Timestamp = time.Now().UnixMilli()
+	if param.CreatedAt == 0 {
+		param.CreatedAt = time.Now().UnixMilli()
 	}
 	// 执行插入
 	if err := db.DB("").Create(&param).Error; err != nil {
@@ -158,7 +151,7 @@ func (r Alarm) Update(param model.Alarm) int64 {
 	tx := db.DB("").Model(&model.Alarm{})
 	// 构建查询条件
 	tx = tx.Where("id = ?", param.ID)
-	tx = tx.Omit("id", "timestamp")
+	tx = tx.Omit("id", "created_at")
 	// 执行更新
 	if err := tx.Updates(param).Error; err != nil {
 		logger.Errorf("update err => %v", err.Error())
@@ -181,9 +174,9 @@ func (r Alarm) DeleteByIds(ids []int64) int64 {
 }
 
 // SelectAlarmSeqLast 查询网元告警最后一条序号
-func (r Alarm) SelectAlarmSeqLast(neType, neId string) int64 {
+func (r Alarm) SelectAlarmSeqLast(coreUid, neUid string) int64 {
 	tx := db.DB("").Model(&model.Alarm{})
-	tx = tx.Where("ne_type=? and ne_id=?", neType, neId)
+	tx = tx.Where("core_uid=? and ne_uid=?", coreUid, neUid)
 	tx = tx.Select("alarm_seq").Order("alarm_seq DESC")
 	// 查询数据
 	var alarmSeq int64 = 0
@@ -195,10 +188,10 @@ func (r Alarm) SelectAlarmSeqLast(neType, neId string) int64 {
 }
 
 // GroupTotal 分组统计
-func (r Alarm) GroupTotal(alarmStatus string, group string, limit int) []map[string]any {
+func (r Alarm) GroupTotal(coreUid, alarmStatus string, group string, limit int) []map[string]any {
 	tx := db.DB("").Model(&model.Alarm{})
 	tx = tx.Select("count(*) as total", group)
-	tx = tx.Where("alarm_status=?", alarmStatus)
+	tx = tx.Where("core_uid=? and alarm_status=? ", coreUid, alarmStatus)
 	tx = tx.Group(group).Order("total DESC")
 	// 查询数据
 	var rows []map[string]any = make([]map[string]any, 0)

src/modules/ne_data/repository/alarm_event.go

@@ -1,6 +1,7 @@
 package repository
 
 import (
+	"fmt"
 	"time"
 
 	"be.ems/src/framework/database/db"
@@ -21,20 +22,23 @@ func (r AlarmEvent) SelectByPage(query model.AlarmEventQuery) ([]model.AlarmEven
 	if query.NeType != "" {
 		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if query.NeID != "" {
-		tx = tx.Where("ne_id = ?", query.NeID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
+	}
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.AlarmCode != "" {
-		tx = tx.Where("alarm_code = ?", query.AlarmCode)
+		tx = tx.Where("alarm_code like ?", fmt.Sprintf("%s%%", query.AlarmCode))
 	}
 	if query.AlarmStatus != "" {
 		tx = tx.Where("alarm_status = ?", query.AlarmStatus)
 	}
 	if query.BeginTime != 0 {
-		tx = tx.Where("event_time >= ?", query.BeginTime)
+		tx = tx.Where("created_at >= ?", query.BeginTime)
 	}
 	if query.EndTime != 0 {
-		tx = tx.Where("event_time <= ?", query.EndTime)
+		tx = tx.Where("created_at <= ?", query.EndTime)
 	}
 
 	// 查询结果
@@ -73,8 +77,11 @@ func (r AlarmEvent) Select(param model.AlarmEvent) []model.AlarmEvent {
 	if param.NeType != "" {
 		tx = tx.Where("ne_type = ?", param.NeType)
 	}
-	if param.NeId != "" {
-		tx = tx.Where("ne_id = ?", param.NeId)
+	if param.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", param.NeUID)
+	}
+	if param.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", param.CoreUID)
 	}
 	if param.AlarmId != "" {
 		tx = tx.Where("alarm_id = ?", param.AlarmId)
@@ -113,8 +120,8 @@ func (r AlarmEvent) SelectByIds(ids []int64) []model.AlarmEvent {
 
 // Insert 新增信息 返回新增数据ID
 func (r AlarmEvent) Insert(param model.AlarmEvent) int64 {
-	if param.Timestamp == 0 {
-		param.Timestamp = time.Now().UnixMilli()
+	if param.CreatedAt == 0 {
+		param.CreatedAt = time.Now().UnixMilli()
 	}
 	// 执行插入
 	if err := db.DB("").Create(&param).Error; err != nil {
@@ -132,7 +139,7 @@ func (r AlarmEvent) Update(param model.AlarmEvent) int64 {
 	tx := db.DB("").Model(&model.AlarmEvent{})
 	// 构建查询条件
 	tx = tx.Where("id = ?", param.ID)
-	tx = tx.Omit("id", "timestamp")
+	tx = tx.Omit("id", "created_at")
 	// 执行更新
 	if err := tx.Updates(param).Error; err != nil {
 		logger.Errorf("update err => %v", err.Error())
@@ -155,9 +162,9 @@ func (r AlarmEvent) DeleteByIds(ids []int64) int64 {
 }
 
 // SelectAlarmEventSeqLast 查询网元告警最后一条序号
-func (r AlarmEvent) SelectAlarmEventSeqLast(neType, neId string) int64 {
+func (r AlarmEvent) SelectAlarmEventSeqLast(coreUid, neUid string) int64 {
 	tx := db.DB("").Model(&model.AlarmEvent{})
-	tx = tx.Where("ne_type=? and ne_id=?", neType, neId)
+	tx = tx.Where("core_uid=? and ne_uid=?", coreUid, neUid)
 	tx = tx.Select("alarm_seq").Order("alarm_seq DESC")
 	// 查询数据
 	var AlarmEventSeq int64 = 0

src/modules/ne_data/repository/alarm_forward_log.go

@@ -21,8 +21,11 @@ func (r AlarmForwardLog) SelectByPage(query model.AlarmForwardLogQuery) ([]model
 	if query.NeType != "" {
 		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if query.NeID != "" {
-		tx = tx.Where("ne_id = ?", query.NeID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
+	}
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.BeginTime != 0 {
 		tx = tx.Where("created_at >= ?", query.BeginTime)

src/modules/ne_data/repository/alarm_log.go

@@ -21,8 +21,11 @@ func (r AlarmLog) SelectByPage(query model.AlarmLogQuery) ([]model.AlarmLog, int
 	if query.NeType != "" {
 		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if query.NeID != "" {
-		tx = tx.Where("ne_id = ?", query.NeID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
+	}
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.AlarmStatus != "" {
 		tx = tx.Where("alarm_status = ?", query.AlarmStatus)

src/modules/ne_data/repository/cdr_event.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -22,8 +23,11 @@ func (r CDREvent) SelectByPage(neType string, query map[string]string) ([]model.
 	tableName := fmt.Sprintf("cdr_event_%s", strings.ToLower(neType))
 	tx := db.DB("").Table(tableName).Model(&model.CDREvent{})
 	// 查询条件拼接
-	if v, ok := query["rmUID"]; ok && v != "" {
-		tx = tx.Where("rm_uid = ?", v)
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
+	}
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid = ?", v)
 	}
 	if v, ok := query["beginTime"]; ok && v != "" {
 		if len(v) == 10 {
@@ -91,26 +95,64 @@ func (r CDREvent) SelectByPage(neType string, query map[string]string) ([]model.
 
 	// 分页
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
-	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
-
-	// 排序
-	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v
-		if o, ok := query["sortOrder"]; ok && o != "" {
-			if o == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		tx = tx.Order(sortSql)
+	if pageNum == 0 && pageSize > int(total) {
+		pageSize = int(total)
 	}
+	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
 
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query err => %v", err)
 	}
 
+	// 排序
+	if v, ok := query["sortField"]; ok && v != "" {
+		sortField := v
+		sortOrder := "asc"
+		if o, ok := query["sortOrder"]; ok && o != "" {
+			if o == "desc" {
+				sortOrder = "desc"
+			} else {
+				sortOrder = "asc"
+			}
+		}
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.CDREvent) any{
+				"id":        func(row *model.CDREvent) any { return row.ID },
+				"timestamp": func(row *model.CDREvent) any { return row.Timestamp },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
+
 	return rows, total
 }
 

src/modules/ne_data/repository/kpi_c_report.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -28,8 +29,11 @@ func (r KpiCReport) SelectKPI(query model.KPICQuery) []model.KpiCReport {
 	tableName := fmt.Sprintf("kpi_c_report_%s", strings.ToLower(query.NeType))
 	tx.Table(tableName)
 	// 构建查询条件
-	if query.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", query.RmUID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
+	}
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.BeginTime != 0 {
 		tx = tx.Where("created_at >= ?", query.BeginTime)
@@ -37,19 +41,52 @@ func (r KpiCReport) SelectKPI(query model.KPICQuery) []model.KpiCReport {
 	if query.EndTime != 0 {
 		tx = tx.Where("created_at <= ?", query.EndTime)
 	}
-	// 排序
-	if query.SortField == "" || query.SortField == "timeGroup" {
-		query.SortField = "created_at"
-	}
-	if query.SortOrder == "" {
-		query.SortOrder = "desc"
-	}
-	tx = tx.Order(fmt.Sprintf("%s %s", query.SortField, query.SortOrder))
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows
 	}
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		sortOrder := query.SortOrder
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.KpiCReport) any{
+				"id":        func(row *model.KpiCReport) any { return row.ID },
+				"timeGroup": func(row *model.KpiCReport) any { return row.CreatedAt },
+				"createdAt": func(row *model.KpiCReport) any { return row.CreatedAt },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
 	return rows
 }
 

src/modules/ne_data/repository/kpi_report.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -28,8 +29,11 @@ func (r KpiReport) SelectKPI(query model.KPIQuery) []model.KpiReport {
 	tableName := fmt.Sprintf("kpi_report_%s", strings.ToLower(query.NeType))
 	tx = tx.Table(tableName)
 	// 构建查询条件
-	if query.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", query.RmUID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
+	}
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.BeginTime != 0 {
 		tx = tx.Where("created_at >= ?", query.BeginTime)
@@ -37,25 +41,58 @@ func (r KpiReport) SelectKPI(query model.KPIQuery) []model.KpiReport {
 	if query.EndTime != 0 {
 		tx = tx.Where("created_at <= ?", query.EndTime)
 	}
-	// 排序
-	if query.SortField == "" || query.SortField == "timeGroup" {
-		query.SortField = "created_at"
-	}
-	if query.SortOrder == "" {
-		query.SortOrder = "desc"
-	}
-	tx = tx.Order(fmt.Sprintf("%s %s", query.SortField, query.SortOrder))
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows
 	}
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		sortOrder := query.SortOrder
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.KpiReport) any{
+				"id":        func(row *model.KpiReport) any { return row.ID },
+				"timeGroup": func(row *model.KpiReport) any { return row.CreatedAt },
+				"createdAt": func(row *model.KpiReport) any { return row.CreatedAt },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
 	return rows
 }
 
 // Insert 新增信息 返回新增数据ID
 func (r KpiReport) Insert(param model.KpiReport) int64 {
-	if param.NeType == "" {
+	if param.CoreUID == "" || param.NeUID == "" || param.NeType == "" {
 		return 0
 	}
 	if param.CreatedAt == 0 {
@@ -72,11 +109,11 @@ func (r KpiReport) Insert(param model.KpiReport) int64 {
 }
 
 // SelectUPF 查询UPF数据 N3上行,N6下行
-func (r KpiReport) SelectUPF(rmUID string, beginTime, endTime int64) []model.KpiReport {
+func (r KpiReport) SelectUPF(coreUid, neUid string, beginTime, endTime int64) []model.KpiReport {
 	tx := db.DB("").Model(&model.KpiReport{})
 	// 表名
 	tx = tx.Table("kpi_report_upf")
-	tx = tx.Where("rm_uid = ?", rmUID)
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
 	tx = tx.Where("created_at >= ?", beginTime)
 	tx = tx.Where("created_at <= ?", endTime)
 	// 查询数据

src/modules/ne_data/repository/nb_state.go

@@ -21,11 +21,11 @@ func (r NBState) SelectByPage(query model.NBStateQuery) ([]model.NBState, int64)
 	if query.NeType != "" {
 		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if query.NeID != "" {
-		tx = tx.Where("ne_id = ?", query.NeID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
 	}
-	if query.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", query.RmUID)
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.Status != "" {
 		tx = tx.Where("state = ?", query.Status)

src/modules/ne_data/repository/ne_state.go

@@ -21,8 +21,11 @@ func (r NEState) SelectByPage(query model.NEStateQuery) ([]model.NEState, int64)
 	if query.NeType != "" {
 		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if query.NeID != "" {
-		tx = tx.Where("ne_id = ?", query.NeID)
+	if query.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", query.NeUID)
+	}
+	if query.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", query.CoreUID)
 	}
 	if query.BeginTime != "" {
 		startTime := query.BeginTime

src/modules/ne_data/repository/udm_auth.go

@@ -16,10 +16,10 @@ var NewUDMAuthUser = &UDMAuthUser{}
 type UDMAuthUser struct{}
 
 // ClearAndInsert 清空ne_id后新增实体
-func (r *UDMAuthUser) ClearAndInsert(neId string, uArr []model.UDMAuthUser) int64 {
+func (r *UDMAuthUser) ClearAndInsert(coreUid, neUid string, uArr []model.UDMAuthUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
 	// _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_auth", nil)
-	result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMAuthUser{})
+	result := db.DB("").Where("core_uid = ? and ne_uid = ?", coreUid, neUid).Unscoped().Delete(&model.UDMAuthUser{})
 	if result.Error != nil {
 		logger.Errorf("Delete err => %v", result.Error)
 	}
@@ -33,8 +33,11 @@ func (r *UDMAuthUser) SelectPage(query map[string]string) ([]model.UDMAuthUser,
 	if v, ok := query["imsi"]; ok && v != "" {
 		tx = tx.Where("imsi like ?", fmt.Sprintf("%%%s%%", v))
 	}
-	if v, ok := query["neId"]; ok && v != "" {
-		tx = tx.Where("ne_id = ?", v)
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid = ?", v)
+	}
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
 	}
 	if v, ok := query["imsis"]; ok && v != "" {
 		arr := strings.Split(v, ",")
@@ -83,8 +86,11 @@ func (r *UDMAuthUser) SelectList(u model.UDMAuthUser) []model.UDMAuthUser {
 	if u.IMSI != "" {
 		tx = tx.Where("imsi = ?", u.IMSI)
 	}
-	if u.NeId != "" {
-		tx = tx.Where("ne_id = ?", u.NeId)
+	if u.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", u.NeUID)
+	}
+	if u.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", u.CoreUID)
 	}
 
 	// 查询数据
@@ -95,12 +101,13 @@ func (r *UDMAuthUser) SelectList(u model.UDMAuthUser) []model.UDMAuthUser {
 	return arr
 }
 
-// SelectByIMSIAndNeID 通过imsi和ne_id查询
-func (r *UDMAuthUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMAuthUser {
+// SelectByIMSI 通过imsi查询
+func (r *UDMAuthUser) SelectByIMSI(coreUid, neUid, imsi string) model.UDMAuthUser {
 	tx := db.DB("").Model(&model.UDMAuthUser{})
 	item := model.UDMAuthUser{}
 	// 查询条件拼接
-	tx = tx.Where("imsi = ? and ne_id = ?", imsi, neId)
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi = ?", imsi)
 	// 查询数据
 	if err := tx.Order("imsi asc").Limit(1).Find(&item).Error; err != nil {
 		logger.Errorf("query err => %v", err)
@@ -118,8 +125,11 @@ func (r *UDMAuthUser) Inserts(uArr []model.UDMAuthUser) int64 {
 }
 
 // Delete 删除实体
-func (r *UDMAuthUser) Delete(imsi, neId string) int64 {
-	tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMAuthUser{})
+func (r *UDMAuthUser) DeleteByIMSI(coreUid, neUid, imsi string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi = ?", imsi)
+	tx.Delete(&model.UDMAuthUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("Delete err => %v", err)
 	}
@@ -127,8 +137,11 @@ func (r *UDMAuthUser) Delete(imsi, neId string) int64 {
 }
 
 // DeletePrefixByIMSI 删除前缀匹配的实体
-func (r *UDMAuthUser) DeletePrefixByIMSI(imsi, neId string) int64 {
-	tx := db.DB("").Where("imsi like ? and ne_id = ?", fmt.Sprintf("%s%%", imsi), neId).Delete(&model.UDMAuthUser{})
+func (r *UDMAuthUser) DeletePrefixByIMSI(coreUid, neUid, imsiPrefix string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsiPrefix))
+	tx.Delete(&model.UDMAuthUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("DeletePrefixByIMSI err => %v", err)
 	}

src/modules/ne_data/repository/udm_extend.go

@@ -21,8 +21,11 @@ func (r UDMExtend) SelectByPage(query map[string]string) ([]model.UDMExtend, int
 	if v, ok := query["imsi"]; ok && v != "" {
 		tx = tx.Where("imsi like ?", fmt.Sprintf("%%%s%%", v))
 	}
-	if v, ok := query["neId"]; ok && v != "" {
-		tx = tx.Where("ne_id = ?", v)
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid = ?", v)
+	}
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
 	}
 
 	// 查询结果
@@ -61,8 +64,11 @@ func (r *UDMExtend) SelectList(u model.UDMExtend) []model.UDMExtend {
 	if u.IMSI != "" {
 		tx = tx.Where("imsi = ?", u.IMSI)
 	}
-	if u.NeId != "" {
-		tx = tx.Where("ne_id = ?", u.NeId)
+	if u.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", u.NeUID)
+	}
+	if u.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", u.CoreUID)
 	}
 	tx = tx.Order("imsi asc")
 	// 查询数据
@@ -74,14 +80,16 @@ func (r *UDMExtend) SelectList(u model.UDMExtend) []model.UDMExtend {
 	return rows
 }
 
-// SelectByIMSIAndNeID 通过imsi和ne_id查询 neId为%时模糊imsi查询
-func (r *UDMExtend) SelectByIMSIAndNeID(imsi, neId string) model.UDMExtend {
+// SelectByIMSI 通过imsi查询 neUid为%时模糊imsi查询
+func (r *UDMExtend) SelectByIMSI(coreUid, neUid, imsi string) model.UDMExtend {
 	tx := db.DB("").Model(&model.UDMExtend{})
-	// 构建查询条件
-	if neId == "%" {
+	// 查询条件拼接
+	if neUid == "%" {
+		tx = tx.Where("core_uid = ?", coreUid)
 		tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsi))
 	} else {
-		tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId)
+		tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+		tx = tx.Where("imsi = ?", imsi)
 	}
 	// 查询数据
 	rows := []model.UDMExtend{}
@@ -103,13 +111,16 @@ func (r *UDMExtend) Inserts(uArr []model.UDMExtend) int64 {
 	return tx.RowsAffected
 }
 
-// Delete 删除实体 neId为%时模糊imsi前缀
-func (r *UDMExtend) Delete(imsi, neId string) int64 {
+// Delete 删除实体 neUid为%时模糊imsi前缀
+func (r *UDMExtend) DeleteByIMSI(coreUid, neUid, imsi string) int64 {
 	tx := db.DB("")
-	if neId == "%" {
+	// 查询条件拼接
+	if neUid == "%" {
+		tx = tx.Where("core_uid = ?", coreUid)
 		tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsi))
 	} else {
-		tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId)
+		tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+		tx = tx.Where("imsi = ?", imsi)
 	}
 	tx = tx.Delete(&model.UDMExtend{})
 	if err := tx.Error; err != nil {

src/modules/ne_data/repository/udm_sub.go

@@ -16,10 +16,10 @@ var NewUDMSub = &UDMSubUser{}
 type UDMSubUser struct{}
 
 // ClearAndInsert 清空ne_id后新增实体
-func (r *UDMSubUser) ClearAndInsert(neId string, u []model.UDMSubUser) int64 {
+func (r *UDMSubUser) ClearAndInsert(coreUid, neUid string, u []model.UDMSubUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
 	// _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_sub", nil)
-	result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMSubUser{})
+	result := db.DB("").Where("core_uid = ? and ne_uid = ?", neUid).Unscoped().Delete(&model.UDMSubUser{})
 	if result.Error != nil {
 		logger.Errorf("Delete err => %v", result.Error)
 	}
@@ -36,8 +36,11 @@ func (r *UDMSubUser) SelectPage(query map[string]string) ([]model.UDMSubUser, in
 	if v, ok := query["msisdn"]; ok && v != "" {
 		tx = tx.Where("msisdn like ?", fmt.Sprintf("%%%s%%", v))
 	}
-	if v, ok := query["neId"]; ok && v != "" {
-		tx = tx.Where("ne_id =?", v)
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
+	}
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid = ?", v)
 	}
 	if v, ok := query["imsis"]; ok && v != "" {
 		arr := strings.Split(v, ",")
@@ -86,10 +89,12 @@ func (r *UDMSubUser) SelectList(u model.UDMSubUser) []model.UDMSubUser {
 	if u.IMSI != "" {
 		tx = tx.Where("imsi = ?", u.IMSI)
 	}
-	if u.NeId != "" {
-		tx = tx.Where("ne_id = ?", u.NeId)
+	if u.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", u.NeUID)
+	}
+	if u.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", u.CoreUID)
 	}
-
 	// 查询数据
 	arr := []model.UDMSubUser{}
 	if err := tx.Order("imsi asc").Find(&arr).Error; err != nil {
@@ -98,12 +103,13 @@ func (r *UDMSubUser) SelectList(u model.UDMSubUser) []model.UDMSubUser {
 	return arr
 }
 
-// SelectByIMSIAndNeID 通过imsi和ne_id查询
-func (r *UDMSubUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMSubUser {
+// SelectByIMSIAndNeID 通过imsi查询
+func (r *UDMSubUser) SelectByIMSI(coreUid, neUid, imsi string) model.UDMSubUser {
 	tx := db.DB("").Model(&model.UDMSubUser{})
 	item := model.UDMSubUser{}
 	// 查询条件拼接
-	tx = tx.Where("imsi = ? and ne_id = ?", imsi, neId)
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi = ?", imsi)
 	// 查询数据
 	if err := tx.Order("imsi asc").Limit(1).Find(&item).Error; err != nil {
 		logger.Errorf("query err => %v", err)
@@ -120,9 +126,12 @@ func (r *UDMSubUser) Inserts(uArr []model.UDMSubUser) int64 {
 	return tx.RowsAffected
 }
 
-// Delete 删除实体
-func (r *UDMSubUser) Delete(imsi, neId string) int64 {
-	tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMSubUser{})
+// DeleteByIMSI 删除实体
+func (r *UDMSubUser) DeleteByIMSI(coreUid, neUid, imsi string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi = ?", imsi)
+	tx.Delete(&model.UDMSubUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("Delete err => %v", err)
 	}
@@ -130,8 +139,11 @@ func (r *UDMSubUser) Delete(imsi, neId string) int64 {
 }
 
 // DeletePrefixByIMSI 删除前缀匹配的实体
-func (r *UDMSubUser) DeletePrefixByIMSI(imsiPrefix, neId string) int64 {
-	tx := db.DB("").Where("imsi like ? and ne_id = ?", fmt.Sprintf("%s%%", imsiPrefix), neId).Delete(&model.UDMSubUser{})
+func (r *UDMSubUser) DeletePrefixByIMSI(coreUid, neUid, imsiPrefix string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsiPrefix))
+	tx.Delete(&model.UDMSubUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("DeletePrefixByIMSI err => %v", err)
 	}

src/modules/ne_data/repository/udm_voip.go

@@ -16,10 +16,10 @@ var NewUDMVOIPUser = &UDMVOIPUser{}
 type UDMVOIPUser struct{}
 
 // ClearAndInsert 清空ne_id后新增实体
-func (r UDMVOIPUser) ClearAndInsert(neId string, uArr []model.UDMVOIPUser) int64 {
+func (r UDMVOIPUser) ClearAndInsert(coreUid, neUid string, uArr []model.UDMVOIPUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
 	// _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_voip", nil)
-	result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMVOIPUser{})
+	result := db.DB("").Where("core_uid = ? and ne_uid = ?", coreUid, neUid).Unscoped().Delete(&model.UDMVOIPUser{})
 	if result.Error != nil {
 		logger.Errorf("Delete err => %v", result.Error)
 	}
@@ -33,8 +33,11 @@ func (r UDMVOIPUser) SelectPage(query map[string]string) ([]model.UDMVOIPUser, i
 	if v, ok := query["username"]; ok && v != "" {
 		tx = tx.Where("username like ?", fmt.Sprintf("%%%s%%", v))
 	}
-	if v, ok := query["neId"]; ok && v != "" {
-		tx = tx.Where("ne_id = ?", v)
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
+	}
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid = ?", v)
 	}
 	if v, ok := query["usernames"]; ok && v != "" {
 		arr := strings.Split(v, ",")
@@ -85,8 +88,11 @@ func (r UDMVOIPUser) SelectList(u model.UDMVOIPUser) []model.UDMVOIPUser {
 	if u.UserName != "" {
 		tx = tx.Where("username = ?", u.UserName)
 	}
-	if u.NeId != "" {
-		tx = tx.Where("ne_id = ?", u.NeId)
+	if u.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", u.NeUID)
+	}
+	if u.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", u.CoreUID)
 	}
 
 	// 查询数据
@@ -97,12 +103,13 @@ func (r UDMVOIPUser) SelectList(u model.UDMVOIPUser) []model.UDMVOIPUser {
 	return arr
 }
 
-// SelectByUserNameAndNeID 通过username和ne_id查询
-func (r UDMVOIPUser) SelectByUserNameAndNeID(username, neId string) model.UDMVOIPUser {
+// SelectByUserName 通过username查询
+func (r UDMVOIPUser) SelectByUserName(coreUid, neUid, username string) model.UDMVOIPUser {
 	tx := db.DB("").Model(&model.UDMVOIPUser{})
 	item := model.UDMVOIPUser{}
 	// 查询条件拼接
-	tx = tx.Where("username = ? and ne_id = ?", username, neId)
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("username = ?", username)
 	// 查询数据
 	if err := tx.Order("username asc").Limit(1).Find(&item).Error; err != nil {
 		logger.Errorf("query err => %v", err)
@@ -119,9 +126,12 @@ func (r UDMVOIPUser) Inserts(uArr []model.UDMVOIPUser) int64 {
 	return tx.RowsAffected
 }
 
-// Delete 删除实体
-func (r UDMVOIPUser) Delete(username, neId string) int64 {
-	tx := db.DB("").Where("username = ? and ne_id = ?", username, neId).Delete(&model.UDMVOIPUser{})
+// DeleteByUserName 删除实体
+func (r UDMVOIPUser) DeleteByUserName(coreUid, neUid, username string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("username = ?", username)
+	tx.Delete(&model.UDMVOIPUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("Delete err => %v", err)
 	}
@@ -129,8 +139,11 @@ func (r UDMVOIPUser) Delete(username, neId string) int64 {
 }
 
 // DeletePrefixByUserName 删除前缀匹配的实体
-func (r UDMVOIPUser) DeletePrefixByUserName(username, neId string) int64 {
-	tx := db.DB("").Where("username like ? and ne_id = ?", fmt.Sprintf("%s%%", username), neId).Delete(&model.UDMVOIPUser{})
+func (r UDMVOIPUser) DeletePrefixByUserName(coreUid, neUid, usernamePrefix string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("username like ?", fmt.Sprintf("%s%%", usernamePrefix))
+	tx.Delete(&model.UDMVOIPUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("DeletePrefixByUserName err => %v", err)
 	}

src/modules/ne_data/repository/udm_volte_ims.go

@@ -16,10 +16,10 @@ var NewUDMVolteIMSUser = &UDMVolteIMSUser{}
 type UDMVolteIMSUser struct{}
 
 // ClearAndInsert 清空ne_id后新增实体
-func (r UDMVolteIMSUser) ClearAndInsert(neId string, uArr []model.UDMVolteIMSUser) int64 {
+func (r UDMVolteIMSUser) ClearAndInsert(coreUid, neUid string, uArr []model.UDMVolteIMSUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
 	// _, err := datasource.ExecDB("", "TRUNCATE TABLE udm_volte_ims", nil)
-	result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMVolteIMSUser{})
+	result := db.DB("").Where("core_uid = ? and ne_uid = ?", coreUid, neUid).Unscoped().Delete(&model.UDMVolteIMSUser{})
 	if result.Error != nil {
 		logger.Errorf("Delete err => %v", result.Error)
 	}
@@ -36,8 +36,11 @@ func (r UDMVolteIMSUser) SelectPage(query map[string]string) ([]model.UDMVolteIM
 	if v, ok := query["msisdn"]; ok && v != "" {
 		tx = tx.Where("msisdn like ?", fmt.Sprintf("%%%s%%", v))
 	}
-	if v, ok := query["neId"]; ok && v != "" {
-		tx = tx.Where("ne_id = ?", v)
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
+	}
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid = ?", v)
 	}
 	if v, ok := query["tag"]; ok && v != "" {
 		tx = tx.Where("tag = ?", v)
@@ -91,12 +94,15 @@ func (r UDMVolteIMSUser) SelectPage(query map[string]string) ([]model.UDMVolteIM
 func (r UDMVolteIMSUser) SelectList(u model.UDMVolteIMSUser) []model.UDMVolteIMSUser {
 	tx := db.DB("").Model(&model.UDMVolteIMSUser{})
 	// 查询条件拼接
+	if u.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", u.NeUID)
+	}
+	if u.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", u.CoreUID)
+	}
 	if u.IMSI != "" {
 		tx = tx.Where("imsi = ?", u.IMSI)
 	}
-	if u.NeId != "" {
-		tx = tx.Where("ne_id = ?", u.NeId)
-	}
 	if u.Tag != "" {
 		tx = tx.Where("tag = ?", u.Tag)
 	}
@@ -109,12 +115,13 @@ func (r UDMVolteIMSUser) SelectList(u model.UDMVolteIMSUser) []model.UDMVolteIMS
 	return arr
 }
 
-// SelectByIMSIAndMSISDNAndNeID 通过imsi,msisdn,ne_id查询
-func (r UDMVolteIMSUser) SelectByIMSIAndMSISDNAndNeID(imsi, msisdn, neId string) model.UDMVolteIMSUser {
+// SelectByIMSIAndMSISDN 通过imsi,msisdn查询
+func (r UDMVolteIMSUser) SelectByIMSIAndMSISDN(coreUid, neUid, imsi, msisdn string) model.UDMVolteIMSUser {
 	tx := db.DB("").Model(&model.UDMVolteIMSUser{})
 	item := model.UDMVolteIMSUser{}
 	// 查询条件拼接
-	tx = tx.Where("imsi = ? and msisdn = ? and ne_id = ?", imsi, msisdn, neId)
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi = ? and msisdn = ?", imsi, msisdn)
 	// 查询数据
 	if err := tx.Order("imsi asc").Limit(1).Find(&item).Error; err != nil {
 		logger.Errorf("query err => %v", err)
@@ -132,8 +139,11 @@ func (r UDMVolteIMSUser) Inserts(uArr []model.UDMVolteIMSUser) int64 {
 }
 
 // Delete 删除实体
-func (r UDMVolteIMSUser) Delete(imsi, neId string) int64 {
-	tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMVolteIMSUser{})
+func (r UDMVolteIMSUser) DeleteByIMSI(coreUid, neUid, imsi string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi = ?", imsi)
+	tx.Delete(&model.UDMVolteIMSUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("Delete err => %v", err)
 	}
@@ -141,8 +151,11 @@ func (r UDMVolteIMSUser) Delete(imsi, neId string) int64 {
 }
 
 // DeletePrefixByIMSI 删除前缀匹配的实体
-func (r UDMVolteIMSUser) DeletePrefixByIMSI(imsi, neId string) int64 {
-	tx := db.DB("").Where("imsi like ? and ne_id = ?", fmt.Sprintf("%s%%", imsi), neId).Delete(&model.UDMVolteIMSUser{})
+func (r UDMVolteIMSUser) DeletePrefixByIMSI(coreUid, neUid, imsiPrefix string) int64 {
+	tx := db.DB("")
+	tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", imsiPrefix))
+	tx.Delete(&model.UDMVolteIMSUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("DeletePrefixByIMSI err => %v", err)
 	}

src/modules/ne_data/repository/ue_event.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -22,8 +23,11 @@ func (r UEEvent) SelectByPage(neType string, query map[string]string) ([]model.U
 	tableName := fmt.Sprintf("ue_event_%s", strings.ToLower(neType))
 	tx := db.DB("").Table(tableName).Model(&model.CDREvent{})
 	// 查询条件拼接
-	if v, ok := query["rmUID"]; ok && v != "" {
-		tx = tx.Where("rm_uid = ?", v)
+	if v, ok := query["coreUid"]; ok && v != "" {
+		tx = tx.Where("core_uid = ?", v)
+	}
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid = ?", v)
 	}
 	if v, ok := query["beginTime"]; ok && v != "" {
 		if len(v) == 10 {
@@ -58,24 +62,59 @@ func (r UEEvent) SelectByPage(neType string, query map[string]string) ([]model.U
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
 
-	// 排序
-	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v
-		if o, ok := query["sortOrder"]; ok && o != "" {
-			if o == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		tx = tx.Order(sortSql)
-	}
-
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query err => %v", err)
 	}
 
+	// 排序
+	if v, ok := query["sortField"]; ok && v != "" {
+		sortField := v
+		sortOrder := "asc"
+		if o, ok := query["sortOrder"]; ok && o != "" {
+			if o == "desc" {
+				sortOrder = "desc"
+			} else {
+				sortOrder = "asc"
+			}
+		}
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.UEEvent) any{
+				"id":        func(row *model.UEEvent) any { return row.ID },
+				"timestamp": func(row *model.UEEvent) any { return row.CreatedAt },
+				"createdAt": func(row *model.UEEvent) any { return row.CreatedAt },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
 	return rows, total
 }
 

src/modules/ne_data/service/alarm.go

@@ -64,60 +64,66 @@ func (r Alarm) DeleteByIds(ids []int64) (int64, error) {
 }
 
 // FindAlarmSeqLast 查询网元告警最后一条序号
-func (s Alarm) FindAlarmSeqLast(neType, neId string) int64 {
-	return s.alarmRepository.SelectAlarmSeqLast(neType, neId)
+func (s Alarm) FindAlarmSeqLast(coreUid, neUid string) int64 {
+	return s.alarmRepository.SelectAlarmSeqLast(coreUid, neUid)
 }
 
-// ClearByIds 批量清除告警信息
-func (r Alarm) ClearByIds(ids []int64, clearUser, clearType string) (int64, error) {
+// ClearById 清除告警信息
+func (r Alarm) ClearById(id int64, coreUid, clearUser, clearType string) (int64, error) {
 	// 检查是否存在
-	arr := r.alarmRepository.SelectByIds(ids)
-	if len(arr) <= 0 {
-		return 0, fmt.Errorf("no data")
+	arr := r.alarmRepository.SelectByIds([]int64{id})
+	if len(arr) != 1 {
+		return 0, fmt.Errorf("not match id")
 	}
 
-	if len(arr) == len(ids) {
-		var rows int64 = 0
-		for _, v := range arr {
-			// 状态检查AlarmCode变更告警ID
-			if v.AlarmCode == constants.ALARM_STATE_CHECK || v.AlarmCode == constants.ALARM_CMD_CHECK || v.AlarmCode == constants.ALARM_LICENSE_CHECK {
-				v.AlarmId = fmt.Sprintf("%d%d", v.AlarmCode, v.EventTime)
-			}
-			v.AlarmStatus = oam.ALARM_STATUS_CLEAR
-			// 告警清除
-			v.ClearType = clearType
-			v.ClearUser = clearUser
-			v.ClearTime = time.Now().UnixMilli()
-			rows += r.alarmRepository.Update(v)
+	for _, v := range arr {
+		if v.CoreUID != coreUid {
+			return 0, fmt.Errorf("data not match, id: %d", v.ID)
 		}
-		return rows, nil
 	}
-	return 0, fmt.Errorf("clear fail")
+
+	var rows int64 = 0
+	for _, v := range arr {
+		// 状态检查AlarmCode变更告警ID
+		if v.AlarmCode == constants.ALARM_STATE_CHECK || v.AlarmCode == constants.ALARM_CMD_CHECK || v.AlarmCode == constants.ALARM_LICENSE_CHECK {
+			v.AlarmId = fmt.Sprintf("%d%d", v.AlarmCode, v.EventTime)
+		}
+		v.AlarmStatus = oam.ALARM_STATUS_CLEAR
+		// 告警清除
+		v.ClearType = clearType
+		v.ClearUser = clearUser
+		v.ClearTime = time.Now().UnixMilli()
+		rows += r.alarmRepository.Update(v)
+	}
+	return rows, nil
 }
 
-// AckByIds 批量确认清除告警信息
-func (r Alarm) AckByIds(ids []int64, ackUser, ackState string) (int64, error) {
+// AckById 确认清除告警信息
+func (r Alarm) AckById(id int64, coreUid, ackUser, ackState string) (int64, error) {
 	// 检查是否存在
-	arr := r.alarmRepository.SelectByIds(ids)
-	if len(arr) <= 0 {
-		return 0, fmt.Errorf("no data")
+	arr := r.alarmRepository.SelectByIds([]int64{id})
+	if len(arr) != 1 {
+		return 0, fmt.Errorf("not match id")
 	}
 
-	if len(arr) == len(ids) {
-		var rows int64 = 0
-		for _, v := range arr {
-			v.AckState = ackState
-			v.AckTime = time.Now().UnixMilli()
-			v.AckUser = ackUser
-			rows += r.alarmRepository.Update(v)
+	for _, v := range arr {
+		if v.CoreUID != coreUid {
+			return 0, fmt.Errorf("data not match, id: %d", v.ID)
 		}
-		return rows, nil
 	}
-	return 0, fmt.Errorf("ack fail")
+
+	var rows int64 = 0
+	for _, v := range arr {
+		v.AckState = ackState
+		v.AckTime = time.Now().UnixMilli()
+		v.AckUser = ackUser
+		rows += r.alarmRepository.Update(v)
+	}
+	return rows, nil
 }
 
 // CountType 告警类别数量
-func (s Alarm) CountType(alarmStatus string) []map[string]any {
+func (s Alarm) CountType(coreUid, alarmStatus string) []map[string]any {
 	data := []map[string]any{}
 	alarmTypeArr := []string{
 		oam.ALARM_TYPE_COMMUNICATION_ALARM,
@@ -134,7 +140,7 @@ func (s Alarm) CountType(alarmStatus string) []map[string]any {
 	}
 
 	// 告警类别数量
-	rows := s.alarmRepository.GroupTotal(alarmStatus, "alarm_type", -1)
+	rows := s.alarmRepository.GroupTotal(coreUid, alarmStatus, "alarm_type", -1)
 	for _, item := range data {
 		for _, v := range rows {
 			str := fmt.Sprint(v["alarm_type"])
@@ -148,7 +154,7 @@ func (s Alarm) CountType(alarmStatus string) []map[string]any {
 }
 
 // CountSeverity 告警级别数量
-func (s Alarm) CountSeverity(alarmStatus string) []map[string]any {
+func (s Alarm) CountSeverity(coreUid, alarmStatus string) []map[string]any {
 	data := []map[string]any{}
 	alarmTypeArr := []string{
 		oam.ALARM_SEVERITY_CRITICAL,
@@ -164,7 +170,7 @@ func (s Alarm) CountSeverity(alarmStatus string) []map[string]any {
 	}
 
 	// 数量
-	rows := s.alarmRepository.GroupTotal(alarmStatus, "perceived_severity", -1)
+	rows := s.alarmRepository.GroupTotal(coreUid, alarmStatus, "perceived_severity", -1)
 	for _, item := range data {
 		for _, v := range rows {
 			str := fmt.Sprint(v["perceived_severity"])
@@ -178,8 +184,8 @@ func (s Alarm) CountSeverity(alarmStatus string) []map[string]any {
 }
 
 // CountNe 告警状态前几排名
-func (s Alarm) CountNe(alarmStatus string, top int) []map[string]any {
-	data := s.alarmRepository.GroupTotal(alarmStatus, "ne_type", top)
+func (s Alarm) CountNe(coreUid, alarmStatus string, top int) []map[string]any {
+	data := s.alarmRepository.GroupTotal(coreUid, alarmStatus, "ne_type", top)
 	for _, v := range data {
 		v["neType"] = fmt.Sprint(v["ne_type"])
 		v["total"] = parse.Number(v["total"])
@@ -252,8 +258,8 @@ func (r Alarm) ExportXlsx(rows []model.Alarm, fileName, language, alarmStatus st
 			"E" + idx: row.AlarmId,
 			"F" + idx: row.AlarmCode,
 			"G" + idx: row.NeType,
-			"H" + idx: row.NeName,
-			"I" + idx: row.NeId,
+			"H" + idx: row.NeUID,
+			"I" + idx: row.CoreUID,
 		}
 		if alarmStatus == "0" {
 			clearTimeStr := date.ParseDateToStr(row.ClearTime, date.YYYY_MM_DDTHH_MM_SSZ)

src/modules/ne_data/service/alarm_event.go

@@ -57,29 +57,32 @@ func (r AlarmEvent) DeleteByIds(ids []int64) (int64, error) {
 }
 
 // FindAlarmEventSeqLast 查询网元告警最后一条序号
-func (s AlarmEvent) FindAlarmEventSeqLast(neType, neId string) int64 {
-	return s.alarmEventRepository.SelectAlarmEventSeqLast(neType, neId)
+func (s AlarmEvent) FindAlarmEventSeqLast(coreUid, neUid string) int64 {
+	return s.alarmEventRepository.SelectAlarmEventSeqLast(coreUid, neUid)
 }
 
-// ClearByIds 批量清除告警信息
-func (r AlarmEvent) ClearByIds(ids []int64, clearUser, clearType string) (int64, error) {
+// ClearById 清除告警信息
+func (r AlarmEvent) ClearById(id int64, coreUid, clearUser, clearType string) (int64, error) {
 	// 检查是否存在
-	arr := r.alarmEventRepository.SelectByIds(ids)
-	if len(arr) <= 0 {
-		return 0, fmt.Errorf("no data")
+	arr := r.alarmEventRepository.SelectByIds([]int64{id})
+	if len(arr) != 1 {
+		return 0, fmt.Errorf("not match id")
 	}
 
-	if len(arr) == len(ids) {
-		var rows int64 = 0
-		for _, v := range arr {
-			v.AlarmStatus = oam.ALARM_STATUS_CLEAR
-			// 告警清除
-			v.ClearType = clearType
-			v.ClearUser = clearUser
-			v.ClearTime = time.Now().UnixMilli()
-			rows += r.alarmEventRepository.Update(v)
+	for _, v := range arr {
+		if v.CoreUID != coreUid {
+			return 0, fmt.Errorf("data not match, id: %d", v.ID)
 		}
-		return rows, nil
 	}
-	return 0, fmt.Errorf("clear fail")
+
+	var rows int64 = 0
+	for _, v := range arr {
+		v.AlarmStatus = oam.ALARM_STATUS_CLEAR
+		// 告警清除
+		v.ClearType = clearType
+		v.ClearUser = clearUser
+		v.ClearTime = time.Now().UnixMilli()
+		rows += r.alarmEventRepository.Update(v)
+	}
+	return rows, nil
 }

src/modules/ne_data/service/cbc_message.go

@@ -322,11 +322,11 @@ func (s *CBCMessage) handleStatusChange(msg model.CBCMessage, oldStatus, newStat
 // 这个方法需要根据你的实际网元管理系统来实现
 func (s *CBCMessage) getCBCNetworkElement(neId string) (string, int64, error) {
 	// 查询网元信息
-	neInfo := neService.NewNeInfo.FindByNeTypeAndNeID("CBC", neId)
-	if neInfo.IP == "" {
+	neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid("CBC", neId)
+	if neInfo.IPAddr == "" {
 		return "", 0, fmt.Errorf("CBC network element not found for neId: %s", neId)
 	}
-	return neInfo.IP, neInfo.Port, nil
+	return neInfo.IPAddr, neInfo.Port, nil
 }
 
 // CBCHTTPClient CBC网元HTTP客户端

src/modules/ne_data/service/cdr_event.go

@@ -128,7 +128,7 @@ func (r CDREvent) ExportSMSC(rows []model.CDREvent, fileName, language string) (
 
 		dataCells = append(dataCells, map[string]any{
 			"A" + idx: row.ID,
-			"B" + idx: row.NeName,
+			"B" + idx: row.NeUID,
 			"C" + idx: recordType,
 			"D" + idx: serviceType,
 			"E" + idx: caller,
@@ -301,8 +301,8 @@ func (r CDREvent) ExportSMF(rows []model.CDREvent, fileName string) (string, err
 		dataCells = append(dataCells, map[string]any{
 			"A" + idx: row.ID,
 			"B" + idx: chargingID,
-			"C" + idx: row.NeName,
-			"D" + idx: row.RmUid,
+			"C" + idx: row.CoreUID,
+			"D" + idx: row.NeUID,
 			"E" + idx: subscriptionIDData,
 			"F" + idx: subscriptionIDType,
 			"G" + idx: dataVolumeUplink,
@@ -489,8 +489,8 @@ func (r CDREvent) ExportSGWC(rows []model.CDREvent, fileName string) (string, er
 
 		dataCells = append(dataCells, map[string]any{
 			"A" + idx: row.ID,
-			"B" + idx: row.NeName,
-			"C" + idx: row.RmUid,
+			"B" + idx: row.NeUID,
+			"C" + idx: row.CoreUID,
 			"D" + idx: chargingID,
 			"E" + idx: servedIMSI,
 			"F" + idx: servedMSISDN,
@@ -627,7 +627,7 @@ func (r CDREvent) ExportIMS(rows []model.CDREvent, fileName, language string) (s
 
 		dataCells = append(dataCells, map[string]any{
 			"A" + idx: row.ID,
-			"B" + idx: row.NeName,
+			"B" + idx: row.NeUID,
 			"C" + idx: recordType,
 			"D" + idx: callTypeLable,
 			"E" + idx: caller,

src/modules/ne_data/service/kpi_c_report.go

@@ -48,8 +48,8 @@ func (s KpiCReport) FindData(query model.KPICQuery) []map[string]any {
 
 		item := map[string]any{
 			"neType":     row.NeType,
-			"neName":     row.NeName,
-			"rmUID":      row.RmUid,
+			"neUid":      row.NeUID,
+			"coreUID":    row.CoreUID,
 			"startIndex": row.Index,
 			"timeGroup":  row.CreatedAt,
 		}

src/modules/ne_data/service/kpi_report.go

@@ -46,8 +46,8 @@ func (s KpiReport) FindData(query model.KPIQuery) []map[string]any {
 
 		item := map[string]any{
 			"neType":     row.NeType,
-			"neName":     row.NeName,
-			"rmUID":      row.RmUid,
+			"neUid":      row.NeUID,
+			"coreUID":    row.CoreUID,
 			"startIndex": row.Index,
 			"timeGroup":  row.CreatedAt,
 		}
@@ -174,7 +174,7 @@ func (r KpiReport) TitleInsert(param model.KpiTitle) int64 {
 // UPFTodayFlowFind 查询UPF总流量 N3上行 N6下行
 // day 统计天数
 // down * 8 / 1000 / 1000 单位M
-func (r KpiReport) UPFTodayFlowFind(rmUID string, day int) (int64, int64) {
+func (r KpiReport) UPFTodayFlowFind(neUid string, day int) (int64, int64) {
 	// 获取当前日期
 	now := time.Now()
 	var upTotal, downTotal int64
@@ -182,7 +182,7 @@ func (r KpiReport) UPFTodayFlowFind(rmUID string, day int) (int64, int64) {
 	// 查询最近day天的数据
 	for i := 0; i <= day; i++ {
 		dateKey := now.AddDate(0, 0, -i).Format("2006-01-02")
-		key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, rmUID, dateKey)
+		key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, neUid, dateKey)
 
 		// 读取缓存数据
 		up, err := redis.GetHash("", key, "up")
@@ -202,10 +202,10 @@ func (r KpiReport) UPFTodayFlowFind(rmUID string, day int) (int64, int64) {
 }
 
 // UPFTodayFlow UPF流量今日统计
-func (r KpiReport) UPFTodayFlowUpdate(rmUID string, upValue, downValue int64) error {
+func (r KpiReport) UPFTodayFlowUpdate(neUid string, upValue, downValue int64) error {
 	// 按日期存储统计数据
 	dateKey := time.Now().Format("2006-01-02")
-	key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, rmUID, dateKey)
+	key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, neUid, dateKey)
 
 	// 使用HIncrBy实时累加统计值
 	if err := redis.IncrBy("", key, "up", upValue); err != nil {
@@ -232,16 +232,16 @@ func (r KpiReport) UPFTodayFlowLoad(day int) {
 		if len(jsonStr) > 7 {
 			json.Unmarshal([]byte(jsonStr), &v)
 		}
-		if v.NeType == "UPF" && v.RmUID != "" {
+		if v.NeType == "UPF" && v.NeUID != "" {
 			// 查询最近day天的数据
 			for i := 0; i <= day; i++ {
 				dateKey := now.AddDate(0, 0, -i).Format("2006-01-02")
-				key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, v.RmUID, dateKey)
+				key := fmt.Sprintf("%s:UPF_FLOW:%s:%s", constants.CACHE_NE_DATA, v.NeUID, dateKey)
 				// 根据传入天数计算时间范围
 				beginTime := now.AddDate(0, 0, -i).Truncate(24 * time.Hour).UnixMilli()
 				endTime := beginTime + 24*60*60*1000 - 1
 				// 查询历史数据
-				rows := r.kpiReportRepository.SelectUPF(v.RmUID, beginTime, endTime)
+				rows := r.kpiReportRepository.SelectUPF(v.CoreUID, v.NeUID, beginTime, endTime)
 				var upTotal, downTotal int64
 
 				// 处理历史数据

src/modules/ne_data/service/udm_auth.go

@@ -23,13 +23,13 @@ type UDMAuthUser struct {
 }
 
 // dataByRedis UDM鉴权用户 db:0 中 ausf:*
-func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser {
+func (r *UDMAuthUser) dataByRedis(coreUid, neUid, imsi string) []model.UDMAuthUser {
 	arr := []model.UDMAuthUser{}
 	key := fmt.Sprintf("ausf:%s", imsi)
-	source := fmt.Sprintf("UDM_%s", neId)
+	source := fmt.Sprintf("UDM_%s", neUid)
 
 	// 网元主机的Redis客户端
-	redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId)
+	redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid)
 	if err != nil {
 		return arr
 	}
@@ -64,12 +64,14 @@ func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser {
 			amf = strings.Replace(v, "\r\n", "", 1)
 		}
 		a := model.UDMAuthUser{
+			CoreUID:   coreUid,
+			NeUID:     neUid,
+			NeType:    "UDM",
 			IMSI:      imsi,
 			Amf:       amf,
 			Ki:        m["ki"],
 			AlgoIndex: m["algo"],
 			Opc:       m["opc"],
-			NeId:      neId,
 		}
 		arr = append(arr, a)
 	}
@@ -77,20 +79,20 @@ func (r *UDMAuthUser) dataByRedis(imsi, neId string) []model.UDMAuthUser {
 }
 
 // ResetData 重置鉴权用户数据，清空数据库重新同步Redis数据
-func (r *UDMAuthUser) ResetData(neId string) int64 {
-	authArr := r.dataByRedis("*", neId)
+func (r *UDMAuthUser) ResetData(coreUid, neUid string) int64 {
+	authArr := r.dataByRedis(coreUid, neUid, "*")
 	// 数据清空后添加
-	go r.udmAuthRepository.ClearAndInsert(neId, authArr)
+	go r.udmAuthRepository.ClearAndInsert(coreUid, neUid, authArr)
 	return int64(len(authArr))
 }
 
 // ParseInfo 解析单个用户imsi鉴权信息 data从命令MML得到的结果
-func (r *UDMAuthUser) ParseInfo(imsi, neId string, data map[string]string) model.UDMAuthUser {
-	u := r.udmAuthRepository.SelectByIMSIAndNeID(imsi, neId)
-
+func (r *UDMAuthUser) ParseInfo(coreUid, neUid, imsi string, data map[string]string) model.UDMAuthUser {
+	u := r.udmAuthRepository.SelectByIMSI(coreUid, neUid, imsi)
+	u.CoreUID = coreUid
+	u.NeUID = neUid
+	u.NeType = "UDM"
 	// 用于更新
-	u.IMSI = imsi
-	u.NeId = neId
 	u.Amf = data["amf"]
 	u.Ki = data["ki"]
 	u.AlgoIndex = data["algo"]
@@ -110,17 +112,17 @@ func (r *UDMAuthUser) Find(u model.UDMAuthUser) []model.UDMAuthUser {
 
 // Insert 从数据中读取后删除imsi再存入数据库
 // imsi长度15，ki长度32，opc长度0或者32
-func (r *UDMAuthUser) Insert(neId string, u model.UDMAuthUser) int64 {
-	uArr := r.dataByRedis(u.IMSI, neId)
+func (r *UDMAuthUser) Insert(coreUid, neUid string, u model.UDMAuthUser) int64 {
+	uArr := r.dataByRedis(coreUid, neUid, u.IMSI)
 	if len(uArr) > 0 {
-		r.udmAuthRepository.Delete(u.IMSI, neId)
+		r.udmAuthRepository.DeleteByIMSI(coreUid, neUid, u.IMSI)
 		return r.udmAuthRepository.Inserts(uArr)
 	}
 	return 0
 }
 
 // InsertData 导入文件数据 dataType目前两种：txt/csv
-func (r *UDMAuthUser) InsertData(neId, dataType string, data any) int64 {
+func (r *UDMAuthUser) InsertData(coreUid, neUid, dataType string, data any) int64 {
 	// imsi截取前缀,重新获取部分数据
 	prefixes := make(map[string]struct{})
 
@@ -149,9 +151,9 @@ func (r *UDMAuthUser) InsertData(neId, dataType string, data any) int64 {
 	var num int64 = 0
 	for prefix := range prefixes {
 		// 直接删除前缀的记录
-		r.udmAuthRepository.DeletePrefixByIMSI(prefix, neId)
+		r.udmAuthRepository.DeletePrefixByIMSI(coreUid, neUid, prefix)
 		// keys ausf:4600001000004*
-		arr := r.dataByRedis(prefix+"*", neId)
+		arr := r.dataByRedis(coreUid, neUid, prefix+"*")
 		if len(arr) > 0 {
 			num += r.udmAuthRepository.Inserts(arr)
 		}
@@ -160,21 +162,20 @@ func (r *UDMAuthUser) InsertData(neId, dataType string, data any) int64 {
 }
 
 // Delete 删除单个不重新加载
-func (r *UDMAuthUser) Delete(imsi, neId string) int64 {
-	return r.udmAuthRepository.Delete(imsi, neId)
+func (r *UDMAuthUser) Delete(coreUid, neUid, imsi string) int64 {
+	return r.udmAuthRepository.DeleteByIMSI(coreUid, neUid, imsi)
 }
 
 // LoadData 重新加载从imsi开始num的数据
-func (r *UDMAuthUser) LoadData(neId, imsi, num string) {
+func (r *UDMAuthUser) LoadData(coreUid, neUid, imsi string, num int64) {
 	startIMSI, _ := strconv.ParseInt(imsi, 10, 64)
-	subNum, _ := strconv.ParseInt(num, 10, 64)
 	var i int64
-	for i = 0; i < subNum; i++ {
+	for i = 0; i < num; i++ {
 		keyIMSI := fmt.Sprintf("%015d", startIMSI+i)
 		// 删除原数据
-		r.udmAuthRepository.Delete(keyIMSI, neId)
+		r.udmAuthRepository.DeleteByIMSI(coreUid, neUid, keyIMSI)
 		// 加载数据
-		arr := r.dataByRedis(keyIMSI, neId)
+		arr := r.dataByRedis(coreUid, neUid, keyIMSI)
 		if len(arr) < 1 {
 			continue
 		}

src/modules/ne_data/service/udm_extend.go

@@ -17,17 +17,17 @@ type UDMExtend struct {
 }
 
 // FindByIMSIAndNeID 通过IMSI和网元标识查询信息 neId为%时模糊imsi查询
-func (r UDMExtend) FindByIMSIAndNeID(imsi, neId string) model.UDMExtend {
-	return r.UDMExtendRepository.SelectByIMSIAndNeID(imsi, neId)
+func (r UDMExtend) FindByIMSIAndNeID(coreUid, neUid, imsi string) model.UDMExtend {
+	return r.UDMExtendRepository.SelectByIMSI(coreUid, neUid, imsi)
 }
 
 // Save 新增或修改信息
 func (r UDMExtend) Save(u model.UDMExtend) bool {
-	r.UDMExtendRepository.Delete(u.IMSI, u.NeId)
+	r.UDMExtendRepository.DeleteByIMSI(u.CoreUID, u.NeUID, u.IMSI)
 	return r.UDMExtendRepository.Inserts([]model.UDMExtend{u}) > 0
 }
 
 // Delete 删除信息 neId为%时模糊imsi查询
-func (r UDMExtend) Delete(imsi, neId string) int64 {
-	return r.UDMExtendRepository.Delete(imsi, neId)
+func (r UDMExtend) Delete(coreUid, neUid, imsi string) int64 {
+	return r.UDMExtendRepository.DeleteByIMSI(coreUid, neUid, imsi)
 }

src/modules/ne_data/service/udm_sub.go

@@ -24,13 +24,13 @@ type UDMSubUser struct {
 }
 
 // dataByRedis UDM签约用户 db:0 中 udm-sd:*
-func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser {
+func (r *UDMSubUser) dataByRedis(coreUid, neUid, imsi string) []model.UDMSubUser {
 	arr := []model.UDMSubUser{}
 	key := fmt.Sprintf("udm-sd:%s", imsi)
-	source := fmt.Sprintf("UDM_%s", neId)
+	source := fmt.Sprintf("UDM_%s", neUid)
 
 	// 网元主机的Redis客户端
-	redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId)
+	redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid)
 	if err != nil {
 		return arr
 	}
@@ -61,12 +61,14 @@ func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser {
 		}
 
 		a := model.UDMSubUser{
-			IMSI:   imsi,      // udm-sd:360000100000130
-			MSISDN: m["gpsi"], // 8612300000130
-			NeId:   neId,
-			SmfSel: m["smf-sel"], // def_snssai
-			SmData: m["sm-dat"],  // 1-000001&cmnet&ims&3gnet
-			Cag:    m["cag"],     // def_cag
+			CoreUID: coreUid,
+			NeUID:   neUid,
+			NeType:  "UDM",
+			IMSI:    imsi,         // udm-sd:360000100000130
+			MSISDN:  m["gpsi"],    // 8612300000130
+			SmfSel:  m["smf-sel"], // def_snssai
+			SmData:  m["sm-dat"],  // 1-000001&cmnet&ims&3gnet
+			Cag:     m["cag"],     // def_cag
 		}
 
 		// def_ambr,def_nssai,0,def_arfb,def_sar,3,1,12000,1,1000,0,1,-
@@ -123,16 +125,16 @@ func (r *UDMSubUser) dataByRedis(imsi, neId string) []model.UDMSubUser {
 }
 
 // ResetData 重置鉴权用户数据，清空数据库重新同步Redis数据
-func (r *UDMSubUser) ResetData(neId string) int64 {
-	subArr := r.dataByRedis("*", neId)
+func (r *UDMSubUser) ResetData(coreUid, neUid string) int64 {
+	subArr := r.dataByRedis(coreUid, neUid, "*")
 	// 数据清空后添加
-	go r.udmSubRepository.ClearAndInsert(neId, subArr)
+	go r.udmSubRepository.ClearAndInsert(coreUid, neUid, subArr)
 	return int64(len(subArr))
 }
 
 // ParseInfo 解析单个用户imsi签约信息 data从命令MML得到的结果
-func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.UDMSubUser {
-	u := r.udmSubRepository.SelectByIMSIAndNeID(imsi, neId)
+func (r *UDMSubUser) ParseInfo(coreUid, neUid, imsi string, data map[string]string) model.UDMSubUser {
+	u := r.udmSubRepository.SelectByIMSI(coreUid, neUid, imsi)
 
 	cnType, _ := strconv.ParseInt(data["CNType"][:4], 0, 64) // 0x03(EPC|5GC)
 	rat, _ := strconv.ParseInt(data["RAT"][:4], 0, 64)       // 0x00(VIRTUAL|WLAN|EUTRA|NR)
@@ -142,9 +144,11 @@ func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.
 	}
 
 	// 用于更新
+	u.CoreUID = coreUid
+	u.NeUID = neUid
+	u.NeType = "UDM"
 	u.IMSI = imsi
 	u.MSISDN = msisdn
-	u.NeId = neId
 	u.UeAmbrTpl = data["AMBR"]
 	u.NssaiTpl = data["NSSAI"]
 	u.AreaForbiddenTpl = data["AreaForbidden"]
@@ -172,7 +176,7 @@ func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.
 	}
 
 	// 补充用户拓展信息
-	info := r.UDMExtendRepository.SelectByIMSIAndNeID(imsi, neId)
+	info := r.UDMExtendRepository.SelectByIMSI(coreUid, neUid, imsi)
 	if info.IMSI == imsi {
 		u.Remark = info.Remark
 	}
@@ -191,18 +195,20 @@ func (r *UDMSubUser) Find(u model.UDMSubUser) []model.UDMSubUser {
 
 // Insert 从数据中读取后删除imsi再存入数据库
 // imsi长度15，ki长度32，opc长度0或者32
-func (r *UDMSubUser) Insert(neId string, u model.UDMSubUser) int64 {
-	uArr := r.dataByRedis(u.IMSI, neId)
+func (r *UDMSubUser) Insert(coreUid, neUid string, u model.UDMSubUser) int64 {
+	uArr := r.dataByRedis(coreUid, neUid, u.IMSI)
 	if len(uArr) > 0 {
-		r.udmSubRepository.Delete(u.IMSI, neId)
+		r.udmSubRepository.DeleteByIMSI(coreUid, neUid, u.IMSI)
 		// 新增到拓展信息
 		if u.Remark != "" {
-			r.UDMExtendRepository.Delete(u.IMSI, "%")
+			r.UDMExtendRepository.DeleteByIMSI(coreUid, "%", u.IMSI)
 			r.UDMExtendRepository.Inserts([]model.UDMExtend{{
-				IMSI:   u.IMSI,
-				MSISDN: u.MSISDN,
-				NeId:   u.NeId,
-				Remark: u.Remark,
+				CoreUID: u.CoreUID,
+				NeUID:   u.NeUID,
+				NeType:  u.NeType,
+				IMSI:    u.IMSI,
+				MSISDN:  u.MSISDN,
+				Remark:  u.Remark,
 			}})
 		}
 		return r.udmSubRepository.Inserts(uArr)
@@ -211,7 +217,7 @@ func (r *UDMSubUser) Insert(neId string, u model.UDMSubUser) int64 {
 }
 
 // InsertData 导入文件数据 dataType目前两种：txt/csv
-func (r *UDMSubUser) InsertData(neId, dataType string, data any) int64 {
+func (r *UDMSubUser) InsertData(coreUid, neUid, dataType string, data any) int64 {
 	// imsi截取前缀,重新获取部分数据
 	prefixes := make(map[string]struct{})
 
@@ -240,9 +246,9 @@ func (r *UDMSubUser) InsertData(neId, dataType string, data any) int64 {
 	var num int64 = 0
 	for prefix := range prefixes {
 		// keys udm-sd:4600001000004*
-		arr := r.dataByRedis(prefix+"*", neId)
+		arr := r.dataByRedis(coreUid, neUid, prefix+"*")
 		if len(arr) > 0 {
-			r.udmSubRepository.DeletePrefixByIMSI(prefix, neId)
+			r.udmSubRepository.DeletePrefixByIMSI(coreUid, neUid, prefix)
 			num += r.udmSubRepository.Inserts(arr)
 		}
 	}
@@ -250,27 +256,26 @@ func (r *UDMSubUser) InsertData(neId, dataType string, data any) int64 {
 }
 
 // Delete 删除单个不重新加载
-func (r *UDMSubUser) Delete(neId, imsi string) int64 {
+func (r *UDMSubUser) Delete(coreUid, neUid, imsi string) int64 {
 	// 删除拓展信息
-	r.UDMExtendRepository.Delete(imsi, neId)
-	return r.udmSubRepository.Delete(imsi, neId)
+	r.UDMExtendRepository.DeleteByIMSI(coreUid, neUid, imsi)
+	return r.udmSubRepository.DeleteByIMSI(coreUid, neUid, imsi)
 }
 
 // LoadData 重新加载从imsi开始num的数据
 // remark不为空，则新增到拓展信息，删除标记为-(Deleted)-
-func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) {
+func (r *UDMSubUser) LoadData(coreUid, neUid, imsi string, num int64, remark string) {
 	startIMSI, _ := strconv.ParseInt(imsi, 10, 64)
-	subNum, _ := strconv.ParseInt(num, 10, 64)
 	var i int64
-	for i = 0; i < subNum; i++ {
+	for i = 0; i < num; i++ {
 		keyIMSI := fmt.Sprintf("%015d", startIMSI+i)
 		// 删除原数据
-		r.udmSubRepository.Delete(keyIMSI, neId)
+		r.udmSubRepository.DeleteByIMSI(coreUid, neUid, keyIMSI)
 		if remark == "-(Deleted)-" {
-			r.UDMExtendRepository.Delete(keyIMSI, "%")
+			r.UDMExtendRepository.DeleteByIMSI(coreUid, "%", keyIMSI)
 		}
 		// 加载数据，删除标记为-(Deleted)-加载为空不插入
-		arr := r.dataByRedis(keyIMSI, neId)
+		arr := r.dataByRedis(coreUid, neUid, keyIMSI)
 		if len(arr) < 1 {
 			continue
 		}
@@ -280,13 +285,15 @@ func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) {
 			uarr := make([]model.UDMExtend, 0, len(arr))
 			for _, v := range arr {
 				uarr = append(uarr, model.UDMExtend{
-					IMSI:   v.IMSI,
-					MSISDN: v.MSISDN,
-					NeId:   v.NeId,
-					Remark: remark,
+					CoreUID: v.CoreUID,
+					NeUID:   v.NeUID,
+					NeType:  v.NeType,
+					IMSI:    v.IMSI,
+					MSISDN:  v.MSISDN,
+					Remark:  remark,
 				})
 			}
-			r.UDMExtendRepository.Delete(keyIMSI, neId)
+			r.UDMExtendRepository.DeleteByIMSI(coreUid, neUid, keyIMSI)
 			r.UDMExtendRepository.Inserts(uarr)
 		}
 	}

src/modules/ne_data/service/udm_voip.go

@@ -23,13 +23,13 @@ type UDMVOIPUser struct {
 }
 
 // dataByRedis UDMVOIP用户 db:0 中 voip:*
-func (r UDMVOIPUser) dataByRedis(username, neId string) []model.UDMVOIPUser {
+func (r UDMVOIPUser) dataByRedis(coreUid, neUid, username string) []model.UDMVOIPUser {
 	arr := []model.UDMVOIPUser{}
 	key := fmt.Sprintf("voip:%s", username)
-	source := fmt.Sprintf("UDM_%s", neId)
+	source := fmt.Sprintf("UDM_%s", neUid)
 
 	// 网元主机的Redis客户端
-	redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId)
+	redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid)
 	if err != nil {
 		return arr
 	}
@@ -56,7 +56,9 @@ func (r UDMVOIPUser) dataByRedis(username, neId string) []model.UDMVOIPUser {
 		}
 
 		a := model.UDMVOIPUser{
-			NeId:     neId,
+			CoreUID:  coreUid,
+			NeUID:    neUid,
+			NeType:   "UDM",
 			UserName: username,
 			Password: m["password"],
 		}
@@ -66,23 +68,25 @@ func (r UDMVOIPUser) dataByRedis(username, neId string) []model.UDMVOIPUser {
 }
 
 // ResetData 重置VOIP用户数据，清空数据库重新同步Redis数据
-func (r UDMVOIPUser) ResetData(neId string) int64 {
-	arr := r.dataByRedis("*", neId)
+func (r UDMVOIPUser) ResetData(coreUid, neUid string) int64 {
+	arr := r.dataByRedis(coreUid, neUid, "*")
 	// 数据清空后添加
-	go r.udmVOIPRepository.ClearAndInsert(neId, arr)
+	go r.udmVOIPRepository.ClearAndInsert(coreUid, neUid, arr)
 	return int64(len(arr))
 }
 
 // ParseInfo 解析单个用户userName信息 data从命令MML得到的结果
-func (r UDMVOIPUser) ParseInfo(neId string, data map[string]string) model.UDMVOIPUser {
+func (r UDMVOIPUser) ParseInfo(coreUid, neUid string, data map[string]string) model.UDMVOIPUser {
 	u := model.UDMVOIPUser{
-		NeId:     neId,
+		CoreUID:  coreUid,
+		NeUID:    neUid,
+		NeType:   "UDM",
 		UserName: data["username"],
 		Password: data["password"],
 	}
 	// 赋予ID
-	item := r.udmVOIPRepository.SelectByUserNameAndNeID(u.UserName, neId)
-	if item.ID != "" {
+	item := r.udmVOIPRepository.SelectByUserName(coreUid, neUid, u.UserName)
+	if item.ID > 0 {
 		u.ID = item.ID
 	}
 	return u
@@ -99,17 +103,17 @@ func (r UDMVOIPUser) Find(u model.UDMVOIPUser) []model.UDMVOIPUser {
 }
 
 // Insert 从数据中读取后删除username再存入数据库
-func (r UDMVOIPUser) Insert(neId string, username string) int64 {
-	uArr := r.dataByRedis(username, neId)
+func (r UDMVOIPUser) Insert(coreUid, neUid string, username string) int64 {
+	uArr := r.dataByRedis(coreUid, neUid, username)
 	if len(uArr) > 0 {
-		r.udmVOIPRepository.Delete(username, neId)
+		r.udmVOIPRepository.DeleteByUserName(coreUid, neUid, username)
 		return r.udmVOIPRepository.Inserts(uArr)
 	}
 	return 0
 }
 
 // InsertData 导入文件数据 dataType目前两种：txt/csv
-func (r UDMVOIPUser) InsertData(neId, dataType string, data any) int64 {
+func (r UDMVOIPUser) InsertData(coreUid, neUid, dataType string, data any) int64 {
 	// imsi截取前缀,重新获取部分数据
 	prefixes := make(map[string]struct{})
 
@@ -138,9 +142,9 @@ func (r UDMVOIPUser) InsertData(neId, dataType string, data any) int64 {
 	var num int64 = 0
 	for prefix := range prefixes {
 		// 直接删除前缀的记录
-		r.udmVOIPRepository.DeletePrefixByUserName(prefix, neId)
+		r.udmVOIPRepository.DeletePrefixByUserName(coreUid, neUid, prefix)
 		// keys voip:4600001000004*
-		arr := r.dataByRedis(prefix+"*", neId)
+		arr := r.dataByRedis(coreUid, neUid, prefix+"*")
 		if len(arr) > 0 {
 			num += r.udmVOIPRepository.Inserts(arr)
 		}
@@ -149,21 +153,20 @@ func (r UDMVOIPUser) InsertData(neId, dataType string, data any) int64 {
 }
 
 // Delete 删除单个不重新加载
-func (r UDMVOIPUser) Delete(username, neId string) int64 {
-	return r.udmVOIPRepository.Delete(username, neId)
+func (r UDMVOIPUser) Delete(coreUid, neUid, username string) int64 {
+	return r.udmVOIPRepository.DeleteByUserName(coreUid, neUid, username)
 }
 
 // LoadData 重新加载从username开始num的数据
-func (r UDMVOIPUser) LoadData(neId, username, num string) {
+func (r UDMVOIPUser) LoadData(coreUid, neUid, username string, num int64) {
 	startUserName, _ := strconv.ParseInt(username, 10, 64)
-	subNum, _ := strconv.ParseInt(num, 10, 64)
 	var i int64
-	for i = 0; i < subNum; i++ {
+	for i = 0; i < num; i++ {
 		keyUserName := fmt.Sprintf("%d", startUserName+i)
 		// 删除原数据
-		r.udmVOIPRepository.Delete(keyUserName, neId)
+		r.udmVOIPRepository.DeleteByUserName(coreUid, neUid, keyUserName)
 		// 加载数据
-		arr := r.dataByRedis(keyUserName, neId)
+		arr := r.dataByRedis(coreUid, neUid, keyUserName)
 		if len(arr) < 1 {
 			continue
 		}

src/modules/ne_data/service/udm_volte_ims.go

@@ -23,13 +23,13 @@ type UDMVolteIMSUser struct {
 }
 
 // dataByRedis UDMVolteIMS用户 db:0 中 volte:*
-func (r UDMVolteIMSUser) dataByRedis(imsi, neId string) []model.UDMVolteIMSUser {
+func (r UDMVolteIMSUser) dataByRedis(coreUid, neUid, imsi string) []model.UDMVolteIMSUser {
 	arr := []model.UDMVolteIMSUser{}
 	key := fmt.Sprintf("volte:%s", imsi)
-	source := fmt.Sprintf("UDM_%s", neId)
+	source := fmt.Sprintf("UDM_%s", neUid)
 
 	// 网元主机的Redis客户端
-	redisClient, err := neService.NewNeInfo.NeRunRedisClient("UDM", neId)
+	redisClient, err := neService.NewNeInfo.NeRunRedisClient(coreUid, neUid)
 	if err != nil {
 		return arr
 	}
@@ -63,11 +63,13 @@ func (r UDMVolteIMSUser) dataByRedis(imsi, neId string) []model.UDMVolteIMSUser
 		}
 
 		a := model.UDMVolteIMSUser{
-			NeId:   neId,
-			IMSI:   keys[1],
-			MSISDN: keys[2],
-			Tag:    m["tag"], // volte = tag
-			VNI:    vni,
+			CoreUID: coreUid,
+			NeUID:   neUid,
+			NeType:  "UDM",
+			IMSI:    keys[1],
+			MSISDN:  keys[2],
+			Tag:     m["tag"], // volte = tag
+			VNI:     vni,
 		}
 		arr = append(arr, a)
 	}
@@ -75,15 +77,15 @@ func (r UDMVolteIMSUser) dataByRedis(imsi, neId string) []model.UDMVolteIMSUser
 }
 
 // ResetData 重置VolteIMS用户数据，清空数据库重新同步Redis数据
-func (r UDMVolteIMSUser) ResetData(neId string) int64 {
-	authArr := r.dataByRedis("*", neId)
+func (r UDMVolteIMSUser) ResetData(coreUid, neUid string) int64 {
+	authArr := r.dataByRedis(coreUid, neUid, "*")
 	// 数据清空后添加
-	go r.udmVolteIMSRepository.ClearAndInsert(neId, authArr)
+	go r.udmVolteIMSRepository.ClearAndInsert(coreUid, neUid, authArr)
 	return int64(len(authArr))
 }
 
 // ParseInfo 解析单个用户imsi信息 data从命令MML得到的结果
-func (r UDMVolteIMSUser) ParseInfo(neId string, data map[string]string) model.UDMVolteIMSUser {
+func (r UDMVolteIMSUser) ParseInfo(coreUid, neUid string, data map[string]string) model.UDMVolteIMSUser {
 	// "110011200004217@ims.mnc001.mcc110.3gppnetwork.org"
 	vni := ""
 	impiParts := strings.Split(data["impi"], "@")
@@ -95,15 +97,16 @@ func (r UDMVolteIMSUser) ParseInfo(neId string, data map[string]string) model.UD
 	}
 
 	u := model.UDMVolteIMSUser{
-		NeId:   neId,
-		IMSI:   data["imsi"],
-		MSISDN: data["msisdn"],
-		Tag:    data["volte_tag"],
-		VNI:    vni,
+		CoreUID: coreUid,
+		NeUID:   neUid,
+		IMSI:    data["imsi"],
+		MSISDN:  data["msisdn"],
+		Tag:     data["volte_tag"],
+		VNI:     vni,
 	}
 	// 赋予ID
-	item := r.udmVolteIMSRepository.SelectByIMSIAndMSISDNAndNeID(u.IMSI, u.MSISDN, neId)
-	if item.ID != "" {
+	item := r.udmVolteIMSRepository.SelectByIMSIAndMSISDN(coreUid, neUid, u.IMSI, u.MSISDN)
+	if item.ID > 0 {
 		u.ID = item.ID
 	}
 	return u
@@ -121,17 +124,17 @@ func (r UDMVolteIMSUser) Find(u model.UDMVolteIMSUser) []model.UDMVolteIMSUser {
 
 // InsertByIMSI 从数据中读取后删除imsi再存入数据库
 // imsi长度15
-func (r UDMVolteIMSUser) InsertByIMSI(imsi, neId string) int64 {
-	uArr := r.dataByRedis(imsi+":*", neId)
+func (r UDMVolteIMSUser) InsertByIMSI(coreUid, neUid, imsi string) int64 {
+	uArr := r.dataByRedis(coreUid, neUid, imsi+":*")
 	if len(uArr) > 0 {
-		r.udmVolteIMSRepository.Delete(imsi, neId)
+		r.udmVolteIMSRepository.DeleteByIMSI(coreUid, neUid, imsi)
 		return r.udmVolteIMSRepository.Inserts(uArr)
 	}
 	return 0
 }
 
 // InsertData 导入文件数据 dataType目前两种：txt/csv
-func (r UDMVolteIMSUser) InsertData(neId, dataType string, data any) int64 {
+func (r UDMVolteIMSUser) InsertData(coreUid, neUid, dataType string, data any) int64 {
 	// imsi截取前缀,重新获取部分数据
 	prefixes := make(map[string]struct{})
 
@@ -160,9 +163,9 @@ func (r UDMVolteIMSUser) InsertData(neId, dataType string, data any) int64 {
 	var num int64 = 0
 	for prefix := range prefixes {
 		// 直接删除前缀的记录
-		r.udmVolteIMSRepository.DeletePrefixByIMSI(prefix, neId)
+		r.udmVolteIMSRepository.DeletePrefixByIMSI(coreUid, neUid, prefix)
 		// keys voip:4600001000004*
-		arr := r.dataByRedis(prefix+"*", neId)
+		arr := r.dataByRedis(coreUid, neUid, prefix+"*")
 		if len(arr) > 0 {
 			num += r.udmVolteIMSRepository.Inserts(arr)
 		}
@@ -171,24 +174,23 @@ func (r UDMVolteIMSUser) InsertData(neId, dataType string, data any) int64 {
 }
 
 // Delete 删除单个不重新加载
-func (r UDMVolteIMSUser) Delete(imsi, neId string) int64 {
-	return r.udmVolteIMSRepository.Delete(imsi, neId)
+func (r UDMVolteIMSUser) Delete(coreUid, neUid, imsi string) int64 {
+	return r.udmVolteIMSRepository.DeleteByIMSI(coreUid, neUid, imsi)
 }
 
 // LoadData 重新加载从imsi开始num的数据
-func (r UDMVolteIMSUser) LoadData(neId, imsiOrMsisdn, num string) {
+func (r UDMVolteIMSUser) LoadData(coreUid, neUid, imsiOrMsisdn string, num int64) {
 	startIMSIOrMsisdn, _ := strconv.ParseInt(imsiOrMsisdn, 10, 64)
-	subNum, _ := strconv.ParseInt(num, 10, 64)
 	var i int64
-	for i = 0; i < subNum; i++ {
+	for i = 0; i < num; i++ {
 		keyIMSI := fmt.Sprintf("%015d", startIMSIOrMsisdn+i)
 		if !strings.HasPrefix(imsiOrMsisdn, "0") {
 			keyIMSI = fmt.Sprintf("%d", startIMSIOrMsisdn+i)
 		}
 		// 删除原数据
-		r.udmVolteIMSRepository.Delete(keyIMSI, neId)
+		r.udmVolteIMSRepository.DeleteByIMSI(coreUid, neUid, keyIMSI)
 		// 加载数据
-		arr := r.dataByRedis(keyIMSI+":*", neId)
+		arr := r.dataByRedis(coreUid, neUid, keyIMSI+":*")
 		if len(arr) < 1 {
 			continue
 		}