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

src/modules/core/controller/core_info.go

@@ -41,7 +41,6 @@ type CoreInfoController struct {
 //	@Description	The list of network element information is all unpaginated
 //	@Router			/core/info/list/all [get]
 func (s CoreInfoController) ListAll(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
 	var querys struct {
 		CoreUID string `form:"coreUid"` // 核心网唯一标识
 		Name    string `form:"name"`    // 名称
@@ -66,7 +65,7 @@ func (s CoreInfoController) ListAll(c *gin.Context) {
 	}
 	neList := s.coreInfoService.Find(core)
 	if len(neList) == 0 {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg("not found data"))
 		return
 	}
 	c.JSON(200, resp.OkData(neList))

src/modules/crontask/processor/backup_export_cdr/backup_export_cdr.go

@@ -65,22 +65,22 @@ func (s *BackupExportCDRProcessor) Execute(data any) (any, error) {
 		case "ims":
 			neList := s.neInfoService.Find(neModel.NeInfo{NeType: "IMS"}, false, false)
 			for _, ne := range neList {
-				result[ne.NeName] = s.exportIMS(params.Hour, ne.RmUID, params.FileType)
+				result[ne.NeName] = s.exportIMS(ne.CoreUID, ne.NeUID, params.Hour, params.FileType)
 			}
 		case "smsc":
 			neList := s.neInfoService.Find(neModel.NeInfo{NeType: "SMSC"}, false, false)
 			for _, ne := range neList {
-				result[ne.NeName] = s.exportSMSC(params.Hour, ne.RmUID, params.FileType)
+				result[ne.NeName] = s.exportSMSC(ne.CoreUID, ne.NeUID, params.Hour, params.FileType)
 			}
 		case "smf":
 			neList := s.neInfoService.Find(neModel.NeInfo{NeType: "SMF"}, false, false)
 			for _, ne := range neList {
-				result[ne.NeName] = s.exportSMF(params.Hour, ne.RmUID, params.FileType)
+				result[ne.NeName] = s.exportSMF(ne.CoreUID, ne.NeUID, params.Hour, params.FileType)
 			}
 		case "sgwc":
 			neList := s.neInfoService.Find(neModel.NeInfo{NeType: "SGWC"}, false, false)
 			for _, ne := range neList {
-				result[ne.NeName] = s.exportSGWC(params.Hour, ne.RmUID, params.FileType)
+				result[ne.NeName] = s.exportSGWC(ne.CoreUID, ne.NeUID, params.Hour, params.FileType)
 			}
 		}
 	}
@@ -90,7 +90,7 @@ func (s *BackupExportCDRProcessor) Execute(data any) (any, error) {
 }
 
 // exportIMS 导出IMS-CDR会话事件数据
-func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) string {
+func (s BackupExportCDRProcessor) exportIMS(coreUid, neUid string, hour int, fileType string) string {
 	// 前 hour 小时
 	now := time.Now()
 	end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
@@ -100,11 +100,12 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
 	query := map[string]string{
 		"sortField": "timestamp",
 		"sortOrder": "asc",
-		"rmUID":     rmUID,
+		"coreUid":   coreUid,
+		"neUid":     neUid,
 		"beginTime": fmt.Sprint(start.UnixMilli()),
 		"endTime":   fmt.Sprint(end.UnixMilli()),
 		"pageNum":   fmt.Sprint(1),
-		"pageSize":  fmt.Sprint(30000),
+		"pageSize":  fmt.Sprint(1000_0000),
 	}
 	rows, total := s.cdrEventService.FindByPage("IMS", query)
 	if total == 0 {
@@ -113,7 +114,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("ims_cdr_event_export_%d_%s.%s", len(rows), date.ParseDateToStr(end, date.YYYYMMDDHHMMSS), fileType)
-	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/ims_cdr_event", fileName)
+	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/ims_cdr_event", coreUid, neUid, fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)
 	}
@@ -225,7 +226,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
 
 			data = append(data, []string{
 				fmt.Sprint(row.ID),
-				row.NeName,
+				row.NeUID,
 				recordType,
 				callTypeLable,
 				caller,
@@ -352,7 +353,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
 
 			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,
@@ -379,7 +380,7 @@ func (s BackupExportCDRProcessor) exportIMS(hour int, rmUID, fileType string) st
 }
 
 // exportSMSC 导出SMSC-CDR会话事件数据
-func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) string {
+func (s BackupExportCDRProcessor) exportSMSC(coreUid, neUid string, hour int, fileType string) string {
 	// 前 hour 小时
 	now := time.Now()
 	end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
@@ -389,11 +390,12 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s
 	query := map[string]string{
 		"sortField": "timestamp",
 		"sortOrder": "asc",
-		"rmUID":     rmUID,
+		"coreUid":   coreUid,
+		"neUid":     neUid,
 		"beginTime": fmt.Sprint(start.UnixMilli()),
 		"endTime":   fmt.Sprint(end.UnixMilli()),
 		"pageNum":   fmt.Sprint(1),
-		"pageSize":  fmt.Sprint(30000),
+		"pageSize":  fmt.Sprint(1000_0000),
 	}
 	rows, total := s.cdrEventService.FindByPage("SMSC", query)
 	if total == 0 {
@@ -402,7 +404,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("smsc_cdr_event_export_%d_%s.%s", len(rows), date.ParseDateToStr(end, date.YYYYMMDDHHMMSS), fileType)
-	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/smsc_cdr_event", fileName)
+	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/smsc_cdr_event", coreUid, neUid, fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)
 	}
@@ -481,7 +483,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s
 
 			data = append(data, []string{
 				fmt.Sprint(row.ID),
-				row.NeName,
+				row.NeUID,
 				recordType,
 				serviceType,
 				caller,
@@ -572,7 +574,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType 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: serviceType,
 				"E" + idx: caller,
@@ -596,7 +598,7 @@ func (s BackupExportCDRProcessor) exportSMSC(hour int, rmUID, fileType string) s
 }
 
 // exportSMF 导出SMF-CDR会话事件数据
-func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) string {
+func (s BackupExportCDRProcessor) exportSMF(coreUid, neUid string, hour int, fileType string) string {
 	// 前 hour 小时
 	now := time.Now()
 	end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
@@ -605,11 +607,12 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st
 	query := map[string]string{
 		"sortField": "timestamp",
 		"sortOrder": "asc",
-		"rmUID":     rmUID,
+		"coreUid":   coreUid,
+		"neUid":     neUid,
 		"beginTime": fmt.Sprint(start.UnixMilli()),
 		"endTime":   fmt.Sprint(end.UnixMilli()),
 		"pageNum":   fmt.Sprint(1),
-		"pageSize":  fmt.Sprint(30000),
+		"pageSize":  fmt.Sprint(1000_0000),
 	}
 	rows, total := s.cdrEventService.FindByPage("SMF", query)
 	if total == 0 {
@@ -618,7 +621,7 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("smf_cdr_event_export_%d_%s.%s", len(rows), date.ParseDateToStr(end, date.YYYYMMDDHHMMSS), fileType)
-	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/smf_cdr_event", fileName)
+	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/smf_cdr_event", coreUid, neUid, fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)
 	}
@@ -780,8 +783,8 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st
 			data = append(data, []string{
 				fmt.Sprint(row.ID),
 				chargingID,
-				row.NeName,
-				row.RmUid,
+				row.NeType,
+				row.NeUID,
 				subscriptionIDData,
 				subscriptionIDType,
 				fmt.Sprint(dataVolumeUplink),
@@ -967,8 +970,8 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st
 			dataCells = append(dataCells, map[string]any{
 				"A" + idx: row.ID,
 				"B" + idx: chargingID,
-				"C" + idx: row.NeName,
-				"D" + idx: row.RmUid,
+				"C" + idx: row.NeType,
+				"D" + idx: row.NeUID,
 				"E" + idx: subscriptionIDData,
 				"F" + idx: subscriptionIDType,
 				"G" + idx: dataVolumeUplink,
@@ -1004,7 +1007,7 @@ func (s BackupExportCDRProcessor) exportSMF(hour int, rmUID, fileType string) st
 }
 
 // exportSGWC 导出SGWC-CDR会话事件数据
-func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) string {
+func (s BackupExportCDRProcessor) exportSGWC(coreUid, neUid string, hour int, fileType string) string {
 	// 前 hour 小时
 	now := time.Now()
 	end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
@@ -1013,11 +1016,12 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s
 	query := map[string]string{
 		"sortField": "timestamp",
 		"sortOrder": "asc",
-		"rmUID":     rmUID,
+		"coreUid":   coreUid,
+		"neUid":     neUid,
 		"beginTime": fmt.Sprint(start.UnixMilli()),
 		"endTime":   fmt.Sprint(end.UnixMilli()),
 		"pageNum":   fmt.Sprint(1),
-		"pageSize":  fmt.Sprint(30000),
+		"pageSize":  fmt.Sprint(1000_0000),
 	}
 	rows, total := s.cdrEventService.FindByPage("SGWC", query)
 	if total == 0 {
@@ -1026,7 +1030,7 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("sgwc_cdr_event_export_%d_%s.%s", len(rows), date.ParseDateToStr(end, date.YYYYMMDDHHMMSS), fileType)
-	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/sgwc_cdr_event", fileName)
+	filePath := filepath.Join(s.backupService.BACKUP_DIR, "/cdr/sgwc_cdr_event", coreUid, neUid, fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)
 	}
@@ -1190,8 +1194,8 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s
 
 			data = append(data, []string{
 				fmt.Sprint(row.ID),
-				row.NeName,
-				row.RmUid,
+				row.NeType,
+				row.NeUID,
 				chargingID,
 				servedIMSI,
 				servedMSISDN,
@@ -1381,8 +1385,8 @@ func (s BackupExportCDRProcessor) exportSGWC(hour int, rmUID, fileType string) s
 
 			dataCells = append(dataCells, map[string]any{
 				"A" + idx: row.ID,
-				"B" + idx: row.NeName,
-				"C" + idx: row.RmUid,
+				"B" + idx: row.NeType,
+				"C" + idx: row.NeUID,
 				"D" + idx: chargingID,
 				"E" + idx: servedIMSI,
 				"F" + idx: servedMSISDN,

src/modules/crontask/processor/backup_export_table/backup_export_table.go

@@ -343,8 +343,8 @@ func (s BackupExportTableProcessor) exportSMF(hour int, columns []string, filePa
 			if col == "id" {
 				arr[i] = fmt.Sprintf("%d", row.ID)
 			}
-			if col == "neName" || col == "ne_name" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+			if col == "neType" || col == "ne_type" {
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", col) {
@@ -462,8 +462,8 @@ func (s BackupExportTableProcessor) exportIMS(hour int, columns []string, filePa
 			if col == "id" {
 				arr[i] = fmt.Sprintf("%d", row.ID)
 			}
-			if col == "neName" || col == "ne_name" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+			if col == "neType" || col == "ne_type" {
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", col) {
@@ -652,8 +652,8 @@ func (s BackupExportTableProcessor) exportSMSC(hour int, columns []string, fileP
 			if v == "id" {
 				arr[i] = fmt.Sprintf("%d", row.ID)
 			}
-			if v == "neName" || v == "ne_name" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+			if v == "neType" || v == "ne_type" {
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", v) {
@@ -841,8 +841,8 @@ func (s BackupExportTableProcessor) exportSGWC(hour int, columns []string, fileP
 			if v == "id" {
 				arr[i] = fmt.Sprintf("%d", row.ID)
 			}
-			if v == "neName" || v == "ne_name" {
-				arr[i] = fmt.Sprintf("%v", row.NeName)
+			if v == "neType" || v == "ne_type" {
+				arr[i] = fmt.Sprintf("%v", row.NeType)
 			}
 			// 单层json
 			if strings.HasPrefix("json", v) {

src/modules/crontask/processor/backup_export_udm/backup_export_udm.go

@@ -63,13 +63,13 @@ func (s *BackupExportUDMProcessor) Execute(data any) (any, error) {
 		for _, v := range params.DataType {
 			switch v {
 			case "auth":
-				result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportAuth(neInfo.NeId, params.FileType)
+				result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportAuth(neInfo.CoreUID, neInfo.NeUID, params.FileType)
 			case "sub":
-				result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportSub(neInfo.NeId, params.FileType)
+				result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportSub(neInfo.CoreUID, neInfo.NeUID, params.FileType)
 			case "voip":
-				result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportVOIP(neInfo.NeId, params.FileType)
+				result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportVOIP(neInfo.CoreUID, neInfo.NeUID, params.FileType)
 			case "volte":
-				result[fmt.Sprintf("%s-%s", neInfo.NeId, v)] = s.exportVolte(neInfo.NeId, params.FileType)
+				result[fmt.Sprintf("%s-%s", neInfo.NeUID, v)] = s.exportVolte(neInfo.CoreUID, neInfo.NeUID, params.FileType)
 			}
 		}
 	}
@@ -79,14 +79,14 @@ func (s *BackupExportUDMProcessor) Execute(data any) (any, error) {
 }
 
 // exportAuth 导出鉴权用户数据
-func (s BackupExportUDMProcessor) exportAuth(neId, fileType string) string {
-	rows := s.udmAuthService.Find(neDataModel.UDMAuthUser{NeId: neId})
+func (s BackupExportUDMProcessor) exportAuth(coreUid, neUid, fileType string) string {
+	rows := s.udmAuthService.Find(neDataModel.UDMAuthUser{CoreUID: coreUid, NeUID: neUid})
 	if len(rows) <= 0 {
 		return "no data"
 	}
 
 	// 文件名
-	fileName := fmt.Sprintf("auth_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType)
+	fileName := fmt.Sprintf("auth_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType)
 	filePath := filepath.Join("/usr/local/omc/backup/udm_data/auth", fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)
@@ -133,14 +133,14 @@ func (s BackupExportUDMProcessor) exportAuth(neId, fileType string) string {
 }
 
 // exportSub 导出签约用户数据
-func (s BackupExportUDMProcessor) exportSub(neId, fileType string) string {
-	rows := s.udmSubService.Find(neDataModel.UDMSubUser{NeId: neId})
+func (s BackupExportUDMProcessor) exportSub(coreUid, neUid, fileType string) string {
+	rows := s.udmSubService.Find(neDataModel.UDMSubUser{CoreUID: coreUid, NeUID: neUid})
 	if len(rows) <= 0 {
 		return "no data"
 	}
 
 	// 文件名
-	fileName := fmt.Sprintf("sub_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType)
+	fileName := fmt.Sprintf("sub_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType)
 	filePath := filepath.Join("/usr/local/omc/backup/udm_data/sub", fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)
@@ -181,14 +181,14 @@ func (s BackupExportUDMProcessor) exportSub(neId, fileType string) string {
 }
 
 // exportVOIP 导出VOIP用户数据
-func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string {
-	rows := s.udmVOIPService.Find(neDataModel.UDMVOIPUser{NeId: neId})
+func (s BackupExportUDMProcessor) exportVOIP(coreUid, neUid, fileType string) string {
+	rows := s.udmVOIPService.Find(neDataModel.UDMVOIPUser{CoreUID: coreUid, NeUID: neUid})
 	if len(rows) <= 0 {
 		return "no data"
 	}
 
 	// 文件名
-	fileName := fmt.Sprintf("voip_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType)
+	fileName := fmt.Sprintf("voip_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType)
 	filePath := filepath.Join("/usr/local/omc/backup/udm_data/voip", fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)
@@ -227,14 +227,14 @@ func (s BackupExportUDMProcessor) exportVOIP(neId, fileType string) string {
 }
 
 // exportVolte 导出Volte用户数据
-func (s BackupExportUDMProcessor) exportVolte(neId, fileType string) string {
-	rows := s.udmVolteIMSService.Find(neDataModel.UDMVolteIMSUser{NeId: neId})
+func (s BackupExportUDMProcessor) exportVolte(coreUid, neUid, fileType string) string {
+	rows := s.udmVolteIMSService.Find(neDataModel.UDMVolteIMSUser{CoreUID: coreUid, NeUID: neUid})
 	if len(rows) <= 0 {
 		return "no data"
 	}
 
 	// 文件名
-	fileName := fmt.Sprintf("volte_%s_export_%s.%s", neId, time.Now().Format("20060102150405"), fileType)
+	fileName := fmt.Sprintf("volte_%s_export_%s.%s", neUid, time.Now().Format("20060102150405"), fileType)
 	filePath := filepath.Join("/usr/local/omc/backup/udm_data/volte", fileName)
 	if runtime.GOOS == "windows" {
 		filePath = fmt.Sprintf("C:%s", filePath)

src/modules/crontask/processor/delete_ne_config_backup/delete_ne_config_backup.go

@@ -55,18 +55,17 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) {
 
 	neList := s.neInfoService.Find(neModel.NeInfo{}, false, false)
 	for _, neInfo := range neList {
-		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
 		tx := db.DB("").Model(&neModel.NeConfigBackup{})
-		tx = tx.Where("ne_type = ? and ne_id = ?", neInfo.NeType, neInfo.NeId)
+		tx = tx.Where("core_uid = ? and ne_uid = ?", neInfo.CoreUID, neInfo.NeUID)
 
 		// 查询数量为0直接返回
 		var total int64 = 0
 		if err := tx.Count(&total).Error; err != nil {
-			result[neTypeAndId] = err.Error()
+			result[neInfo.NeUID] = err.Error()
 			continue
 		}
 		if total <= int64(params.StoreNum) {
-			result[neTypeAndId] = "less than storeNum"
+			result[neInfo.NeUID] = "less than storeNum"
 			continue
 		}
 
@@ -74,11 +73,11 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) {
 		var lastCreateTime int64 = 0
 		lastTx := tx.Select("create_time").Order("create_time DESC").Limit(1)
 		if err := lastTx.Find(&lastCreateTime).Error; err != nil {
-			result[neTypeAndId] = err.Error()
+			result[neInfo.NeUID] = err.Error()
 			continue
 		}
 		if lastCreateTime <= 1e12 {
-			result[neTypeAndId] = "no data"
+			result[neInfo.NeUID] = "no data"
 			continue
 		}
 
@@ -89,22 +88,22 @@ func (s *DeleteNeConfigBackupProcessor) Execute(data any) (any, error) {
 		// 删除小于最后时间的数据
 		delTx := tx.Delete("create_time < ?", ltTime.UnixMilli())
 		if err := delTx.Error; err != nil {
-			result[neTypeAndId] = err.Error()
+			result[neInfo.NeUID] = err.Error()
 			continue
 		}
-		result[neTypeAndId] = tx.RowsAffected
+		result[neInfo.NeUID] = tx.RowsAffected
 
 		// 删除本地文件
-		s.deleteFile(neInfo.NeType, neInfo.NeId, ltTime)
+		s.deleteFile(neInfo.CoreUID, neInfo.NeUID, ltTime)
 	}
 
 	return result, nil
 }
 
 // deleteFile 删除本地文件
-func (s DeleteNeConfigBackupProcessor) deleteFile(neType, neId string, oldFileDate time.Time) {
+func (s DeleteNeConfigBackupProcessor) deleteFile(neType, neUid string, oldFileDate time.Time) {
 	neTypeLower := strings.ToLower(neType)
-	localPath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s ", neTypeLower, neId)
+	localPath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s ", neTypeLower, neUid)
 	files, err := os.ReadDir(localPath)
 	if err != nil {
 		logger.Errorf("logger Remove ne_config File ReadDir err: %v", err.Error())
@@ -113,7 +112,7 @@ func (s DeleteNeConfigBackupProcessor) deleteFile(neType, neId string, oldFileDa
 	for _, file := range files {
 		// 跳过非指定文件名
 		// zipFileName := fmt.Sprintf("%s-%s-etc-%s.zip", neTypeLower, neInfo.NeId, date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS))
-		fileName := fmt.Sprintf("%s-%s-etc-", neTypeLower, neId)
+		fileName := fmt.Sprintf("%s-%s-etc-", neTypeLower, neUid)
 		if !strings.HasPrefix(file.Name(), fileName) {
 			continue
 		}

src/modules/crontask/processor/ne_alarm_state_check/ne_alarm_state_check.go

@@ -75,7 +75,7 @@ func (s *NeAlarmStateCheckProcessor) Execute(data any) (any, error) {
 		}
 		// 创建告警
 		alarm := oam.Alarm{
-			NeUid:             neInfo.RmUID,                // 网元唯一标识
+			NeUid:             neInfo.NeUID,                // 网元唯一标识
 			AlarmTime:         time.Now().UnixMilli(),      // 事件产生时间
 			AlarmId:           params.AlarmId,              // 告警ID 唯一，清除时对应
 			AlarmCode:         constants.ALARM_STATE_CHECK, // 告警状态码
@@ -89,7 +89,7 @@ func (s *NeAlarmStateCheckProcessor) Execute(data any) (any, error) {
 			LocationInfo:      "NE State: Heartbeat",       // 告警定位信息
 		}
 		if err = oamService.NewAlarm.Resolve(alarm); err == nil {
-			result[neInfo.RmUID] = "state alarm"
+			result[neInfo.NeUID] = "state alarm"
 		}
 	}
 

src/modules/crontask/processor/ne_alarm_state_check_cmd/ne_alarm_state_check_cmd.go

@@ -118,7 +118,7 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
 		if len(warnMsg) > 0 {
 			currentTime := time.Now()
 			validTimes := []time.Time{}
-			if v, ok := triggerCount.Load(neInfo.RmUID); ok {
+			if v, ok := triggerCount.Load(neInfo.NeUID); ok {
 				times := v.([]time.Time)
 				// 清理过期的记录：10秒前的触发记录不再计入
 				for _, t := range times {
@@ -127,11 +127,11 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
 					}
 				}
 				validTimes = append(validTimes, currentTime)
-				triggerCount.Store(neInfo.RmUID, validTimes)
+				triggerCount.Store(neInfo.NeUID, validTimes)
 			} else {
 				// 事件第一次触发，初始化记录
 				validTimes = append(validTimes, currentTime)
-				triggerCount.Store(neInfo.RmUID, validTimes)
+				triggerCount.Store(neInfo.NeUID, validTimes)
 			}
 			if int64(len(validTimes)) >= triggerMax {
 				err = fmt.Errorf("greater than %s", strings.Join(warnMsg, ", "))
@@ -155,7 +155,7 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
 		params.AlarmId = fmt.Sprintf("%d%d", constants.ALARM_CMD_CHECK, alarmTime)
 		// 创建告警
 		alarm := oam.Alarm{
-			NeUid:             neInfo.RmUID,                    // 网元唯一标识
+			NeUid:             neInfo.NeUID,                    // 网元唯一标识
 			AlarmTime:         alarmTime,                       // 事件产生时间
 			AlarmId:           params.AlarmId,                  // 告警ID 唯一，清除时对应
 			AlarmCode:         constants.ALARM_CMD_CHECK,       // 告警状态码
@@ -169,9 +169,9 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
 			LocationInfo:      "NE CPU/Menory/Disk: Heartbeat", // 告警定位信息
 		}
 		if err = oamService.NewAlarm.Resolve(alarm); err == nil {
-			result[neInfo.RmUID] = "cmd alarm"
+			result[neInfo.NeUID] = "cmd alarm"
 		}
-		triggerCount.Delete(neInfo.RmUID)
+		triggerCount.Delete(neInfo.NeUID)
 	}
 
 	// 返回结果，用于记录执行结果
@@ -222,8 +222,9 @@ func (s NeAlarmStateCheckCMDProcessor) serverState(state map[string]any) (float6
 
 	// 插入网元状态记录
 	neState := neDataModel.NEState{
+		CoreUID:      fmt.Sprint(state["coreUid"]),
+		NeUID:        fmt.Sprint(state["neUid"]),
 		NeType:       fmt.Sprint(state["neType"]),
-		NeId:         fmt.Sprint(state["neId"]),
 		Version:      fmt.Sprint(state["version"]),
 		Capability:   parse.Number(state["capability"]),
 		SerialNum:    fmt.Sprint(state["sn"]),
@@ -240,7 +241,7 @@ func (s NeAlarmStateCheckCMDProcessor) serverState(state map[string]any) (float6
 	ltTime := time.Now().AddDate(0, 0, -7).UnixMilli()
 	s.neStateService.DeleteByTime(ltTime)
 	// 推送ws消息
-	groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_NE_STATE, neState.NeType, neState.NeId)
+	groupID := fmt.Sprintf("%s_%s_%s", wsService.GROUP_NE_STATE, neState.CoreUID, neState.NeUID)
 	s.wsSendService.ByGroupID(groupID, neState)
 
 	return sysCpuUsage, sysMemUsage, sysDiskUsage

src/modules/crontask/processor/ne_alarm_state_check_license/ne_alarm_state_check_license.go

@@ -91,7 +91,7 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) {
 		params.AlarmId = fmt.Sprintf("%d%d", constants.ALARM_LICENSE_CHECK, neInfo.CreateTime)
 		// 创建告警
 		alarm := oam.Alarm{
-			NeUid:             neInfo.RmUID,                  // 网元唯一标识
+			NeUid:             neInfo.NeUID,                  // 网元唯一标识
 			AlarmTime:         time.Now().UnixMilli(),        // 事件产生时间
 			AlarmId:           params.AlarmId,                // 告警ID 唯一，清除时对应
 			AlarmCode:         constants.ALARM_LICENSE_CHECK, // 告警状态码
@@ -105,7 +105,7 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) {
 			LocationInfo:      "NE License: Heartbeat",       // 告警定位信息
 		}
 		if err = oamService.NewAlarm.Resolve(alarm); err == nil {
-			result[neInfo.RmUID] = "license alarm"
+			result[neInfo.NeUID] = "license alarm"
 		}
 	}
 

src/modules/crontask/processor/ne_config_backup/ne_config_backup.go

@@ -1,7 +1,6 @@
 package ne_config_backup
 
 import (
-	"fmt"
 	"path/filepath"
 
 	"be.ems/src/framework/cron"
@@ -38,34 +37,34 @@ func (s *NeConfigBackupProcessor) Execute(data any) (any, error) {
 
 	neList := s.neInfoService.Find(neModel.NeInfo{}, false, false)
 	for _, neInfo := range neList {
-		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
 		// 将网元文件备份到本地
 		zipFilePath, err := s.neConfigBackupService.FileNeToLocal(neInfo)
 		if err != nil {
-			result[neTypeAndId] = err.Error()
+			result[neInfo.NeUID] = err.Error()
 			continue
 		}
 
 		// 新增备份记录
 		item := neModel.NeConfigBackup{
+			CoreUID:  neInfo.CoreUID,
+			NeUID:    neInfo.NeUID,
 			NeType:   neInfo.NeType,
-			NeId:     neInfo.NeId,
 			Name:     filepath.Base(zipFilePath),
 			Path:     zipFilePath,
 			CreateBy: "system",
 		}
 		rows := s.neConfigBackupService.Insert(item)
 		if rows <= 0 {
-			result[neTypeAndId] = "failed"
+			result[neInfo.NeUID] = "failed"
 			continue
 		}
 
 		msg := "ok"
 		// 上传到FTP服务器
 		if err := s.backupService.FTPPushFile(zipFilePath, ""); err != nil {
-			result[neTypeAndId] = msg + ", ftp err:" + err.Error()
+			result[neInfo.NeUID] = msg + ", ftp err:" + err.Error()
 		}
-		result[neTypeAndId] = msg
+		result[neInfo.NeUID] = msg
 	}
 
 	return result, nil

src/modules/crontask/processor/ne_data_udm/ne_data_udm.go

@@ -11,18 +11,22 @@ import (
 )
 
 var NewProcessor = &NeDataUDM{
-	udmAuthService: neDataService.NewUDMAuthUser,
-	udmSubService:  neDataService.NewUDMSubUser,
-	neInfoService:  neService.NewNeInfo,
-	count:          0,
+	count:              0,
+	neInfoService:      neService.NewNeInfo,
+	udmAuthService:     neDataService.NewUDMAuthUser,
+	udmSubService:      neDataService.NewUDMSubUser,
+	udmVOIPService:     neDataService.NewUDMVOIPUser,
+	udmVolteIMSService: neDataService.NewUDMVolteIMSUser,
 }
 
 // NeDataUDM 网元配置文件定期备份
 type NeDataUDM struct {
-	udmAuthService *neDataService.UDMAuthUser // UDM鉴权信息
-	udmSubService  *neDataService.UDMSubUser  // UDM签约信息
-	neInfoService  *neService.NeInfo          // 网元信息服务
-	count          int                        // 执行次数
+	count              int                            // 执行次数
+	neInfoService      *neService.NeInfo              // 网元信息服务
+	udmAuthService     *neDataService.UDMAuthUser     // UDM鉴权信息服务
+	udmSubService      *neDataService.UDMSubUser      // UDM签约信息服务
+	udmVOIPService     *neDataService.UDMVOIPUser     // UDMVOIP信息服务
+	udmVolteIMSService *neDataService.UDMVolteIMSUser // UDMVolteIMS信息服务
 }
 
 func (s *NeDataUDM) Execute(data any) (any, error) {
@@ -37,8 +41,10 @@ func (s *NeDataUDM) Execute(data any) (any, error) {
 
 	neList := s.neInfoService.Find(neModel.NeInfo{NeType: "UDM"}, false, false)
 	for _, neInfo := range neList {
-		result[fmt.Sprintf("AuthNumber_%s", neInfo.NeId)] = s.udmAuthService.ResetData(neInfo.NeId)
-		result[fmt.Sprintf("SubNumber_%s", neInfo.NeId)] = s.udmSubService.ResetData(neInfo.NeId)
+		result[fmt.Sprintf("AuthNumber_%s", neInfo.NeUID)] = s.udmAuthService.ResetData(neInfo.CoreUID, neInfo.NeUID)
+		result[fmt.Sprintf("SubNumber_%s", neInfo.NeUID)] = s.udmSubService.ResetData(neInfo.CoreUID, neInfo.NeUID)
+		result[fmt.Sprintf("VOIPNumber_%s", neInfo.NeUID)] = s.udmVOIPService.ResetData(neInfo.CoreUID, neInfo.NeUID)
+		result[fmt.Sprintf("VolteIMSNumber_%s", neInfo.NeUID)] = s.udmVolteIMSService.ResetData(neInfo.CoreUID, neInfo.NeUID)
 	}
 
 	return result, nil

src/modules/ne/controller/action.go

@@ -15,27 +15,26 @@ import (
 	"be.ems/src/framework/ssh"
 	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/generate"
-	neService "be.ems/src/modules/ne/service"
+	"be.ems/src/modules/ne/service"
 )
 
 // 实例化控制层 NeActionController 结构体
 var NewNeAction = &NeActionController{
-	neInfoService: neService.NewNeInfo,
+	neInfoService: service.NewNeInfo,
 }
 
 // 网元处理请求
 //
 // PATH /action
 type NeActionController struct {
-	// 网元信息服务
-	neInfoService *neService.NeInfo
+	neInfoService *service.NeInfo // 网元信息服务
 }
 
-// 从本地到网元发送文件
+// 从本地到网元-发送文件
 //
-// POST /pushFile
+// POST /file/push
 //
-//	@Tags			ne
+//	@Tags			network_element/action
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -43,12 +42,12 @@ type NeActionController struct {
 //	@Security		TokenAuth
 //	@Summary		Sending files from local to network elements
 //	@Description	Sending files from local to network elements
-//	@Router			/ne/action/pushFile [post]
-func (s *NeActionController) PushFile(c *gin.Context) {
+//	@Router			/ne/action/file/push [post]
+func (s *NeActionController) FilePush(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeType     string `json:"neType" binding:"required"`
-		NeID       string `json:"neId" binding:"required"`
+		CoreUID    string `json:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID      string `json:"neUid" binding:"required"`   // 网元唯一标识
 		UploadPath string `json:"uploadPath" binding:"required"`
 		DelTemp    bool   `json:"delTemp"` // 删除本地临时文件
 	}
@@ -59,14 +58,14 @@ func (s *NeActionController) PushFile(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, 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
 	}
 
 	// 网元主机的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
@@ -99,15 +98,15 @@ func (s *NeActionController) PushFile(c *gin.Context) {
 	c.JSON(200, resp.OkData(filepath.ToSlash(neFilePath)))
 }
 
-// 从网元到本地获取文件
+// 从网元到本地-获取文件
 //
-// GET /pullFile
+// GET /file/pull
 //
-//	@Tags			ne
+//	@Tags			network_element/action
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType		query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)	default(UPF)
-//	@Param			neId		query		string	true	"NE ID"		default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Param			path		query		string	true	"dir path"	default(/var/log)
 //	@Param			fileName	query		string	true	"file name"
 //	@Param			delTemp		query		boolean	false	"Delete Temp File"	default(false)
@@ -115,31 +114,31 @@ func (s *NeActionController) PushFile(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Getting files from the network element to the local
 //	@Description	Getting files from the network element to the local
-//	@Router			/ne/action/pullFile [get]
-func (s *NeActionController) PullFile(c *gin.Context) {
+//	@Router			/ne/action/file/pull [get]
+func (s *NeActionController) FilePull(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	var querys struct {
-		NeType   string `form:"neType" binding:"required"`
-		NeID     string `form:"neId" binding:"required"`
+	var query struct {
+		CoreUID  string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID    string `form:"neUid" binding:"required"`   // 网元唯一标识
 		Path     string `form:"path" binding:"required"`
 		FileName string `form:"fileName" binding:"required"`
 		DelTemp  bool   `form:"delTemp"` // 删除本地临时文件
 	}
-	if err := c.ShouldBindQuery(&querys); err != nil {
+	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(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.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
 	}
 
 	// 网元主机的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
@@ -153,8 +152,8 @@ func (s *NeActionController) PullFile(c *gin.Context) {
 	}
 	defer sftpClient.Close()
 
-	nePath := filepath.ToSlash(filepath.Join(querys.Path, querys.FileName))
-	fileName := generate.Code(6) + "_" + querys.FileName
+	nePath := filepath.ToSlash(filepath.Join(query.Path, query.FileName))
+	fileName := generate.Code(6) + "_" + query.FileName
 	localFilePath := filepath.Join("/tmp/omc/pull", fileName)
 	if runtime.GOOS == "windows" {
 		localFilePath = fmt.Sprintf("C:%s", localFilePath)
@@ -166,34 +165,34 @@ func (s *NeActionController) PullFile(c *gin.Context) {
 	}
 
 	defer func() {
-		if querys.DelTemp {
+		if query.DelTemp {
 			_ = os.Remove(localFilePath)
 		}
 	}()
 	c.FileAttachment(localFilePath, fileName)
 }
 
-// 从网元到本地获取目录压缩为ZIP
+// 从网元到本地-获取目录压缩为ZIP
 //
-// GET /pullDirZip
+// GET /file/pull/dirzip
 //
-//	@Tags			ne
+//	@Tags			network_element/action
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType	query		string	true	"NE Type"			Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)	default(UPF)
-//	@Param			neId	query		string	true	"NE ID"				default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Param			path	query		string	true	"dir path"			default(/var/log)
 //	@Param			delTemp	query		boolean	false	"Delete Temp File"	default(false)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Get directories compressed to ZIP from the network element to the local area
 //	@Description	Get directories compressed to ZIP from the network element to the local area
-//	@Router			/ne/action/pullDirZip [get]
-func (s *NeActionController) PullDirZip(c *gin.Context) {
+//	@Router			/ne/action/file/pull/dirzip [get]
+func (s *NeActionController) FilePullDirZip(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
-		NeType  string `form:"neType" binding:"required"`
-		NeID    string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 		Path    string `form:"path" binding:"required"`
 		DelTemp bool   `form:"delTemp"` // 删除本地临时文件
 	}
@@ -204,14 +203,14 @@ func (s *NeActionController) PullDirZip(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
 	}
 
 	// 网元主机的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
@@ -239,7 +238,7 @@ func (s *NeActionController) PullDirZip(c *gin.Context) {
 	}
 
 	// 压缩zip文件名
-	zipFileName := fmt.Sprintf("%s-%s-%s.zip", neInfo.NeType, neInfo.NeId, dirName)
+	zipFileName := fmt.Sprintf("%s-%s-%s.zip", neInfo.NeType, neInfo.NeUID, dirName)
 	zipFilePath := filepath.Join(localFilePath, zipFileName)
 	if err := file.CompressZipByDir(zipFilePath, localDirFilePath); err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
@@ -254,11 +253,11 @@ func (s *NeActionController) PullDirZip(c *gin.Context) {
 	c.FileAttachment(zipFilePath, zipFileName)
 }
 
-// 查看网元端文件内容
+// 网元端文件查看内容
 //
-// GET /viewFile
+// GET /file/view
 //
-//	@Tags			ne
+//	@Tags			network_element/action
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType		query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)	default(UPF)
@@ -269,12 +268,12 @@ func (s *NeActionController) PullDirZip(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Viewing the contents of a file on the network element side
 //	@Description	Viewing the contents of a file on the network element side
-//	@Router			/ne/action/viewFile [get]
-func (s *NeActionController) ViewFile(c *gin.Context) {
+//	@Router			/ne/action/file/view [get]
+func (s *NeActionController) FileView(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
-		NeType   string `form:"neType" binding:"required"`
-		NeID     string `form:"neId" binding:"required"`
+		CoreUID  string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID    string `form:"neUid" binding:"required"`   // 网元唯一标识
 		Path     string `form:"path" binding:"required"`
 		FileName string `form:"fileName" binding:"required"`
 	}
@@ -285,14 +284,14 @@ func (s *NeActionController) ViewFile(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
 	}
 
 	// 网元主机的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
@@ -313,9 +312,9 @@ func (s *NeActionController) ViewFile(c *gin.Context) {
 
 // 网元端文件列表
 //
-// GET /files
+// GET /file/list
 //
-//	@Tags			ne
+//	@Tags			network_element/action
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType		query		string	true	"NE Type"		Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)	default(UPF)
@@ -328,12 +327,12 @@ func (s *NeActionController) ViewFile(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		List of files on the network element side
 //	@Description	List of files on the network element side
-//	@Router			/ne/action/files [get]
-func (s *NeActionController) Files(c *gin.Context) {
+//	@Router			/ne/action/file/list [get]
+func (s *NeActionController) FileList(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
-		NeType   string `form:"neType" binding:"required"`
-		NeID     string `form:"neId" binding:"required"`
+		CoreUID  string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID    string `form:"neUid" binding:"required"`   // 网元唯一标识
 		Path     string `form:"path"  binding:"required"`
 		PageNum  int64  `form:"pageNum"  binding:"required"`
 		PageSize int64  `form:"pageSize"  binding:"required"`
@@ -346,14 +345,14 @@ func (s *NeActionController) Files(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
 	}
 
 	// 网元主机的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
@@ -395,7 +394,7 @@ func (s *NeActionController) Files(c *gin.Context) {
 //
 // PUT /service
 //
-//	@Tags			ne
+//	@Tags			network_element/action
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -407,9 +406,9 @@ func (s *NeActionController) Files(c *gin.Context) {
 func (s *NeActionController) Service(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeType string `json:"neType" binding:"required"`
-		NeID   string `json:"neId" binding:"required"`
-		Action string `json:"action" binding:"required,oneof=start restart stop reboot poweroff"` // 操作行为
+		CoreUID string `json:"coreUid" binding:"required"`                                         // 核心网唯一标识
+		NeUID   string `json:"neUid" binding:"required"`                                           // 网元唯一标识
+		Action  string `json:"action" binding:"required,oneof=start restart stop reboot poweroff"` // 操作行为
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -418,8 +417,8 @@ func (s *NeActionController) Service(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, 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
 	}
@@ -444,7 +443,7 @@ func (s *NeActionController) Service(c *gin.Context) {
 		cmdStr = "sudo shutdown -h now"
 	}
 
-	_, err := s.neInfoService.NeRunSSHCmd(body.NeType, body.NeID, cmdStr)
+	_, err := s.neInfoService.NeRunSSHCmd(neInfo.CoreUID, neInfo.NeUID, cmdStr)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return

src/modules/ne/controller/ne_config.go

@@ -160,7 +160,7 @@ func (s NeConfigController) Remove(c *gin.Context) {
 //
 // GET /list/:neType
 //
-//	@Tags			ne/config
+//	@Tags			network_element/config
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType	path		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
@@ -183,7 +183,7 @@ func (s NeConfigController) ListByNeType(c *gin.Context) {
 //
 // GET /data
 //
-//	@Tags			ne/config
+//	@Tags			network_element/config
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType		query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
@@ -197,8 +197,8 @@ func (s NeConfigController) ListByNeType(c *gin.Context) {
 func (s NeConfigController) DataInfo(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeType    string `form:"neType" binding:"required"`    // 网元类型
-		NeId      string `form:"neId" binding:"required"`      // 网元ID
+		CoreUID   string `form:"coreUid" binding:"required"`   // 核心网唯一标识
+		NeUID     string `form:"neUid" binding:"required"`     // 网元唯一标识
 		ParamName string `form:"paramName" binding:"required"` // 可用属性
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
@@ -207,13 +207,13 @@ func (s NeConfigController) DataInfo(c *gin.Context) {
 		return
 	}
 
-	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
 	}
 
-	if query.NeType == "OMC" {
+	if neInfo.NeType == "OMC" {
 		resData := s.neConfigService.GetOMCYaml(query.ParamName)
 		c.JSON(200, resp.OkData(resData))
 		return
@@ -233,7 +233,7 @@ func (s NeConfigController) DataInfo(c *gin.Context) {
 //
 // PUT /data
 //
-//	@Tags			ne/config
+//	@Tags			network_element/config
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -245,8 +245,8 @@ func (s NeConfigController) DataInfo(c *gin.Context) {
 func (s NeConfigController) DataEdit(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeType    string         `json:"neType" binding:"required"` // 网元类型
-		NeId      string         `json:"neId" binding:"required"`   // 网元ID
+		CoreUID   string         `json:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID     string         `json:"neUid" binding:"required"`   // 网元唯一标识
 		ParamName string         `json:"paramName" binding:"required"`
 		ParamData map[string]any `json:"paramData" binding:"required"`
 		Loc       string         `json:"loc"` // 仅array使用与数据对象内index一致,有多层时划分嵌套层(index/subParamName/index)
@@ -257,12 +257,12 @@ func (s NeConfigController) DataEdit(c *gin.Context) {
 		return
 	}
 
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, 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
 	}
-	if body.NeType == "OMC" {
+	if neInfo.NeType == "OMC" {
 		err := s.neConfigService.ModifyOMCYaml(body.ParamName, body.Loc, body.ParamData)
 		if err != nil {
 			c.JSON(200, resp.ErrMsg(err.Error()))
@@ -289,7 +289,7 @@ func (s NeConfigController) DataEdit(c *gin.Context) {
 //
 // POST /data
 //
-//	@Tags			ne/config
+//	@Tags			network_element/config
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -301,8 +301,8 @@ func (s NeConfigController) DataEdit(c *gin.Context) {
 func (s NeConfigController) DataAdd(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeType    string         `json:"neType" binding:"required"`    // 网元类型
-		NeId      string         `json:"neId" binding:"required"`      // 网元ID
+		CoreUID   string         `json:"coreUid" binding:"required"`   // 核心网唯一标识
+		NeUID     string         `json:"neUid" binding:"required"`     // 网元唯一标识
 		ParamName string         `json:"paramName" binding:"required"` // 根据配置可选值
 		ParamData map[string]any `json:"paramData" binding:"required"` // 数据对象
 		Loc       string         `json:"loc" binding:"required"`       // 与数据对象内index一致,有多层时划分嵌套层(index/subParamName/index)
@@ -313,8 +313,14 @@ func (s NeConfigController) DataAdd(c *gin.Context) {
 		return
 	}
 
+	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
+	}
+
 	// 检查是否array
-	info := s.neConfigService.FindByNeTypeAndParamName(body.NeType, body.ParamName)
+	info := s.neConfigService.FindByNeTypeAndParamName(neInfo.NeType, body.ParamName)
 	if info.ParamType != "array" {
 		c.JSON(200, resp.ErrMsg("this attribute does not support adding"))
 		return
@@ -326,12 +332,6 @@ func (s NeConfigController) DataAdd(c *gin.Context) {
 		return
 	}
 
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, body.NeId)
-	if neInfo.NeId != body.NeId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-
 	// 网元直连
 	resData, err := neFetchlink.NeConfigAdd(neInfo, body.ParamName, body.Loc, body.ParamData)
 	if err != nil {
@@ -345,7 +345,7 @@ func (s NeConfigController) DataAdd(c *gin.Context) {
 //
 // DELETE /data
 //
-//	@Tags			ne/config
+//	@Tags			network_element/config
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType		query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
@@ -360,8 +360,8 @@ func (s NeConfigController) DataAdd(c *gin.Context) {
 func (s NeConfigController) DataRemove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var query struct {
-		NeType    string `form:"neType" binding:"required"` // 网元类型
-		NeId      string `form:"neId" binding:"required"`   // 网元ID
+		CoreUID   string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID     string `form:"neUid" binding:"required"`   // 网元唯一标识
 		ParamName string `form:"paramName" binding:"required"`
 		Loc       string `form:"loc" binding:"required"` // 与数据对象内index一致,有多层时划分嵌套层(index/subParamName/index)
 	}
@@ -371,16 +371,16 @@ func (s NeConfigController) DataRemove(c *gin.Context) {
 		return
 	}
 
-	// 检查是否array
-	info := s.neConfigService.FindByNeTypeAndParamName(query.NeType, query.ParamName)
-	if info.ParamType != "array" {
-		c.JSON(200, resp.ErrMsg("this attribute does not support adding"))
+	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
 	}
 
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(query.NeType, query.NeId)
-	if neInfo.NeId != query.NeId || neInfo.IP == "" {
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+	// 检查是否array
+	info := s.neConfigService.FindByNeTypeAndParamName(neInfo.NeType, query.ParamName)
+	if info.ParamType != "array" {
+		c.JSON(200, resp.ErrMsg("this attribute does not support adding"))
 		return
 	}
 

src/modules/ne/controller/ne_config_backup.go

@@ -10,10 +10,8 @@ import (
 	"be.ems/src/framework/reqctx"
 	"be.ems/src/framework/resp"
 	"be.ems/src/framework/utils/file"
-	"be.ems/src/framework/utils/parse"
 	"be.ems/src/modules/ne/model"
 	neService "be.ems/src/modules/ne/service"
-	systemService "be.ems/src/modules/system/service"
 
 	"github.com/gin-gonic/gin"
 )
@@ -22,7 +20,6 @@ import (
 var NewNeConfigBackup = &NeConfigBackupController{
 	neConfigBackupService: neService.NewNeConfigBackup,
 	neInfoService:         neService.NewNeInfo,
-	sysConfigService:      systemService.NewSysConfig,
 }
 
 // 网元配置文件备份记录
@@ -31,7 +28,6 @@ var NewNeConfigBackup = &NeConfigBackupController{
 type NeConfigBackupController struct {
 	neConfigBackupService *neService.NeConfigBackup // 网元配置文件备份记录服务
 	neInfoService         *neService.NeInfo         // 网元信息服务
-	sysConfigService      *systemService.SysConfig  // 参数配置服务
 }
 
 // 网元配置文件备份记录列表
@@ -39,6 +35,11 @@ type NeConfigBackupController struct {
 // GET /list
 func (s NeConfigBackupController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
+	coreUid, coreUidOk := query["coreUid"]
+	if !coreUidOk || coreUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid is empty"))
+		return
+	}
 	rows, total := s.neConfigBackupService.FindByPage(query)
 	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
@@ -48,19 +49,29 @@ func (s NeConfigBackupController) List(c *gin.Context) {
 // GET /download?id=xx
 func (s NeConfigBackupController) Download(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	id := parse.Number(c.Query("id"))
-	if id <= 0 {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		ID      int64  `form:"id" binding:"required"`      // 记录ID
+	}
+	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
 	}
 
-	item := s.neConfigBackupService.FindById(id)
-	if item.ID != id {
-		// 没有可访问主机命令数据！
+	// 检查是否存在
+	rows := s.neConfigBackupService.Find(model.NeConfigBackup{
+		CoreUID: query.CoreUID,
+		NeUID:   query.NeUID,
+		ID:      query.ID,
+	})
+	if len(rows) <= 0 {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neConfigBackup.noData")))
 		return
 	}
 
+	item := rows[0]
 	if _, err := os.Stat(item.Path); err != nil {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neConfigBackup.notFoundFile")))
 		return
@@ -74,9 +85,11 @@ func (s NeConfigBackupController) Download(c *gin.Context) {
 func (s NeConfigBackupController) Edit(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		ID     int64  `json:"id" binding:"required"`     // 记录ID
-		Name   string `json:"name" binding:"required"`   // 名称
-		Remark string `json:"remark" binding:"required"` // 备注
+		CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `json:"neUid" binding:"required"`   // 网元唯一标识
+		ID      int64  `json:"id" binding:"required"`      // 记录ID
+		Name    string `json:"name" binding:"required"`    // 名称
+		Remark  string `json:"remark" binding:"required"`  // 备注
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -85,18 +98,21 @@ func (s NeConfigBackupController) Edit(c *gin.Context) {
 	}
 
 	// 检查是否存在
-	data := s.neConfigBackupService.FindById(body.ID)
-	if data.ID != body.ID {
-		// 没有可访问主机命令数据！
-		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neConfig.noData")))
+	rows := s.neConfigBackupService.Find(model.NeConfigBackup{
+		CoreUID: body.CoreUID,
+		NeUID:   body.NeUID,
+		ID:      body.ID,
+	})
+	if len(rows) <= 0 {
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neConfigBackup.noData")))
 		return
 	}
-
+	data := rows[0]
 	data.Name = body.Name
 	data.Remark = body.Remark
 	data.UpdateBy = reqctx.LoginUserToUserName(c)
-	rows := s.neConfigBackupService.Update(data)
-	if rows > 0 {
+	ups := s.neConfigBackupService.Update(data)
+	if ups > 0 {
 		c.JSON(200, resp.Ok(nil))
 		return
 	}
@@ -108,21 +124,18 @@ func (s NeConfigBackupController) Edit(c *gin.Context) {
 // DELETE /?id=xx
 func (s NeConfigBackupController) Remove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	id := c.Query("id")
-	if id == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		ID      int64  `form:"id" binding:"required"`      // 记录ID
+	}
+	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数组后去重
-	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
-	// 转换成int64数组类型
-	ids := make([]int64, 0)
-	for _, v := range uniqueIDs {
-		ids = append(ids, parse.Number(v))
-	}
-
-	rows, err := s.neConfigBackupService.DeleteByIds(ids)
+	rows, err := s.neConfigBackupService.DeleteByIds(query.ID, query.CoreUID, query.NeUID)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
 		return
@@ -137,10 +150,10 @@ func (s NeConfigBackupController) Remove(c *gin.Context) {
 func (s NeConfigBackupController) Import(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeType string `json:"neType" binding:"required"`
-		NeId   string `json:"neId" binding:"required"`
-		Type   string `json:"type" binding:"required,oneof=backup upload"` // 导入类型
-		Path   string `json:"path" binding:"required"`                     // 文件路径
+		CoreUID string `json:"coreUid" binding:"required"`                  // 核心网唯一标识
+		NeUID   string `json:"neUid" binding:"required"`                    // 网元唯一标识
+		Type    string `json:"type" binding:"required,oneof=backup upload"` // 导入类型 backup upload
+		Path    string `json:"path" binding:"required"`                     // 备份文件zip文件路径
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -153,8 +166,8 @@ func (s NeConfigBackupController) Import(c *gin.Context) {
 	}
 
 	// 查网元
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, 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
 	}
@@ -176,8 +189,8 @@ func (s NeConfigBackupController) Import(c *gin.Context) {
 func (s NeConfigBackupController) Export(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeType string `json:"neType" binding:"required"`
-		NeId   string `json:"neId" binding:"required"`
+		CoreUID string `json:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `json:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -185,8 +198,8 @@ func (s NeConfigBackupController) Export(c *gin.Context) {
 		return
 	}
 	// 查网元
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, 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
 	}
@@ -198,8 +211,9 @@ func (s NeConfigBackupController) Export(c *gin.Context) {
 	}
 	// 新增备份记录
 	item := model.NeConfigBackup{
+		CoreUID:  neInfo.CoreUID,
+		NeUID:    neInfo.NeUID,
 		NeType:   neInfo.NeType,
-		NeId:     neInfo.NeId,
 		Name:     filepath.Base(zipFilePath),
 		Path:     zipFilePath,
 		CreateBy: reqctx.LoginUserToUserName(c),

src/modules/ne/controller/ne_host.go

@@ -182,7 +182,7 @@ func (s NeHostController) Remove(c *gin.Context) {
 //
 // POST /test
 //
-//	@Tags			ne
+//	@Tags			network_element/host
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -261,7 +261,7 @@ func (s NeHostController) Test(c *gin.Context) {
 //
 // POST /cmd
 //
-//	@Tags			ne
+//	@Tags			network_element/host
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -344,7 +344,7 @@ func (s NeHostController) Cmd(c *gin.Context) {
 //
 // POST /checkBySSH
 //
-//	@Tags			ne
+//	@Tags			network_element/host
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -446,7 +446,7 @@ func (s NeHostController) CheckBySSH(c *gin.Context) {
 //
 // POST /authorizedBySSH
 //
-//	@Tags			ne
+//	@Tags			network_element/host
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"

src/modules/ne/controller/ne_info.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"fmt"
-	"strings"
 	"sync"
 
 	"be.ems/src/framework/i18n"
@@ -18,18 +17,14 @@ import (
 
 // 实例化控制层 NeInfoController 结构体
 var NewNeInfo = &NeInfoController{
-	neInfoService:    service.NewNeInfo,
-	neLicenseService: service.NewNeLicense,
-	neVersionService: service.NewNeVersion,
+	neInfoService: service.NewNeInfo,
 }
 
 // 网元信息请求
 //
 // PATH /info
 type NeInfoController struct {
-	neInfoService    *service.NeInfo    // 网元信息服务
-	neLicenseService *service.NeLicense // 网元授权激活信息服务
-	neVersionService *service.NeVersion // 网元版本信息服务
+	neInfoService *service.NeInfo // 网元信息服务
 }
 
 // neStateCacheMap 网元状态缓存最后一次成功的信息
@@ -40,11 +35,11 @@ var mutex sync.Mutex
 //
 // GET /state
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType	query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
-//	@Param			neId	query		string	true	"NE ID"		default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Network element information state
@@ -52,22 +47,22 @@ var mutex sync.Mutex
 //	@Router			/ne/info/state [get]
 func (s NeInfoController) State(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	var querys struct {
-		NeType string `form:"neType" binding:"required"`
-		NeId   string `form:"neId" binding:"required"`
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
-	if err := c.ShouldBindQuery(&querys); err != nil {
+	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(querys.NeType, querys.NeId)
-	if neInfo.NeId != querys.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
 	}
-	neKey := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
+	neKey := fmt.Sprintf("%s_%s", neInfo.CoreUID, neInfo.NeUID)
 
 	// 网元直连
 	resData, err := neFetchlink.NeState(neInfo)
@@ -79,11 +74,12 @@ func (s NeInfoController) State(c *gin.Context) {
 			resDataCache.(map[string]any)["online"] = false
 		} else {
 			resDataCache = map[string]any{
-				"online": false,
-				"neId":   neInfo.NeId,
-				"neName": neInfo.NeName,
-				"neType": neInfo.NeType,
-				"neIP":   neInfo.IP,
+				"online":  false,
+				"coreUid": neInfo.CoreUID,
+				"neUid":   neInfo.NeUID,
+				"neType":  neInfo.NeType,
+				"neName":  neInfo.NeName,
+				"neIP":    neInfo.IPAddr,
 			}
 		}
 		neStateCacheMap.Store(neKey, resDataCache)
@@ -100,34 +96,34 @@ func (s NeInfoController) State(c *gin.Context) {
 	c.JSON(200, resp.OkData(resData))
 }
 
-// 网元neType和neID查询
+// 网元信息查询
 //
-// GET /byTypeAndID
+// GET /nf
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType	query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
-//	@Param			neId	query		string	true	"NE ID"		default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Network element neType and neID queries
 //	@Description	Network element neType and neID queries
-//	@Router			/ne/info/byTypeAndID [get]
-func (s NeInfoController) NeTypeAndID(c *gin.Context) {
+//	@Router			/ne/info/nf [get]
+func (s NeInfoController) Nf(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	var querys struct {
-		NeType string `form:"neType" binding:"required"`
-		NeID   string `form:"neId" binding:"required"`
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
-	if err := c.ShouldBindQuery(&querys); err != nil {
+	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(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.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
 	}
@@ -136,25 +132,27 @@ func (s NeInfoController) NeTypeAndID(c *gin.Context) {
 
 // 网元信息列表全部无分页
 //
-// GET /listAll
+// GET /list/all
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Param			neType		query		string	true	"NE Type"
-//	@Param			neId		query		string	true	"NE ID"	default(001)
 //	@Param			bandStatus	query		boolean	true	"With status information"
 //	@Param			bandHost	query		boolean	true	"With host information"
 //	@Success		200			{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		The list of network element information is all unpaginated
 //	@Description	The list of network element information is all unpaginated
-//	@Router			/ne/info/listAll [get]
+//	@Router			/ne/info/list/all [get]
 func (s NeInfoController) ListAll(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
+		CoreUID    string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID      string `form:"neUid"`                      // 网元唯一标识
 		NeType     string `form:"neType"`
-		NeId       string `form:"neId"`
 		BandStatus bool   `form:"bandStatus"`
 		BandHost   bool   `form:"bandHost"`
 	}
@@ -166,12 +164,15 @@ func (s NeInfoController) ListAll(c *gin.Context) {
 
 	// 查询实体参数
 	ne := model.NeInfo{}
+	if querys.CoreUID != "" {
+		ne.CoreUID = querys.CoreUID
+	}
+	if querys.NeUID != "" {
+		ne.NeUID = querys.NeUID
+	}
 	if querys.NeType != "" {
 		ne.NeType = querys.NeType
 	}
-	if querys.NeId != "" {
-		ne.NeId = querys.NeId
-	}
 	neList := s.neInfoService.Find(ne, querys.BandStatus, querys.BandHost)
 	if len(neList) == 0 {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
@@ -182,7 +183,7 @@ func (s NeInfoController) ListAll(c *gin.Context) {
 
 // 网元端Para5G配置文件读取
 //
-// GET /para5GFile
+// GET /file/para5g
 func (s NeInfoController) Para5GFileRead(c *gin.Context) {
 	data, err := s.neInfoService.NeConfPara5GRead()
 	if err != nil {
@@ -194,7 +195,7 @@ func (s NeInfoController) Para5GFileRead(c *gin.Context) {
 
 // 网元端Para5G配置文件写入
 //
-// PUT /para5GFile
+// PUT /file/para5g
 func (s NeInfoController) Para5GFileWrite(c *gin.Context) {
 	var body struct {
 		Content map[string]any `json:"content" binding:"required"` // 内容
@@ -216,11 +217,11 @@ func (s NeInfoController) Para5GFileWrite(c *gin.Context) {
 
 // 网元端OAM配置文件读取
 //
-// GET /oamFile
+// GET /file/oam
 func (s NeInfoController) OAMFileRead(c *gin.Context) {
 	var querys struct {
-		NeType string `form:"neType" binding:"required"`
-		NeID   string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindQuery(&querys); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -228,7 +229,7 @@ func (s NeInfoController) OAMFileRead(c *gin.Context) {
 		return
 	}
 
-	data, err := s.neInfoService.NeConfOAMReadSync(querys.NeType, querys.NeID)
+	data, err := s.neInfoService.NeConfOAMReadSync(querys.CoreUID, querys.NeUID)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
@@ -238,12 +239,12 @@ func (s NeInfoController) OAMFileRead(c *gin.Context) {
 
 // 网元端OAM配置文件写入
 //
-// PUT /oamFile
+// PUT /file/oam
 func (s NeInfoController) OAMFileWrite(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
-		NeType  string         `json:"neType" binding:"required"`
-		NeID    string         `json:"neId" binding:"required"`
+		CoreUID string         `json:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string         `json:"neUid" binding:"required"`   // 网元唯一标识
 		Content map[string]any `json:"content" binding:"required"` // 内容
 		Sync    bool           `json:"sync"`                       // 同步到网元
 	}
@@ -254,8 +255,8 @@ func (s NeInfoController) OAMFileWrite(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(body.NeType, 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
 	}
@@ -272,7 +273,7 @@ func (s NeInfoController) OAMFileWrite(c *gin.Context) {
 //
 // GET /list
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
 //	@Param			bandStatus	query		boolean	false	"The result carries the state of the network element"
@@ -287,6 +288,11 @@ func (s NeInfoController) OAMFileWrite(c *gin.Context) {
 //	@Router			/ne/info/list [get]
 func (s NeInfoController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
+	coreUid, coreUidOk := query["coreUid"]
+	if !coreUidOk || coreUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid is empty"))
+		return
+	}
 	bandStatus := false
 	if v, ok := query["bandStatus"]; ok {
 		bandStatus = parse.Boolean(v)
@@ -297,9 +303,9 @@ func (s NeInfoController) List(c *gin.Context) {
 
 // 网元信息
 //
-// GET /:id
+// GET /
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
 //	@Param			value	path		string	true	"Row ID"
@@ -307,30 +313,34 @@ func (s NeInfoController) List(c *gin.Context) {
 //	@Security		TokenAuth
 //	@Summary		Network element information
 //	@Description	Network element information
-//	@Router			/ne/info/{value} [get]
+//	@Router			/ne/info [get]
 func (s NeInfoController) Info(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	id := parse.Number(c.Param("id"))
-	if id <= 0 {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		ID      int64  `form:"id" binding:"required"`      // ID
+	}
+	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
 	}
 
-	neHost := s.neInfoService.FindById(id, true)
-	if neHost.ID != id {
+	info := s.neInfoService.FindById(query.ID, true)
+	if info.ID != query.ID || info.CoreUID != query.CoreUID {
 		// 没有可访问网元信息数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neInfo.noData")))
 		return
 	}
 
-	c.JSON(200, resp.OkData(neHost))
+	c.JSON(200, resp.OkData(info))
 }
 
 // 网元信息新增
 //
 // POST /
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -340,7 +350,6 @@ func (s NeInfoController) Info(c *gin.Context) {
 //	@Description	Network element information addition
 //	@Router			/ne/info [post]
 func (s NeInfoController) Add(c *gin.Context) {
-	language := reqctx.AcceptLanguage(c)
 	var body model.NeInfo
 	err := c.ShouldBindBodyWithJSON(&body)
 	if err != nil {
@@ -352,68 +361,12 @@ func (s NeInfoController) Add(c *gin.Context) {
 		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id not is empty"))
 		return
 	}
-
-	// 检查属性值唯一
-	uniqueInfo := s.neInfoService.CheckUniqueNeTypeAndNeId(body.NeType, body.NeId, 0)
-	if !uniqueInfo {
-		// 网元信息操作【%s】失败，同类型下标识已存在
-		msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeId})
-		c.JSON(200, resp.ErrMsg(msg))
+	if body.CoreUID == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid is empty"))
 		return
 	}
 
-	// 获取网元状态是否正常
-	body.ServerState, err = neFetchlink.NeState(body)
-	if err != nil {
-		body.Status = 0
-	} else {
-		// 网元状态设置为在线
-		body.Status = 1
-		if parse.Boolean(body.ServerState["standby"]) {
-			body.Status = 3
-		}
-		// 下发网管配置信息给网元
-		if _, err = neFetchlink.NeConfigOMC(body); err != nil {
-			body.Status = 2
-		}
-	}
-
-	loginUserName := reqctx.LoginUserToUserName(c)
-	// 新增Version信息
-	neVersion := model.NeVersion{
-		NeType:   body.NeType,
-		NeId:     body.NeId,
-		CreateBy: loginUserName,
-	}
-	// 新增License信息
-	neLicense := model.NeLicense{
-		NeType:   body.NeType,
-		NeId:     body.NeId,
-		CreateBy: loginUserName,
-	}
-
-	// 已有网元可获取的信息
-	if body.ServerState != nil {
-		if v, ok := body.ServerState["version"]; ok && v != nil {
-			neVersion.Name = "-"
-			neVersion.Path = "-"
-			neVersion.Version = fmt.Sprint(v)
-		}
-		if v, ok := body.ServerState["capability"]; ok && v != nil {
-			neLicense.Capability = parse.Number(v)
-		}
-		if v, ok := body.ServerState["sn"]; ok && v != nil {
-			neLicense.SerialNum = fmt.Sprint(v)
-		}
-		if v, ok := body.ServerState["expire"]; ok && v != nil {
-			neLicense.ExpiryDate = fmt.Sprint(v)
-			neLicense.Status = "1"
-		}
-	}
-
-	s.neVersionService.Insert(neVersion)
-	s.neLicenseService.Insert(neLicense)
-	body.CreateBy = loginUserName
+	body.CreateBy = reqctx.LoginUserToUserName(c)
 	insertId := s.neInfoService.Insert(body)
 	if insertId > 0 {
 		c.JSON(200, resp.OkData(insertId))
@@ -426,7 +379,7 @@ func (s NeInfoController) Add(c *gin.Context) {
 //
 // PUT /
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -449,15 +402,6 @@ func (s NeInfoController) Edit(c *gin.Context) {
 		return
 	}
 
-	// 检查属性值唯一
-	uniqueInfo := s.neInfoService.CheckUniqueNeTypeAndNeId(body.NeType, body.NeId, body.ID)
-	if !uniqueInfo {
-		// 网元信息操作【%s】失败，同类型下标识已存在
-		msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeId})
-		c.JSON(200, resp.ErrMsg(msg))
-		return
-	}
-
 	// 检查是否存在
 	neInfo := s.neInfoService.FindById(body.ID, false)
 	if neInfo.ID != body.ID {
@@ -465,71 +409,10 @@ func (s NeInfoController) Edit(c *gin.Context) {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neInfo.noData")))
 		return
 	}
-	// 赋予主机ID
-	if neInfo.HostIDs != "" && len(body.Hosts) > 0 {
-		hostIDs := strings.Split(neInfo.HostIDs, ",")
-		for index, id := range hostIDs {
-			body.Hosts[index].ID = parse.Number(id)
-		}
-	}
 
-	// 获取网元状态是否正常
-	body.ServerState, err = neFetchlink.NeState(neInfo)
-	if err != nil {
-		body.Status = 0
-	} else {
-		// 网元状态设置为在线
-		body.Status = 1
-		if parse.Boolean(body.ServerState["standby"]) {
-			body.Status = 3
-		}
-		// 下发网管配置信息给网元
-		if _, err = neFetchlink.NeConfigOMC(body); err != nil {
-			body.Status = 2
-		}
-	}
-
-	loginUserName := reqctx.LoginUserToUserName(c)
-	neLicense := s.neLicenseService.FindByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
-	neVersion := s.neVersionService.FindByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
-
-	// 已有网元可获取的信息
-	if body.ServerState != nil {
-		if v, ok := body.ServerState["version"]; ok && v != nil {
-			neVersion.Name = "-"
-			neVersion.Path = "-"
-			neVersion.Version = fmt.Sprint(v)
-			neVersion.UpdateBy = loginUserName
-		}
-		if v, ok := body.ServerState["capability"]; ok && v != nil {
-			neLicense.Capability = parse.Number(v)
-		}
-		if v, ok := body.ServerState["sn"]; ok && v != nil {
-			neLicense.SerialNum = fmt.Sprint(v)
-		}
-		if v, ok := body.ServerState["expire"]; ok && v != nil {
-			neLicense.ExpiryDate = fmt.Sprint(v)
-			neLicense.Status = "1"
-			neLicense.UpdateBy = loginUserName
-		}
-	}
-
-	if neVersion.ID <= 0 {
-		if neVersion.NeType != body.NeType || neVersion.NeId != body.NeId {
-			neVersion.NeType = body.NeType
-			neVersion.NeId = body.NeId
-		}
-		s.neVersionService.Update(neVersion)
-	}
-	if neLicense.ID <= 0 {
-		if neLicense.NeType != body.NeType || neLicense.NeId != body.NeId {
-			neLicense.NeType = body.NeType
-			neLicense.NeId = body.NeId
-		}
-		s.neLicenseService.Update(neLicense)
-	}
-
-	body.UpdateBy = loginUserName
+	body.CoreUID = neInfo.CoreUID
+	body.NeUID = neInfo.NeUID
+	body.UpdateBy = reqctx.LoginUserToUserName(c)
 	rows := s.neInfoService.Update(body)
 	if rows > 0 {
 		c.JSON(200, resp.Ok(nil))
@@ -542,7 +425,7 @@ func (s NeInfoController) Edit(c *gin.Context) {
 //
 // DELETE /:id
 //
-//	@Tags			ne
+//	@Tags			network_element/info
 //	@Accept			json
 //	@Produce		json
 //	@Param			value	path		string	true	"Row ID"
@@ -553,21 +436,18 @@ func (s NeInfoController) Edit(c *gin.Context) {
 //	@Router			/ne/info [delete]
 func (s NeInfoController) Remove(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	id := c.Param("id")
-	if id == "" {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+		ID      int64  `form:"id" binding:"required"`      // 记录ID
+	}
+	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数组后去重
-	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
-	// 转换成int64数组类型
-	ids := make([]int64, 0)
-	for _, v := range uniqueIDs {
-		ids = append(ids, parse.Number(v))
-	}
-
-	rows, err := s.neInfoService.DeleteByIds(ids)
+	rows, err := s.neInfoService.DeleteById(query.ID, query.CoreUID, query.NeUID)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
 		return

src/modules/ne/controller/ne_license.go

@@ -33,7 +33,7 @@ type NeLicenseController struct {
 //
 // GET /list
 //
-//	@Tags			ne
+//	@Tags			network_element/license
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType		query		string	false	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
@@ -48,6 +48,11 @@ type NeLicenseController struct {
 //	@Router			/ne/license/list [get]
 func (s *NeLicenseController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
+	coreUid, coreUidOk := query["coreUid"]
+	if !coreUidOk || coreUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid is empty"))
+		return
+	}
 	rows, total := s.neLicenseService.FindByPage(query)
 
 	// 过滤屏蔽授权文件
@@ -62,17 +67,21 @@ func (s *NeLicenseController) List(c *gin.Context) {
 
 // 网元授权激活信息
 //
-// GET /:id
+// GET /
 func (s *NeLicenseController) Info(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	id := parse.Number(c.Param("id"))
-	if id <= 0 {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		ID      int64  `form:"id" binding:"required"`      // ID
+	}
+	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
 	}
 
-	neLicense := s.neLicenseService.FindById(id)
-	if neLicense.ID != id {
+	neLicense := s.neLicenseService.FindById(query.ID)
+	if neLicense.ID != query.ID || neLicense.CoreUID != query.CoreUID {
 		// 没有可访问网元授权激活数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
 		return
@@ -81,25 +90,25 @@ func (s *NeLicenseController) Info(c *gin.Context) {
 	c.JSON(200, resp.OkData(neLicense))
 }
 
-// 网元neType和neID查询
+// 网元信息查询
 //
-// GET /byTypeAndID
+// GET /nf
 //
-//	@Tags			ne
+//	@Tags			network_element/license
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType	query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
-//	@Param			neId	query		string	true	"NE ID"		default(001)
+//	@Param			coreUid	query		string	true	"CoreUID"	default(8I73Y01Z)
+//	@Param			neUid	query		string	true	"NeUID"		default(5AKF59BZ)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Network element neType and neID queries
 //	@Description	Network element neType and neID queries
-//	@Router			/ne/license/byTypeAndID [get]
-func (s *NeLicenseController) NeTypeAndID(c *gin.Context) {
+//	@Router			/ne/license/nf [get]
+func (s *NeLicenseController) Nf(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
-		NeType string `form:"neType" binding:"required"`
-		NeId   string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindQuery(&querys); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -107,8 +116,8 @@ func (s *NeLicenseController) NeTypeAndID(c *gin.Context) {
 		return
 	}
 
-	neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId)
-	if neLicense.NeId != querys.NeId {
+	neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID {
 		// 没有可访问网元授权激活数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
 		return
@@ -121,7 +130,7 @@ func (s *NeLicenseController) NeTypeAndID(c *gin.Context) {
 //
 // GET /code
 //
-//	@Tags			ne
+//	@Tags			network_element/license
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType	query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
@@ -134,8 +143,8 @@ func (s *NeLicenseController) NeTypeAndID(c *gin.Context) {
 func (s *NeLicenseController) Code(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
-		NeType string `form:"neType" binding:"required"`
-		NeId   string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindQuery(&querys); err != nil {
 		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
@@ -144,8 +153,8 @@ func (s *NeLicenseController) Code(c *gin.Context) {
 	}
 
 	// 检查是否存在授权记录
-	neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId)
-	if neLicense.NeId != querys.NeId {
+	neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID {
 		// 没有可访问网元授权激活数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
 		return
@@ -157,9 +166,10 @@ func (s *NeLicenseController) Code(c *gin.Context) {
 	if licensePath != "" {
 		neLicense.LicensePath = licensePath
 	} else {
-		neLicense.Capability = 0
 		neLicense.SerialNum = ""
 		neLicense.ExpiryDate = ""
+		neLicense.UeNumber = 0
+		neLicense.NbNumber = 0
 		neLicense.Status = "0"
 	}
 	neLicense.UpdateBy = reqctx.LoginUserToUserName(c)
@@ -172,7 +182,7 @@ func (s *NeLicenseController) Code(c *gin.Context) {
 //
 // POST /change
 //
-//	@Tags			ne
+//	@Tags			network_element/license
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -192,8 +202,8 @@ func (s *NeLicenseController) Change(c *gin.Context) {
 	}
 
 	// 检查是否存在授权记录
-	neLicense := s.neLicenseService.FindByNeTypeAndNeID(body.NeType, body.NeId)
-	if neLicense.NeId != body.NeId {
+	neLicense := s.neLicenseService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neLicense.CoreUID != body.CoreUID || neLicense.NeUID != body.NeUID {
 		// 没有可访问网元授权激活数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
 		return
@@ -224,7 +234,7 @@ func (s *NeLicenseController) Change(c *gin.Context) {
 //
 // GET /state
 //
-//	@Tags			ne
+//	@Tags			network_element/license
 //	@Accept			json
 //	@Produce		json
 //	@Param			neType	query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
@@ -237,8 +247,8 @@ func (s *NeLicenseController) Change(c *gin.Context) {
 func (s *NeLicenseController) State(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var querys struct {
-		NeType string `form:"neType" binding:"required"`
-		NeId   string `form:"neId" binding:"required"`
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
 	}
 	if err := c.ShouldBindQuery(&querys); err != nil {
 		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -246,24 +256,25 @@ func (s *NeLicenseController) State(c *gin.Context) {
 	}
 
 	// 检查是否存在授权记录
-	neLicense := s.neLicenseService.FindByNeTypeAndNeID(querys.NeType, querys.NeId)
-	if neLicense.NeId != querys.NeId {
+	neLicense := s.neLicenseService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neLicense.CoreUID != querys.CoreUID || neLicense.NeUID != querys.NeUID {
 		// 没有可访问网元授权激活数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
 		return
 	}
 
 	// 查询网元获取IP获取网元状态
-	neInfo := s.neInfoService.FindByNeTypeAndNeID(neLicense.NeType, neLicense.NeId)
-	if neInfo.NeId != neLicense.NeId || neInfo.IP == "" {
+	neInfo := s.neInfoService.FindByCoreUidAndNeUid(neLicense.CoreUID, neLicense.NeUID)
+	if neInfo.CoreUID != neLicense.CoreUID || neInfo.NeUID != neLicense.NeUID {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	if neState, err := neFetchlink.NeState(neInfo); err == nil && neState["sn"] != nil {
 		neLicense.Status = "1"
-		neLicense.Capability = parse.Number(neState["capability"])
 		neLicense.SerialNum = fmt.Sprint(neState["sn"])
 		neLicense.ExpiryDate = fmt.Sprint(neState["expire"])
+		neLicense.UeNumber = parse.Number(neState["ueNumber"])
+		neLicense.NbNumber = parse.Number(neState["nbNumber"])
 	} else {
 		neLicense.Status = "0"
 	}
@@ -280,9 +291,10 @@ func (s *NeLicenseController) State(c *gin.Context) {
 
 	if neLicense.Status == "1" {
 		c.JSON(200, resp.OkData(map[string]any{
-			"capability": neLicense.Capability,
-			"sn":         neLicense.SerialNum,
-			"expire":     neLicense.ExpiryDate,
+			"sn":       neLicense.SerialNum,
+			"expire":   neLicense.ExpiryDate,
+			"ueNumber": neLicense.UeNumber,
+			"nbNumber": neLicense.NbNumber,
 		}))
 		return
 	}

src/modules/ne/controller/ne_software.go

@@ -101,7 +101,7 @@ func (s NeSoftwareController) Add(c *gin.Context) {
 	})
 	if len(neSoftwares) > 0 {
 		neSoftware := neSoftwares[0]
-		s.neSoftwareService.DeleteByIds([]int64{neSoftware.ID})
+		s.neSoftwareService.DeleteByIds([]int64{neSoftware.ID}, false)
 	}
 
 	// 检查属性值唯一
@@ -183,7 +183,7 @@ func (s NeSoftwareController) Remove(c *gin.Context) {
 		ids = append(ids, parse.Number(v))
 	}
 
-	rows, err := s.neSoftwareService.DeleteByIds(ids)
+	rows, err := s.neSoftwareService.DeleteByIds(ids, true)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
 		return

src/modules/ne/controller/ne_version.go

@@ -6,22 +6,21 @@ import (
 	"be.ems/src/framework/i18n"
 	"be.ems/src/framework/reqctx"
 	"be.ems/src/framework/resp"
-	"be.ems/src/framework/utils/parse"
-	neService "be.ems/src/modules/ne/service"
+	ne "be.ems/src/modules/ne/service"
 
 	"github.com/gin-gonic/gin"
 )
 
 // 实例化控制层 NeVersionController 结构体
 var NewNeVersion = &NeVersionController{
-	neVersionService: neService.NewNeVersion,
+	neVersionService: ne.NewNeVersion,
 }
 
 // 网元版本请求
 //
 // PATH /version
 type NeVersionController struct {
-	neVersionService *neService.NeVersion // 网元版本服务
+	neVersionService *ne.NeVersion // 网元版本服务
 }
 
 // 网元版本列表
@@ -29,23 +28,32 @@ type NeVersionController struct {
 // GET /list
 func (s *NeVersionController) List(c *gin.Context) {
 	query := reqctx.QueryMap(c)
+	coreUid, coreUidOk := query["coreUid"]
+	if !coreUidOk || coreUid == "" {
+		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: coreUid is empty"))
+		return
+	}
 	rows, total := s.neVersionService.FindByPage(query, true)
 	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // 网元版本信息
 //
-// GET /:id
+// GET /
 func (s *NeVersionController) Info(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
-	id := parse.Number(c.Param("id"))
-	if id <= 0 {
-		c.JSON(422, resp.CodeMsg(resp.CODE_PARAM_CHEACK, "bind err: id is empty"))
+	var query struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		ID      int64  `form:"id" binding:"required"`      // 记录ID
+	}
+	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
 	}
 
-	neVersion := s.neVersionService.FindById(id)
-	if neVersion.ID != id {
+	neVersion := s.neVersionService.FindById(query.ID)
+	if neVersion.ID != query.ID || neVersion.CoreUID != query.CoreUID {
 		// 没有可访问网元版本数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neVersion.noData")))
 		return
@@ -54,11 +62,36 @@ func (s *NeVersionController) Info(c *gin.Context) {
 	c.JSON(200, resp.OkData(neVersion))
 }
 
+// 网元信息查询
+//
+// GET /nf
+func (s *NeVersionController) Nf(c *gin.Context) {
+	language := reqctx.AcceptLanguage(c)
+	var querys struct {
+		CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
+		NeUID   string `form:"neUid" binding:"required"`   // 网元唯一标识
+	}
+	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
+	}
+
+	neVersion := s.neVersionService.FindByCoreUidAndNeUid(querys.CoreUID, querys.NeUID)
+	if neVersion.CoreUID != querys.CoreUID || neVersion.NeUID != querys.NeUID {
+		// 没有可访问网元授权激活数据！
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neLicense.noData")))
+		return
+	}
+
+	c.JSON(200, resp.OkData(neVersion))
+}
+
 // 网元版本操作
 //
 // POST /operate
 //
-//	@Tags			ne
+//	@Tags			network_element/version
 //	@Accept			json
 //	@Produce		json
 //	@Param			data	body		object	true	"Request Param"
@@ -70,9 +103,9 @@ func (s *NeVersionController) Info(c *gin.Context) {
 func (s *NeVersionController) Operate(c *gin.Context) {
 	language := reqctx.AcceptLanguage(c)
 	var body struct {
+		CoreUID  string            `json:"coreUid" binding:"required"`                               // 核心网唯一标识
+		NeUID    string            `json:"neUid" binding:"required"`                                 // 网元唯一标识
 		Action   string            `json:"action" binding:"required,oneof=install upgrade rollback"` // 操作行为
-		NeType   string            `json:"neType" gorm:"ne_type" binding:"required"`                 // 网元类型
-		NeId     string            `json:"neId" gorm:"ne_id" binding:"required"`                     // 网元ID
 		Preinput map[string]string `json:"preinput" `                                                // 预先输入参数
 	}
 	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
@@ -81,8 +114,8 @@ func (s *NeVersionController) Operate(c *gin.Context) {
 		return
 	}
 
-	neVersion := s.neVersionService.FindByNeTypeAndNeID(body.NeType, body.NeId)
-	if neVersion.NeId != body.NeId {
+	neVersion := s.neVersionService.FindByCoreUidAndNeUid(body.CoreUID, body.NeUID)
+	if neVersion.CoreUID != body.CoreUID || neVersion.NeUID != body.NeUID {
 		// 没有可访问网元版本数据！
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neVersion.noData")))
 		return

src/modules/ne/fetch_link/alarm.go

@@ -13,7 +13,7 @@ import (
 // AlarmHistory 告警历史记录
 func AlarmHistory(neInfo model.NeInfo) ([]map[string]any, error) {
 	// 网元参数配置信息
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/faultManagement/v1/elementType/%s/objectType/alarms", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType))
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/faultManagement/v1/elementType/%s/objectType/alarms", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType))
 	resBytes, err := fetch.Get(neUrl, nil, 60_000)
 	var resData []map[string]any
 	if err != nil {

src/modules/ne/fetch_link/amf.go

@@ -16,7 +16,7 @@ import (
 //
 // 返回结果 []
 func AMFNbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbInfo", neInfo.IPAddr, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}
 	if v, ok := data["id"]; ok && v != "" {
@@ -59,7 +59,7 @@ func AMFNbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]an
 //
 // 返回结果 []
 func AMFGnbStateList(neInfo model.NeInfo) ([]map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbState", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/amf/objectType/nbState", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.Get(neUrl, nil, 60_000)
 	if err != nil {
 		errStr := err.Error()

src/modules/ne/fetch_link/hlr.go

@@ -18,7 +18,7 @@ import (
 // data参数 {traceID:"跟踪任务ID", imsi:"IMSI和MSISDN必填一个，都带的话以IMSI为准", msisdn:""}
 func HLRTraceStart(neInfo model.NeInfo, data map[string]any) (string, error) {
 	// 网元参数配置新增（array）
-	neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/add-task", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/add-task", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.PostJSON(neUrl, data, nil)
 	var resData map[string]string
 	if err != nil {
@@ -45,7 +45,7 @@ func HLRTraceStart(neInfo model.NeInfo, data map[string]any) (string, error) {
 // data参数 {traceIDArray: ["跟踪任务ID数组"]}
 func HLRTraceStop(neInfo model.NeInfo, data map[string]any) (string, error) {
 	// 网元参数配置新增（array）
-	neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/delete-task", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/trace-manage/v1/delete-task", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.PostJSON(neUrl, data, nil)
 	var resData map[string]string
 	if err != nil {

src/modules/ne/fetch_link/ims.go

@@ -15,7 +15,7 @@ import (
 //
 // 返回结果 0
 func IMSUeSessionNum(neInfo model.NeInfo) (int64, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueNum", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueNum", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.Get(neUrl, nil, 60_000)
 	if err != nil {
 		errStr := err.Error()
@@ -47,7 +47,7 @@ func IMSUeSessionNum(neInfo model.NeInfo) (int64, error) {
 //
 // 返回结果 []
 func IMSUeSessionList(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/ims/objectType/ueInfo", neInfo.IPAddr, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}
 	if v, ok := data["imsi"]; ok && v != "" {

src/modules/ne/fetch_link/mme.go

@@ -16,7 +16,7 @@ import (
 //
 // 返回结果 []
 func MMENbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbInfo", neInfo.IPAddr, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}
 	if v, ok := data["id"]; ok && v != "" {
@@ -59,7 +59,7 @@ func MMENbInfoList(neInfo model.NeInfo, data map[string]string) ([]map[string]an
 //
 // 返回结果 []
 func MMEEnbStateList(neInfo model.NeInfo) ([]map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbState", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/mme/objectType/nbState", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.Get(neUrl, nil, 60_000)
 	if err != nil {
 		errStr := err.Error()

src/modules/ne/fetch_link/n3iwf.go

@@ -16,7 +16,7 @@ import (
 //
 // 返回结果 {"rows":[],"total":0}
 func N3IWFSubInfoList(neInfo model.NeInfo, data map[string]string) (map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/n3iwf/objectType/ueInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/n3iwf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}
 	if v, ok := data["imsi"]; ok && v != "" {

src/modules/ne/fetch_link/ne_config.go

@@ -13,14 +13,14 @@ import (
 // NeConfigOMC 网元配置对端网管信息
 func NeConfigOMC(neInfo model.NeInfo) (map[string]any, error) {
 	// 网元配置对端网管信息
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType))
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType))
 	resBytes, err := fetch.PutJSON(neUrl, map[string]any{
-		"neId":       neInfo.NeId,
-		"neName":     neInfo.NeName,
+		"rmUID":      neInfo.CoreUID,
+		"neId":       neInfo.NeName,
+		"neName":     neInfo.NeUID,
 		"port":       neInfo.Port,
 		"province":   neInfo.Province,
 		"pvFlag":     neInfo.PvFlag,
-		"rmUID":      neInfo.RmUID,
 		"vendorName": neInfo.VendorName,
 		"dn":         neInfo.Dn,
 	}, nil)
@@ -53,7 +53,7 @@ func NeConfigOMC(neInfo model.NeInfo) (map[string]any, error) {
 // NeConfigInfo 网元配置信息
 func NeConfigInfo(neInfo model.NeInfo, paramName string) (map[string]any, error) {
 	// 网元参数配置信息
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName)
 	resBytes, err := fetch.Get(neUrl, nil, 30_000)
 	if err != nil {
 		logger.Warnf("NeConfigInfo Get \"%s\"", neUrl)
@@ -82,7 +82,7 @@ func NeConfigUpdate(neInfo model.NeInfo, paramName, loc string, data map[string]
 		loc = fmt.Sprintf("?loc=%v", loc)
 	}
 	// 网元参数配置新增（array）
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s%s", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s%s", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc)
 	resBytes, err := fetch.PutJSON(neUrl, data, nil)
 	var resData map[string]any
 	if err != nil {
@@ -112,7 +112,7 @@ func NeConfigUpdate(neInfo model.NeInfo, paramName, loc string, data map[string]
 // NeConfigAdd 网元配置新增 array
 func NeConfigAdd(neInfo model.NeInfo, paramName, loc string, data map[string]any) (map[string]any, error) {
 	// 网元参数配置新增（array）
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc)
 	resBytes, err := fetch.PostJSON(neUrl, data, nil)
 	var resData map[string]any
 	if err != nil {
@@ -142,7 +142,7 @@ func NeConfigAdd(neInfo model.NeInfo, paramName, loc string, data map[string]any
 // NeConfigDelete 网元配置删除 array
 func NeConfigDelete(neInfo model.NeInfo, paramName, loc string) (map[string]any, error) {
 	// 网元参数配置删除（array）
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s?loc=%v", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType), paramName, loc)
 	resBytes, err := fetch.Delete(neUrl, nil)
 	var resData map[string]any
 	if err != nil {

src/modules/ne/fetch_link/ne_state.go

@@ -8,13 +8,14 @@ import (
 
 	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/fetch"
+	"be.ems/src/framework/utils/parse"
 	"be.ems/src/modules/ne/model"
 )
 
 // NeState 获取网元端服务状态
 func NeState(neInfo model.NeInfo) (map[string]any, error) {
 	// 网元状态
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType))
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", neInfo.IPAddr, neInfo.Port, strings.ToLower(neInfo.NeType))
 	resBytes, err := fetch.Get(neUrl, nil, 1000)
 	if err != nil {
 		logger.Errorf("NeState %s", err.Error())
@@ -39,11 +40,12 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) {
 		}
 	}
 
-	return map[string]any{
+	info := map[string]any{
+		"coreUid":     neInfo.CoreUID,
+		"neUid":       neInfo.NeUID,
 		"neType":      neInfo.NeType,
-		"neId":        neInfo.NeId,
 		"neName":      neInfo.NeName,
-		"neIP":        neInfo.IP,
+		"neIP":        neInfo.IPAddr,
 		"refreshTime": time.Now().UnixMilli(), // 获取时间
 		"standby":     resData["standby"],     // 是否备用服务
 		"version":     resData["version"],
@@ -55,5 +57,18 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) {
 		"cpu":         resData["cpuUsage"],
 		"mem":         resData["memUsage"],
 		"disk":        resData["diskSpace"],
-	}, nil
+	}
+
+	if ueNumber, ok := resData["capability"]; ok {
+		info["ueNumber"] = parse.Number(ueNumber)
+	} else {
+		info["ueNumber"] = 0
+	}
+	if nbNumber, ok := resData["nbNumber"]; ok {
+		info["nbNumber"] = parse.Number(nbNumber)
+	} else {
+		info["nbNumber"] = 0
+	}
+
+	return info, nil
 }

src/modules/ne/fetch_link/ne_trace.go

@@ -13,7 +13,7 @@ import (
 // NeTraceAdd 网元跟踪任务新增
 func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) {
 	// 跟踪任务创建
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions", neInfo.IP, neInfo.Port, neInfo.NeType)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions", neInfo.IPAddr, neInfo.Port, neInfo.NeType)
 	resBytes, err := fetch.PostJSON(neUrl, data, nil)
 	var resData map[string]any
 	if err != nil {
@@ -41,7 +41,7 @@ func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) {
 
 // NeTraceDelete 网元跟踪任务删除
 func NeTraceDelete(neInfo model.NeInfo, traceId string) (map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions?id=%s", neInfo.IP, neInfo.Port, neInfo.NeType, traceId)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions?id=%s", neInfo.IPAddr, neInfo.Port, neInfo.NeType, traceId)
 	resBytes, err := fetch.Delete(neUrl, nil)
 	var resData map[string]any
 	if err != nil {

src/modules/ne/fetch_link/nssf.go

@@ -13,7 +13,7 @@ import (
 //
 // 返回结果 {"rows":[],"total":0}
 func NSSFSubInfoList(neInfo model.NeInfo) (map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/nssf/objectType/subscriptions", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/nssf/objectType/subscriptions", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.Get(neUrl, nil, 60_000)
 	if err != nil {
 		logger.Warnf("NSSFSubInfo Get \"%s\"", neUrl)
@@ -54,7 +54,7 @@ func NSSFSubInfoList(neInfo model.NeInfo) (map[string]any, error) {
 //
 // 返回结果 {"rows":[],"total":0}
 func NSSFAvailableAMFList(neInfo model.NeInfo) (map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/nssf/objectType/availableAMFs", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/nssf/objectType/availableAMFs", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.Get(neUrl, nil, 60_000)
 	if err != nil {
 		logger.Warnf("NSSFAvailableAMFList Get \"%s\"", neUrl)

src/modules/ne/fetch_link/pcf.go

@@ -12,7 +12,7 @@ import (
 
 // PCFRuleInfo PCF策略配置查询信息
 func PCFRuleInfo(neInfo model.NeInfo, data map[string]string) ([]map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}
 	if v, ok := data["imsi"]; ok && v != "" {
@@ -56,7 +56,7 @@ func PCFRuleInfo(neInfo model.NeInfo, data map[string]string) ([]map[string]any,
 
 // PCFRuleAdd PCF策略配置添加
 func PCFRuleAdd(neInfo model.NeInfo, data any) error {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.PostJSON(neUrl, data, nil)
 	if err != nil {
 		errStr := err.Error()
@@ -85,7 +85,7 @@ func PCFRuleAdd(neInfo model.NeInfo, data any) error {
 
 // PCFRuleAddBatch PCF策略配置批量添加
 func PCFRuleAddBatch(neInfo model.NeInfo, data map[string]any, num int64) error {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IP, neInfo.Port, num)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IPAddr, neInfo.Port, num)
 	resBytes, err := fetch.PostJSON(neUrl, data, nil)
 	if err != nil {
 		errStr := err.Error()
@@ -114,7 +114,7 @@ func PCFRuleAddBatch(neInfo model.NeInfo, data map[string]any, num int64) error
 
 // PCFRuleUpdate PCF策略配置修改
 func PCFRuleUpdate(neInfo model.NeInfo, data map[string]any) error {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.PutJSON(neUrl, data, nil)
 	if err != nil {
 		errStr := err.Error()
@@ -139,7 +139,7 @@ func PCFRuleUpdate(neInfo model.NeInfo, data map[string]any) error {
 
 // PCFRuleUpdateBatch PCF策略配置批量修改
 func PCFRuleUpdateBatch(neInfo model.NeInfo, data map[string]any, num int64) error {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IP, neInfo.Port, num)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d", neInfo.IPAddr, neInfo.Port, num)
 	resBytes, err := fetch.PutJSON(neUrl, data, nil)
 	if err != nil {
 		errStr := err.Error()
@@ -164,7 +164,7 @@ func PCFRuleUpdateBatch(neInfo model.NeInfo, data map[string]any, num int64) err
 
 // PCFRuleDelete PCF策略配置删除
 func PCFRuleDelete(neInfo model.NeInfo, imsi string) error {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo?imsi=%s", neInfo.IP, neInfo.Port, imsi)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo?imsi=%s", neInfo.IPAddr, neInfo.Port, imsi)
 	resBytes, err := fetch.Delete(neUrl, nil)
 	if err != nil {
 		errStr := err.Error()
@@ -193,7 +193,7 @@ func PCFRuleDelete(neInfo model.NeInfo, imsi string) error {
 
 // PCFRuleDeleteBatch PCF策略配置批量删除
 func PCFRuleDeleteBatch(neInfo model.NeInfo, imsi string, num int64) error {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d?imsi=%s", neInfo.IP, neInfo.Port, num, imsi)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/batch/%d?imsi=%s", neInfo.IPAddr, neInfo.Port, num, imsi)
 	resBytes, err := fetch.Delete(neUrl, nil)
 	if err != nil {
 		errStr := err.Error()
@@ -222,7 +222,7 @@ func PCFRuleDeleteBatch(neInfo model.NeInfo, imsi string, num int64) error {
 
 // PCFRuleExport PCF策略配置导出
 func PCFRuleExport(neInfo model.NeInfo, data map[string]string) ([]byte, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/export", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/export", neInfo.IPAddr, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}
 	if v, ok := data["fileType"]; ok && v != "" {
@@ -243,7 +243,7 @@ func PCFRuleExport(neInfo model.NeInfo, data map[string]string) ([]byte, error)
 
 // PCFRuleImport PCF策略配置导入
 func PCFRuleImport(neInfo model.NeInfo, data map[string]any) (string, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/import", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/pcf/objectType/ueInfo/file/import", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.PutJSON(neUrl, data, nil)
 	var resData map[string]any
 	if err != nil {

src/modules/ne/fetch_link/smf.go

@@ -15,7 +15,7 @@ import (
 //
 // 返回结果 0
 func SMFSubNum(neInfo model.NeInfo) (int64, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueNum", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueNum", neInfo.IPAddr, neInfo.Port)
 	resBytes, err := fetch.Get(neUrl, nil, 60_000)
 	if err != nil {
 		errStr := err.Error()
@@ -47,7 +47,7 @@ func SMFSubNum(neInfo model.NeInfo) (int64, error) {
 //
 // 返回结果 {"rows":[],"total":0}
 func SMFSubInfoList(neInfo model.NeInfo, data map[string]string) (map[string]any, error) {
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo", neInfo.IPAddr, neInfo.Port)
 	// 查询参数拼接
 	query := []string{}
 	if v, ok := data["imsi"]; ok && v != "" {

src/modules/ne/model/ne_config_backup.go

@@ -3,15 +3,16 @@ package model
 // NeConfigBackup 网元配置文件备份记录 ne_config_backup
 type NeConfigBackup 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"`             // 网元ID
-	Name       string `json:"name" gorm:"column:name"`              // 压缩包名称
-	Path       string `json:"path" gorm:"column:path"`              // 压缩包位置
-	Remark     string `json:"remark" gorm:"column:remark"`          // 备注
-	CreateBy   string `json:"createBy" gorm:"column:create_by"`     // 创建者
-	CreateTime int64  `json:"createTime" gorm:"column:create_time"` // 创建时间
-	UpdateBy   string `json:"updateBy" gorm:"column:update_by"`     // 更新者
-	UpdateTime int64  `json:"updateTime" gorm:"column:update_time"` // 更新时间
+	CoreUID    string `json:"coreUid" gorm:"column:core_uid" binding:"required"` // 核心网唯一标识
+	NeUID      string `json:"neUid" gorm:"column:ne_uid" binding:"required"`     // 网元唯一标识
+	NeType     string `json:"neType" gorm:"column:ne_type" binding:"required"`   // 网元类型
+	Name       string `json:"name" gorm:"column:name"`                           // 压缩包名称
+	Path       string `json:"path" gorm:"column:path"`                           // 压缩包位置
+	Remark     string `json:"remark" gorm:"column:remark"`                       // 备注
+	CreateBy   string `json:"createBy" gorm:"column:create_by"`                  // 创建者
+	CreateTime int64  `json:"createTime" gorm:"column:create_time"`              // 创建时间
+	UpdateBy   string `json:"updateBy" gorm:"column:update_by"`                  // 更新者
+	UpdateTime int64  `json:"updateTime" gorm:"column:update_time"`              // 更新时间
 
 	// ====== 非数据库字段属性 ======
 

src/modules/ne/model/ne_info.go

@@ -2,18 +2,18 @@ package model
 
 // NeInfo 网元信息对象 ne_info
 type NeInfo struct {
-	ID         int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	ID         int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`                      // 网元ID
+	CoreUID    string `json:"coreUid" gorm:"column:core_uid" binding:"required"`                 // 核心网唯一标识
+	NeUID      string `json:"neUid" gorm:"column:ne_uid"`                                        // 网元唯一标识
 	NeType     string `json:"neType" gorm:"column:ne_type" binding:"required"`                   // 网元类型
-	NeId       string `json:"neId" gorm:"column:ne_id" binding:"required"`                       // 网元ID
-	RmUID      string `json:"rmUid" gorm:"column:rm_uid"`                                        // 网元资源唯一标识
 	NeName     string `json:"neName" gorm:"column:ne_name"`                                      // 网元名称
-	IP         string `json:"ip" gorm:"column:ip" binding:"required"`                            // 网元服务IP
+	IPAddr     string `json:"ipAddr" gorm:"column:ip_addr" binding:"required"`                   // 网元服务IP
 	Port       int64  `json:"port" gorm:"column:port" binding:"required,number,max=65535,min=1"` // 端口
 	PvFlag     string `json:"pvFlag" gorm:"column:pv_flag" binding:"omitempty,oneof=PNF VNF"`    // 网元虚拟化标识 物理PNF 虚拟VNF
 	Province   string `json:"province" gorm:"column:province"`                                   // 省份地域
 	VendorName string `json:"vendorName" gorm:"column:vendor_name"`                              // 厂商名称
 	Dn         string `json:"dn" gorm:"column:dn"`                                               // 网络标识
-	NeAddress  string `json:"neAddress" gorm:"column:ne_address"`                                // MAC地址
+	MacAddr    string `json:"macAddr" gorm:"column:mac_addr"`                                    // MAC地址
 	HostIDs    string `json:"hostIds" gorm:"column:host_ids"`                                    // 网元主机ID组 数据格式(ssh,telnet) UDM(ssh,telnet,redis) UPF(ssh,telnet,telnet)
 	Status     int64  `json:"status" gorm:"column:status"`                                       // 网元状态 0离线 1在线 2配置待下发 3备用模式
 	Remark     string `json:"remark" gorm:"column:remark"`                                       // 备注

src/modules/ne/model/ne_license.go

@@ -3,13 +3,15 @@ package model
 // NeLicense 网元授权激活信息 ne_license
 type NeLicense struct {
 	ID                    int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	CoreUID               string `json:"coreUid" gorm:"column:core_uid" binding:"required"`           // 核心网唯一标识
+	NeUID                 string `json:"neUid" gorm:"column:ne_uid" binding:"required"`               // 网元唯一标识
 	NeType                string `json:"neType" gorm:"column:ne_type" binding:"required"`             // 网元类型
-	NeId                  string `json:"neId" gorm:"column:ne_id" binding:"required"`                 // 网元ID
 	ActivationRequestCode string `json:"activationRequestCode" gorm:"column:activation_request_code"` // 激活申请代码
 	LicensePath           string `json:"licensePath" gorm:"column:license_path"`                      // 激活授权文件
-	Capability            int64  `json:"capability" gorm:"column:capability"`                         // 容量
 	SerialNum             string `json:"serialNum" gorm:"column:serial_num"`                          // 序列号
 	ExpiryDate            string `json:"expiryDate" gorm:"column:expiry_date"`                        // 许可证到期日期
+	UeNumber              int64  `json:"ueNumber" gorm:"ue_number"`                                   // 用户容量
+	NbNumber              int64  `json:"nbNumber" gorm:"nb_number"`                                   // 基站容量
 	Status                string `json:"status" gorm:"column:status"`                                 // 状态 0无效 1有效
 	Remark                string `json:"remark" gorm:"column:remark"`                                 // 备注
 	CreateBy              string `json:"createBy" gorm:"column:create_by"`                            // 创建者

src/modules/ne/model/ne_version.go

@@ -3,22 +3,23 @@ package model
 // NeVersion 网元版本信息 ne_version
 type NeVersion struct {
 	ID         int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType     string `json:"neType" gorm:"column:ne_type" binding:"required"`  // 网元类型
-	NeId       string `json:"neId" gorm:"column:ne_id" binding:"required"`      // 网元ID
-	Name       string `json:"name" gorm:"column:name"`                          // 当前包名
-	Version    string `json:"version" gorm:"column:version" binding:"required"` // 当前版本
-	Path       string `json:"path" gorm:"column:path" binding:"required"`       // 当前软件包
-	PreName    string `json:"preName" gorm:"column:pre_name"`                   // 上一版本包名
-	PreVersion string `json:"preVersion" gorm:"column:pre_version"`             // 上一版本
-	PrePath    string `json:"prePath" gorm:"column:pre_path"`                   // 上一版本软件包
-	NewName    string `json:"newName" gorm:"column:new_name"`                   // 新版本包名
-	NewVersion string `json:"newVersion" gorm:"column:new_version"`             // 新版本
-	NewPath    string `json:"newPath" gorm:"column:new_path"`                   // 新版本软件包
-	Status     string `json:"status" gorm:"column:status"`                      // 当前状态 1当前版本 2上一版本 3有新版本
-	CreateBy   string `json:"createBy" gorm:"column:create_by"`                 // 创建者
-	CreateTime int64  `json:"createTime" gorm:"column:create_time"`             // 创建时间
-	UpdateBy   string `json:"updateBy" gorm:"column:update_by"`                 // 更新者
-	UpdateTime int64  `json:"updateTime" gorm:"column:update_time"`             // 更新时间
+	CoreUID    string `json:"coreUid" gorm:"column:core_uid" binding:"required"` // 核心网唯一标识
+	NeUID      string `json:"neUid" gorm:"column:ne_uid" binding:"required"`     // 网元唯一标识
+	NeType     string `json:"neType" gorm:"column:ne_type" binding:"required"`   // 网元类型
+	Name       string `json:"name" gorm:"column:name"`                           // 当前包名
+	Version    string `json:"version" gorm:"column:version" binding:"required"`  // 当前版本
+	Path       string `json:"path" gorm:"column:path" binding:"required"`        // 当前软件包
+	PreName    string `json:"preName" gorm:"column:pre_name"`                    // 上一版本包名
+	PreVersion string `json:"preVersion" gorm:"column:pre_version"`              // 上一版本
+	PrePath    string `json:"prePath" gorm:"column:pre_path"`                    // 上一版本软件包
+	NewName    string `json:"newName" gorm:"column:new_name"`                    // 新版本包名
+	NewVersion string `json:"newVersion" gorm:"column:new_version"`              // 新版本
+	NewPath    string `json:"newPath" gorm:"column:new_path"`                    // 新版本软件包
+	Status     string `json:"status" gorm:"column:status"`                       // 当前状态 1当前版本 2上一版本 3有新版本
+	CreateBy   string `json:"createBy" gorm:"column:create_by"`                  // 创建者
+	CreateTime int64  `json:"createTime" gorm:"column:create_time"`              // 创建时间
+	UpdateBy   string `json:"updateBy" gorm:"column:update_by"`                  // 更新者
+	UpdateTime int64  `json:"updateTime" gorm:"column:update_time"`              // 更新时间
 }
 
 // TableName 表名称

src/modules/ne/ne.go

@@ -12,7 +12,7 @@ import (
 
 // 模块路由注册
 func Setup(router *gin.Engine) {
-	logger.Infof("开始加载 ====> ne 模块路由")
+	logger.Infof("开始加载 ====> network_element 模块路由")
 
 	// 启动时需要的初始参数
 	InitLoad()
@@ -20,26 +20,26 @@ func Setup(router *gin.Engine) {
 	// 网元操作处理
 	neActionGroup := router.Group("/ne/action")
 	{
-		neActionGroup.GET("/files",
+		neActionGroup.GET("/file/list",
 			middleware.AuthorizeUser(nil),
-			controller.NewNeAction.Files,
+			controller.NewNeAction.FileList,
 		)
-		neActionGroup.GET("/pullFile",
+		neActionGroup.GET("/file/pull/dirzip",
 			middleware.AuthorizeUser(nil),
-			controller.NewNeAction.PullFile,
+			controller.NewNeAction.FilePullDirZip,
 		)
-		neActionGroup.POST("/pushFile",
+		neActionGroup.GET("/file/pull",
+			middleware.AuthorizeUser(nil),
+			controller.NewNeAction.FilePull,
+		)
+		neActionGroup.POST("/file/push",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neAction", collectlogs.BUSINESS_TYPE_IMPORT)),
-			controller.NewNeAction.PushFile,
+			controller.NewNeAction.FilePush,
 		)
-		neActionGroup.GET("/pullDirZip",
+		neActionGroup.GET("/file/view",
 			middleware.AuthorizeUser(nil),
-			controller.NewNeAction.PullDirZip,
-		)
-		neActionGroup.GET("/viewFile",
-			middleware.AuthorizeUser(nil),
-			controller.NewNeAction.ViewFile,
+			controller.NewNeAction.FileView,
 		)
 		neActionGroup.PUT("/service",
 			middleware.AuthorizeUser(nil),
@@ -55,28 +55,28 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewNeInfo.State,
 		)
-		neInfoGroup.GET("/byTypeAndID",
+		neInfoGroup.GET("/nf",
 			middleware.AuthorizeUser(nil),
-			controller.NewNeInfo.NeTypeAndID,
+			controller.NewNeInfo.Nf,
 		)
-		neInfoGroup.GET("/listAll",
+		neInfoGroup.GET("/list/all",
 			middleware.AuthorizeUser(nil),
 			controller.NewNeInfo.ListAll,
 		)
-		neInfoGroup.GET("/para5GFile",
+		neInfoGroup.GET("/file/para5g",
 			middleware.AuthorizeUser(nil),
 			controller.NewNeInfo.Para5GFileRead,
 		)
-		neInfoGroup.PUT("/para5GFile",
+		neInfoGroup.PUT("/file/para5g",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_OTHER)),
 			controller.NewNeInfo.Para5GFileWrite,
 		)
-		neInfoGroup.GET("/oamFile",
+		neInfoGroup.GET("/file/oam",
 			middleware.AuthorizeUser(nil),
 			controller.NewNeInfo.OAMFileRead,
 		)
-		neInfoGroup.PUT("/oamFile",
+		neInfoGroup.PUT("/file/oam",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_OTHER)),
 			controller.NewNeInfo.OAMFileWrite,
@@ -85,7 +85,7 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewNeInfo.List,
 		)
-		neInfoGroup.GET("/:id",
+		neInfoGroup.GET("",
 			middleware.CryptoApi(false, true),
 			middleware.AuthorizeUser(nil),
 			controller.NewNeInfo.Info,
@@ -102,7 +102,7 @@ func Setup(router *gin.Engine) {
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_UPDATE)),
 			controller.NewNeInfo.Edit,
 		)
-		neInfoGroup.DELETE(":id",
+		neInfoGroup.DELETE("",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewNeInfo.Remove,
@@ -193,10 +193,14 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewNeVersion.List,
 		)
-		neVersionGroup.GET("/:id",
+		neVersionGroup.GET("",
 			middleware.AuthorizeUser(nil),
 			controller.NewNeVersion.Info,
 		)
+		neVersionGroup.GET("/nf",
+			middleware.AuthorizeUser(nil),
+			controller.NewNeVersion.Nf,
+		)
 		neVersionGroup.POST("/operate",
 			middleware.AuthorizeUser(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neVersion", collectlogs.BUSINESS_TYPE_OTHER)),
@@ -244,13 +248,13 @@ func Setup(router *gin.Engine) {
 			middleware.AuthorizeUser(nil),
 			controller.NewNeLicense.List,
 		)
-		neLicenseGroup.GET("/:id",
+		neLicenseGroup.GET("",
 			middleware.AuthorizeUser(nil),
 			controller.NewNeLicense.Info,
 		)
-		neLicenseGroup.GET("/byTypeAndID",
+		neLicenseGroup.GET("/nf",
 			middleware.AuthorizeUser(nil),
-			controller.NewNeLicense.NeTypeAndID,
+			controller.NewNeLicense.Nf,
 		)
 		neLicenseGroup.GET("/code",
 			middleware.AuthorizeUser(nil),
@@ -357,8 +361,8 @@ func Setup(router *gin.Engine) {
 // InitLoad 初始参数
 func InitLoad() {
 	// 启动时，清除缓存-网元类型
-	service.NewNeInfo.ClearNeCacheByNeType("*")
-	service.NewNeInfo.FindByRmuid("")
+	service.NewNeInfo.ClearNeCacheByCoreUid("*")
+	service.NewNeInfo.RefreshNeCacheByCoreUid("*")
 	// 启动时，网元公共参数数据记录到全局变量
 	if para5GMap, err := service.NewNeInfo.NeConfPara5GRead(); para5GMap != nil && err == nil {
 		service.NewNeInfo.NeConfPara5GWirte(para5GMap, nil)

src/modules/ne/repository/ne_config_backup.go

@@ -22,8 +22,11 @@ func (r NeConfigBackup) SelectByPage(query map[string]string) ([]model.NeConfigB
 	if v, ok := query["neType"]; ok && v != "" {
 		tx = tx.Where("ne_type = ?", 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["name"]; ok && v != "" {
 		tx = tx.Where("name like ?", fmt.Sprintf("%%%s%%", v))
@@ -49,6 +52,32 @@ func (r NeConfigBackup) SelectByPage(query map[string]string) ([]model.NeConfigB
 	return rows, total
 }
 
+// Select 查询集合
+func (r NeConfigBackup) Select(param model.NeConfigBackup) []model.NeConfigBackup {
+	tx := db.DB("").Model(&model.NeConfigBackup{})
+	// 查询条件拼接
+	if param.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", param.CoreUID)
+	}
+	if param.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", param.NeUID)
+	}
+	if param.NeType != "" {
+		tx = tx.Where("ne_type = ?", param.NeType)
+	}
+	if param.CreateBy != "" {
+		tx = tx.Where("create_by like ?", fmt.Sprintf("%s%%", param.CreateBy))
+	}
+
+	// 查询数据
+	rows := []model.NeConfigBackup{}
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
 // SelectByIds 通过ID查询信息
 func (r NeConfigBackup) SelectByIds(ids []int64) []model.NeConfigBackup {
 	rows := []model.NeConfigBackup{}

src/modules/ne/repository/ne_info.go

@@ -41,6 +41,7 @@ func (r NeInfo) neListSort(arr []model.NeInfo) []model.NeInfo {
 		"CHF",
 		"HLR",
 		"SGWC",
+		"PGWC",
 		"IP-SM-GW",
 		"MMTel-AS",
 		"I-CSCF",
@@ -73,11 +74,11 @@ func (r NeInfo) SelectByPage(query map[string]string) ([]model.NeInfo, int64) {
 	if v, ok := query["neType"]; ok && v != "" {
 		tx = tx.Where("ne_type = ?", 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["rmUid"]; ok && v != "" {
-		tx = tx.Where("rmUid like ?", fmt.Sprintf("%s%%", v))
+	if v, ok := query["neUid"]; ok && v != "" {
+		tx = tx.Where("ne_uid like ?", fmt.Sprintf("%s%%", v))
 	}
 
 	// 查询结果
@@ -92,7 +93,7 @@ func (r NeInfo) SelectByPage(query map[string]string) ([]model.NeInfo, int64) {
 	// 查询数据分页
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
-	err := tx.Order("ne_type asc, ne_id asc").Find(&rows).Error
+	err := tx.Order("ne_type asc").Find(&rows).Error
 	if err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows, total
@@ -173,24 +174,32 @@ func (r NeInfo) SelectList(neInfo model.NeInfo) []model.NeInfo {
 	if neInfo.NeType != "" {
 		tx = tx.Where("ne_type = ?", neInfo.NeType)
 	}
-	if neInfo.NeId != "" {
-		tx = tx.Where("ne_id = ?", neInfo.NeId)
+	if neInfo.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", neInfo.CoreUID)
+	}
+	if neInfo.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", neInfo.NeUID)
 	}
 
 	// 查询数据
 	rows := []model.NeInfo{}
-	if err := tx.Order("ne_type asc, ne_id asc").Find(&rows).Error; err != nil {
+	if err := tx.Order("ne_type asc").Find(&rows).Error; err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows
 	}
 	return r.neListSort(rows)
 }
 
-// SelectNeInfoByNeTypeAndNeID 通过ne_type和ne_id查询网元信息
-func (r NeInfo) SelectNeInfoByNeTypeAndNeID(neType, neID string) model.NeInfo {
+// SelectNeInfoByCoreUidAndNeUid 通过core_uid和ne_uid查询网元信息
+// coreUid 为*或空字符时，根据neUid查询
+func (r NeInfo) SelectNeInfoByCoreUidAndNeUid(coreUid, neUid string) model.NeInfo {
 	tx := db.DB("").Model(&model.NeInfo{})
 	// 构建查询条件
-	tx = tx.Where("ne_type = ? and ne_id = ?", neType, neID)
+	if coreUid == "*" || coreUid == "" {
+		tx = tx.Where("ne_uid = ?", neUid)
+	} else {
+		tx = tx.Where("core_uid = ? and ne_uid = ?", coreUid, neUid)
+	}
 	// 查询数据
 	row := model.NeInfo{}
 	if err := tx.Limit(1).Find(&row).Error; err != nil {
@@ -200,25 +209,6 @@ func (r NeInfo) SelectNeInfoByNeTypeAndNeID(neType, neID string) model.NeInfo {
 	return row
 }
 
-// CheckUniqueNeTypeAndNeId 校验同类型下标识是否唯一
-func (r NeInfo) CheckUniqueNeTypeAndNeId(neInfo model.NeInfo) int64 {
-	tx := db.DB("").Model(&model.NeInfo{})
-	// 查询条件拼接
-	if neInfo.NeType != "" {
-		tx = tx.Where("ne_type = ?", neInfo.NeType)
-	}
-	if neInfo.NeId != "" {
-		tx = tx.Where("ne_id = ?", neInfo.NeType)
-	}
-	// 查询数据
-	var id int64 = 0
-	if err := tx.Limit(1).Select("id").Find(&id).Error; err != nil {
-		logger.Errorf("query find err => %v", err.Error())
-		return id
-	}
-	return id
-}
-
 // UpdateState 修改状态
 func (r NeInfo) UpdateState(id int64, status int64) int64 {
 	if id <= 0 {

src/modules/ne/repository/ne_license.go

@@ -22,14 +22,17 @@ func (r NeLicense) SelectByPage(query map[string]string) ([]model.NeLicense, int
 	if v, ok := query["neType"]; ok && v != "" {
 		tx = tx.Where("ne_type = ?", 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["expiryDate"]; ok && v != "" {
-		tx = tx.Where("expiry_date = ?", v)
+		tx = tx.Where("expiry_date like ?", fmt.Sprintf("%s%%", v))
 	}
 	if v, ok := query["serialNum"]; ok && v != "" {
-		tx = tx.Where("serial_num = ?", v)
+		tx = tx.Where("serial_num like ?", fmt.Sprintf("%s%%", v))
 	}
 	if v, ok := query["createBy"]; ok && v != "" {
 		tx = tx.Where("create_by like ?", fmt.Sprintf("%s%%", v))
@@ -60,15 +63,21 @@ func (r NeLicense) SelectByPage(query map[string]string) ([]model.NeLicense, int
 func (r NeLicense) Select(param model.NeLicense) []model.NeLicense {
 	tx := db.DB("").Model(&model.NeLicense{})
 	// 查询条件拼接
+	if param.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", param.CoreUID)
+	}
+	if param.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", param.NeUID)
+	}
 	if param.NeType != "" {
 		tx = tx.Where("ne_type = ?", param.NeType)
 	}
-	if param.NeId != "" {
-		tx = tx.Where("ne_id = ?", param.NeId)
-	}
 	if param.ExpiryDate != "" {
 		tx = tx.Where("expiry_date = ?", param.ExpiryDate)
 	}
+	if param.SerialNum != "" {
+		tx = tx.Where("serial_num = ?", param.SerialNum)
+	}
 	if param.CreateBy != "" {
 		tx = tx.Where("create_by like ?", fmt.Sprintf("%s%%", param.CreateBy))
 	}

src/modules/ne/repository/ne_version.go

@@ -22,8 +22,11 @@ func (r NeVersion) SelectByPage(query map[string]string) ([]model.NeVersion, int
 	if v, ok := query["neType"]; ok && v != "" {
 		tx = tx.Where("ne_type = ?", 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["version"]; ok && v != "" {
 		tx = tx.Where("version like ?", fmt.Sprintf("%s%%", v))
@@ -57,11 +60,11 @@ func (r NeVersion) SelectByPage(query map[string]string) ([]model.NeVersion, int
 func (r NeVersion) Select(param model.NeVersion) []model.NeVersion {
 	tx := db.DB("").Model(&model.NeVersion{})
 	// 查询条件拼接
-	if param.NeType != "" {
-		tx = tx.Where("ne_type = ?", param.NeType)
+	if param.CoreUID != "" {
+		tx = tx.Where("core_uid = ?", param.CoreUID)
 	}
-	if param.NeId != "" {
-		tx = tx.Where("ne_id = ?", param.NeId)
+	if param.NeUID != "" {
+		tx = tx.Where("ne_uid = ?", param.NeUID)
 	}
 	if param.Version != "" {
 		tx = tx.Where("version like ?", fmt.Sprintf("%s%%", param.Version))

src/modules/ne/service/ne_config_backup.go

@@ -28,6 +28,11 @@ func (s NeConfigBackup) FindByPage(query map[string]string) ([]model.NeConfigBac
 	return s.neConfigBackupRepository.SelectByPage(query)
 }
 
+// Find 查询
+func (s NeConfigBackup) Find(param model.NeConfigBackup) []model.NeConfigBackup {
+	return s.neConfigBackupRepository.Select(param)
+}
+
 // FindById 通过ID查询
 func (s NeConfigBackup) FindById(id int64) model.NeConfigBackup {
 	if id <= 0 {
@@ -51,19 +56,20 @@ func (s NeConfigBackup) Update(item model.NeConfigBackup) int64 {
 }
 
 // DeleteByIds 批量删除信息
-func (s NeConfigBackup) DeleteByIds(ids []int64) (int64, error) {
+func (s NeConfigBackup) DeleteByIds(id int64, coreUid string, neUid string) (int64, error) {
 	// 检查是否存在
-	data := s.neConfigBackupRepository.SelectByIds(ids)
-	if len(data) <= 0 {
+	data := s.neConfigBackupRepository.SelectByIds([]int64{id})
+	if len(data) != 1 {
 		return 0, fmt.Errorf("neConfigBackup.noData")
 	}
 
-	if len(data) == len(ids) {
-		rows := s.neConfigBackupRepository.DeleteByIds(ids)
-		return rows, nil
+	for _, v := range data {
+		if v.CoreUID != coreUid || v.NeUID != neUid {
+			return 0, fmt.Errorf("data not match, id: %d", v.ID)
+		}
 	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
+	rows := s.neConfigBackupRepository.DeleteByIds([]int64{id})
+	return rows, nil
 }
 
 // FileLocalToNe 网元配置文件复制到网元端覆盖
@@ -74,13 +80,13 @@ func (s NeConfigBackup) FileLocalToNe(neInfo model.NeInfo, localFile string) err
 	if runtime.GOOS == "windows" {
 		omcPath = fmt.Sprintf("C:%s", omcPath)
 	}
-	localDirPath := fmt.Sprintf("%s/%s/%s/backup/tmp_import", omcPath, neTypeLower, neInfo.NeId)
+	localDirPath := fmt.Sprintf("%s/%s/%s/backup/tmp_import", omcPath, neTypeLower, neInfo.NeUID)
 	if err := file.UnZip(localFile, localDirPath); err != nil {
 		return fmt.Errorf("unzip err")
 	}
 
 	// 网元主机的SSH客户端
-	sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+	sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 	if err != nil {
 		return fmt.Errorf("ne info ssh client err")
 	}
@@ -93,7 +99,7 @@ func (s NeConfigBackup) FileLocalToNe(neInfo model.NeInfo, localFile string) err
 	defer sftpClient.Close()
 
 	// 网元配置端上的临时目录
-	neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeId)
+	neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeUID)
 	sshClient.RunCMD(fmt.Sprintf("sudo mkdir -p /tmp/omc/ne_config && sudo chmod 777 -R /tmp/omc && sudo rm -rf %s", neDirTemp))
 	// 复制到网元端
 	if err = sftpClient.CopyDirLocalToRemote(localDirPath, neDirTemp); err != nil {
@@ -134,7 +140,7 @@ func (s NeConfigBackup) FileLocalToNe(neInfo model.NeInfo, localFile string) err
 // FileNeToLocal 网元备份文件网元端复制到本地
 func (s NeConfigBackup) FileNeToLocal(neInfo model.NeInfo) (string, error) {
 	// 网元主机的SSH客户端
-	sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
+	sshClient, err := NewNeInfo.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 	if err != nil {
 		return "", fmt.Errorf("ne info ssh client err")
 	}
@@ -152,11 +158,11 @@ func (s NeConfigBackup) FileNeToLocal(neInfo model.NeInfo) (string, error) {
 	if runtime.GOOS == "windows" {
 		omcPath = fmt.Sprintf("C:%s", omcPath)
 	}
-	localDirPath := fmt.Sprintf("%s/%s/%s/from_ne_tmp", omcPath, neTypeLower, neInfo.NeId)
+	localDirPath := fmt.Sprintf("%s/%s/%s/from_ne_tmp", omcPath, neTypeLower, neInfo.NeUID)
 
 	// 网元配置文件先复制到临时目录
 	sshClient.RunCMD("sudo mkdir -p /tmp/omc/ne_config && sudo chmod 777 -R /tmp/omc")
-	neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeId)
+	neDirTemp := fmt.Sprintf("/tmp/omc/ne_config/%s/%s", neTypeLower, neInfo.NeUID)
 	switch neTypeLower {
 	case "ims":
 		// ims目录
@@ -188,8 +194,8 @@ func (s NeConfigBackup) FileNeToLocal(neInfo model.NeInfo) (string, error) {
 	}
 
 	// 压缩zip文件名
-	zipFileName := fmt.Sprintf("%s-%s-etc-%s.zip", neTypeLower, neInfo.NeId, date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS))
-	zipFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neInfo.NeId, zipFileName)
+	zipFileName := fmt.Sprintf("%s-%s-etc-%s.zip", neTypeLower, neInfo.NeUID, date.ParseDateToStr(time.Now(), date.YYYYMMDDHHMMSS))
+	zipFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neInfo.NeUID, zipFileName)
 	if err := file.CompressZipByDir(zipFilePath, localDirPath); err != nil {
 		return "", fmt.Errorf("compress zip err")
 	}

src/modules/ne/service/ne_info.go

@@ -35,10 +35,11 @@ type NeInfo struct {
 	Para5GData       map[string]string
 }
 
-// FindByNeTypeAndNeID 通过ne_type和ne_id查询网元信息
-func (r NeInfo) FindByNeTypeAndNeID(neType, neID string) model.NeInfo {
+// FindByCoreUidAndNeUid 通过core_uid和ne_uid查询网元信息
+// coreUid 为*时，根据neUid查询
+func (r NeInfo) FindByCoreUidAndNeUid(coreUid string, neUid string) model.NeInfo {
 	var neInfo model.NeInfo
-	key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(neType), neID)
+	key := fmt.Sprintf("%s:%s:*:%s", constants.CACHE_NE_INFO, coreUid, neUid)
 	jsonStr, _ := redis.Get("", key)
 	if len(jsonStr) > 7 {
 		err := json.Unmarshal([]byte(jsonStr), &neInfo)
@@ -46,8 +47,8 @@ func (r NeInfo) FindByNeTypeAndNeID(neType, neID string) model.NeInfo {
 			neInfo = model.NeInfo{}
 		}
 	} else {
-		neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID)
-		if neInfo.ID != 0 && neInfo.NeId == neID {
+		neInfo = r.neInfoRepository.SelectNeInfoByCoreUidAndNeUid(coreUid, neUid)
+		if neInfo.CoreUID == coreUid && neInfo.NeUID == neUid {
 			redis.Del("", key)
 			values, _ := json.Marshal(neInfo)
 			redis.Set("", key, string(values), 0)
@@ -56,36 +57,27 @@ func (r NeInfo) FindByNeTypeAndNeID(neType, neID string) model.NeInfo {
 	return neInfo
 }
 
-// RefreshByNeTypeAndNeID 通过ne_type和ne_id刷新redis中的缓存
-func (r NeInfo) RefreshByNeTypeAndNeID(neType, neID string) model.NeInfo {
+// RefreshByCoreUidAndNeUid 通过core_id和ne_uid刷新缓存
+func (r NeInfo) RefreshByCoreUidAndNeUid(coreuid string, neUid string) model.NeInfo {
 	var neInfo model.NeInfo
-	key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(neType), neID)
+	if coreuid == "*" || coreuid == "" {
+		return neInfo
+	}
+	key := fmt.Sprintf("%s:%s:*:%s", constants.CACHE_NE_INFO, coreuid, neUid)
 	redis.Del("", key)
-	neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID)
-	if neInfo.ID != 0 && neInfo.NeId == neID {
+	neInfo = r.neInfoRepository.SelectNeInfoByCoreUidAndNeUid(coreuid, neUid)
+	if neInfo.CoreUID == coreuid && neInfo.NeUID == neUid {
 		values, _ := json.Marshal(neInfo)
 		redis.Set("", key, string(values), 0)
 	}
 	return neInfo
 }
 
-// ClearNeCacheByNeType 清除网元类型缓存
-func (r NeInfo) ClearNeCacheByNeType(neType string) bool {
-	key := fmt.Sprintf("%s:*", constants.CACHE_NE_INFO)
-	if neType != "*" {
-		key = fmt.Sprintf("%s:%s*", constants.CACHE_NE_INFO, neType)
-	}
-	keys, err := redis.GetKeys("", key)
-	if err != nil {
-		return false
-	}
-	return redis.DelKeys("", keys) == nil
-}
-
-// FindByNeType 通过ne_type查询网元信息
-func (r NeInfo) FindByNeType(neType string) []model.NeInfo {
+// FindByCoreUidAndNeType 通过core_uid和ne_type查询网元信息
+// coreUid 为*时，根据neType查询
+func (r NeInfo) FindByCoreUidAndNeType(coreUid string, neType string) []model.NeInfo {
 	neInfo := make([]model.NeInfo, 0)
-	key := fmt.Sprintf("%s:%s:*", constants.CACHE_NE_INFO, strings.ToUpper(neType))
+	key := fmt.Sprintf("%s:%s:%s:*", constants.CACHE_NE_INFO, coreUid, neType)
 	cacheKeys, _ := redis.GetKeys("", key)
 	if len(cacheKeys) > 0 {
 		for _, key := range cacheKeys {
@@ -98,9 +90,9 @@ func (r NeInfo) FindByNeType(neType string) []model.NeInfo {
 		}
 		return neInfo
 	} else {
-		neInfo = r.neInfoRepository.SelectList(model.NeInfo{NeType: neType})
+		neInfo = r.neInfoRepository.SelectList(model.NeInfo{CoreUID: coreUid, NeType: neType})
 		for _, v := range neInfo {
-			key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(v.NeType), v.NeId)
+			key := fmt.Sprintf("%s:%s:%s:%s", constants.CACHE_NE_INFO, v.CoreUID, v.NeType, v.NeUID)
 			redis.Del("", key)
 			values, _ := json.Marshal(v)
 			redis.Set("", key, string(values), 0)
@@ -109,35 +101,33 @@ func (r NeInfo) FindByNeType(neType string) []model.NeInfo {
 	return neInfo
 }
 
-// FindByRmuid 通过rmUID查询网元信息
-func (r NeInfo) FindByRmuid(rmUid string) model.NeInfo {
-	var neInfo model.NeInfo
-	cacheKeys, _ := redis.GetKeys("", constants.CACHE_NE_INFO+":*")
-	if len(cacheKeys) > 0 {
-		for _, key := range cacheKeys {
-			var v model.NeInfo
-			jsonStr, _ := redis.Get("", key)
-			if len(jsonStr) > 7 {
-				json.Unmarshal([]byte(jsonStr), &v)
-			}
-			if v.RmUID == rmUid {
-				neInfo = v
-				break
-			}
-		}
-	} else {
-		neInfos := r.Find(neInfo, false, false)
-		for _, v := range neInfos {
-			key := fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, strings.ToUpper(v.NeType), v.NeId)
-			redis.Del("", key)
-			values, _ := json.Marshal(v)
-			redis.Set("", key, string(values), 0)
-			if v.RmUID == rmUid {
-				neInfo = v
-			}
-		}
+// ClearNeCacheByCoreUidOrNeUid 清除核心网下网元信息缓存
+// coreUid 核心网唯一标识 *表示清除所有
+func (r NeInfo) ClearNeCacheByCoreUid(coreUid string) bool {
+	key := fmt.Sprintf("%s:*", constants.CACHE_NE_INFO)
+	if coreUid != "*" {
+		key = fmt.Sprintf("%s:%s:*", constants.CACHE_NE_INFO, coreUid)
+	}
+	keys, err := redis.GetKeys("", key)
+	if err != nil {
+		return false
+	}
+	return redis.DelKeys("", keys) == nil
+}
+
+// RefreshNeCacheByCoreUid 刷新核心网下网元信息缓存
+// coreUid 核心网唯一标识 *表示所有
+func (r NeInfo) RefreshNeCacheByCoreUid(coreUid string) {
+	if coreUid == "*" {
+		coreUid = ""
+	}
+	neInfos := r.Find(model.NeInfo{CoreUID: coreUid}, false, false)
+	for _, v := range neInfos {
+		key := fmt.Sprintf("%s:%s:%s:%s", constants.CACHE_NE_INFO, v.CoreUID, v.NeType, v.NeUID)
+		redis.Del("", key)
+		values, _ := json.Marshal(v)
+		redis.Set("", key, string(values), 0)
 	}
-	return neInfo
 }
 
 // FindByPage 根据条件分页查询
@@ -252,6 +242,27 @@ func (r NeInfo) FindById(id int64, bandHost bool) model.NeInfo {
 
 // Insert 新增信息
 func (r NeInfo) Insert(neInfo model.NeInfo) int64 {
+	if neInfo.CoreUID == "" {
+		return 0
+	}
+	neInfo.NeUID = strings.ToUpper(generate.Code(8))
+
+	// 获取网元状态是否正常
+	serverState, err := neFetchlink.NeState(neInfo)
+	if err != nil {
+		neInfo.Status = 0
+	} else {
+		// 网元状态设置为在线
+		neInfo.Status = 1
+		if parse.Boolean(serverState["standby"]) {
+			neInfo.Status = 3
+		}
+		// 下发网管配置信息给网元
+		if _, err = neFetchlink.NeConfigOMC(neInfo); err != nil {
+			neInfo.Status = 2
+		}
+	}
+
 	// 主机信息新增
 	if neInfo.Hosts != nil {
 		uuid := generate.Code(4)
@@ -270,20 +281,75 @@ func (r NeInfo) Insert(neInfo model.NeInfo) int64 {
 
 	insertId := r.neInfoRepository.Insert(neInfo)
 	if insertId > 0 {
-		// 刷新缓存
-		r.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+		// 新增Version信息
+		neVersion := model.NeVersion{
+			CoreUID:  neInfo.CoreUID,
+			NeUID:    neInfo.NeUID,
+			NeType:   neInfo.NeType,
+			CreateBy: neInfo.CreateBy,
+		}
+		if v, ok := serverState["version"]; ok && v != nil {
+			neVersion.Name = "-"
+			neVersion.Path = "-"
+			neVersion.Version = fmt.Sprint(v)
+		}
+		NewNeVersion.Insert(neVersion)
+
+		// 新增License信息
+		neLicense := model.NeLicense{
+			CoreUID:  neInfo.CoreUID,
+			NeUID:    neInfo.NeUID,
+			NeType:   neInfo.NeType,
+			CreateBy: neInfo.CreateBy,
+		}
+		if v, ok := serverState["sn"]; ok && v != nil {
+			neLicense.SerialNum = fmt.Sprint(v)
+		}
+		if v, ok := serverState["expire"]; ok && v != nil {
+			neLicense.ExpiryDate = fmt.Sprint(v)
+			neLicense.Status = "1"
+		}
+		if v, ok := serverState["ueNumber"]; ok && v != nil {
+			neLicense.UeNumber = parse.Number(v)
+		}
+		if v, ok := serverState["nbNumber"]; ok && v != nil {
+			neLicense.NbNumber = parse.Number(v)
+		}
+		NewNeLicense.Insert(neLicense)
+
+		r.RefreshByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID) // 刷新缓存
 	}
 	return insertId
 }
 
 // Update 修改信息
 func (r NeInfo) Update(neInfo model.NeInfo) int64 {
+	// 获取网元状态是否正常
+	serverState, err := neFetchlink.NeState(neInfo)
+	if err != nil {
+		neInfo.Status = 0
+	} else {
+		// 网元状态设置为在线
+		neInfo.Status = 1
+		if parse.Boolean(serverState["standby"]) {
+			neInfo.Status = 3
+		}
+		// 下发网管配置信息给网元
+		if _, err = neFetchlink.NeConfigOMC(neInfo); err != nil {
+			neInfo.Status = 2
+		}
+	}
+
 	// 主机信息更新
-	if neInfo.Hosts != nil {
+	if neInfo.HostIDs != "" && len(neInfo.Hosts) > 0 {
+		hostIDs := strings.Split(neInfo.HostIDs, ",")
+		for index, id := range hostIDs {
+			neInfo.Hosts[index].ID = parse.Number(id)
+		}
 		uuid := generate.Code(4)
 		for _, host := range neInfo.Hosts {
 			if host.ID != 0 {
-				host.Title = fmt.Sprintf("%s_%d_%s", neInfo.NeName, host.Port, uuid)
+				host.Title = fmt.Sprintf("%s_%d_%s", neInfo.NeType, host.Port, uuid)
 				host.GroupID = "1"
 				host.UpdateBy = neInfo.UpdateBy
 				r.neHostService.Update(host)
@@ -293,73 +359,99 @@ func (r NeInfo) Update(neInfo model.NeInfo) int64 {
 
 	num := r.neInfoRepository.Update(neInfo)
 	if num > 0 {
-		// 刷新缓存
-		r.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+		// 版本信息更新
+		neVersion := NewNeVersion.FindByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID)
+		if neVersion.ID != 0 {
+			if neVersion.NeType != neInfo.NeType {
+				neVersion.NeType = neInfo.NeType
+			}
+			if v, ok := serverState["version"]; ok && v != neVersion.Version {
+				neVersion.Name = "-"
+				neVersion.Path = "-"
+				neVersion.Version = fmt.Sprint(v)
+			}
+			neVersion.UpdateBy = neInfo.UpdateBy
+			NewNeVersion.Update(neVersion)
+		}
+
+		// License信息更新
+		neLicense := NewNeLicense.FindByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID)
+		if neLicense.ID != 0 {
+			if neLicense.NeType != neInfo.NeType {
+				neLicense.NeType = neInfo.NeType
+			}
+			if v, ok := serverState["sn"]; ok && v != nil {
+				neLicense.SerialNum = fmt.Sprint(v)
+			}
+			if v, ok := serverState["expire"]; ok && v != nil {
+				neLicense.ExpiryDate = fmt.Sprint(v)
+				neLicense.Status = "1"
+			}
+			if v, ok := serverState["ueNumber"]; ok && v != nil {
+				neLicense.UeNumber = parse.Number(v)
+			}
+			if v, ok := serverState["nbNumber"]; ok && v != nil {
+				neLicense.NbNumber = parse.Number(v)
+			}
+			neLicense.UpdateBy = neInfo.UpdateBy
+			NewNeLicense.Update(neLicense)
+		}
+
+		r.RefreshByCoreUidAndNeUid(neInfo.CoreUID, neInfo.NeUID) // 刷新缓存
 	}
 	return num
 }
 
 // DeleteByIds 批量删除信息
-func (r NeInfo) DeleteByIds(ids []int64) (int64, error) {
+func (r NeInfo) DeleteById(id int64, coreUid, neUid string) (int64, error) {
 	// 检查是否存在
-	infos := r.neInfoRepository.SelectByIds(ids)
-	if len(infos) <= 0 {
-		return 0, fmt.Errorf("neHostCmd.noData")
+	arr := r.neInfoRepository.SelectByIds([]int64{id})
+	if len(arr) != 1 {
+		return 0, fmt.Errorf("not match id")
 	}
 
-	if len(infos) == len(ids) {
-		for _, v := range infos {
-			// 主机信息删除
-			if v.HostIDs != "" {
-				hostIds := make([]int64, 0)
-				arr := strings.Split(v.HostIDs, ",")
-				for _, hostId := range arr {
-					hostIds = append(hostIds, parse.Number(hostId))
-				}
-				r.neHostService.DeleteByIds(hostIds, false)
-			}
-			// 删除License
-			neLicense := NewNeLicense.FindByNeTypeAndNeID(v.NeType, v.NeId)
-			if neLicense.NeId == v.NeId {
-				NewNeLicense.DeleteByIds([]int64{neLicense.ID})
-			}
-			// 删除Version
-			neVersion := NewNeVersion.FindByNeTypeAndNeID(v.NeType, v.NeId)
-			if neVersion.NeId == v.NeId {
-				NewNeVersion.DeleteByIds([]int64{neVersion.ID})
-			}
-			// 缓存信息删除
-			redis.Del("", fmt.Sprintf("%s:%s:%s", constants.CACHE_NE_INFO, v.NeType, v.NeId))
+	for _, v := range arr {
+		if v.CoreUID != coreUid || v.NeUID != neUid {
+			return 0, fmt.Errorf("data not match, id: %d", v.ID)
 		}
-		rows := r.neInfoRepository.DeleteByIds(ids)
-		return rows, nil
 	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}
-
-// CheckUniqueNeTypeAndNeId 校验同类型下标识是否唯一
-func (r NeInfo) CheckUniqueNeTypeAndNeId(neType, neId string, id int64) bool {
-	uniqueId := r.neInfoRepository.CheckUniqueNeTypeAndNeId(model.NeInfo{
-		NeType: neType,
-		NeId:   neId,
-	})
-	if uniqueId == id {
-		return true
+	for _, v := range arr {
+		// 主机信息删除
+		if v.HostIDs != "" {
+			hostIds := make([]int64, 0)
+			arr := strings.Split(v.HostIDs, ",")
+			for _, hostId := range arr {
+				hostIds = append(hostIds, parse.Number(hostId))
+			}
+			r.neHostService.DeleteByIds(hostIds, false)
+		}
+		// 删除License
+		neLicense := NewNeLicense.FindByCoreUidAndNeUid(v.CoreUID, v.NeUID)
+		if neLicense.CoreUID == v.CoreUID && neLicense.NeUID == v.NeUID {
+			NewNeLicense.DeleteByIds([]int64{neLicense.ID})
+		}
+		// 删除Version
+		neVersion := NewNeVersion.FindByCoreUidAndNeUid(v.CoreUID, v.NeUID)
+		if neVersion.CoreUID == v.CoreUID && neVersion.NeUID == v.NeUID {
+			NewNeVersion.DeleteByIds([]int64{neVersion.ID})
+		}
+		// 缓存信息删除
+		redis.Del("", fmt.Sprintf("%s:%s:%s:%s", constants.CACHE_NE_INFO, v.CoreUID, v.NeType, v.NeUID))
 	}
-	return uniqueId == 0
+	rows := r.neInfoRepository.DeleteByIds([]int64{id})
+	return rows, nil
 }
 
 // NeRunSSHClient 网元主机的SSH客户端-为创建相关连接，注意结束后 Close()
-func (r NeInfo) NeRunSSHClient(neType, neId string) (*ssh.ConnSSH, error) {
-	neInfo := r.FindByNeTypeAndNeID(neType, neId)
-	if neInfo.NeId != neId {
-		logger.Errorf("NeRunSSHClient NeType:%s NeID:%s not found", neType, neId)
+func (r NeInfo) NeRunSSHClient(coreUid, neUid string) (*ssh.ConnSSH, error) {
+	neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
+		logger.Errorf("NeRunSSHClient CoreUID:%s or NeUID:%s not found", coreUid, neUid)
 		return nil, fmt.Errorf("neinfo not found")
 	}
 	// 取主机信息
 	if neInfo.HostIDs == "" {
-		logger.Errorf("NeRunSSHClient NeType:%s NeID:%s hostId not found", neType, neId)
+		logger.Errorf("NeRunSSHClient CoreUID:%s or NeUID:%s hostId not found", coreUid, neUid)
 		return nil, fmt.Errorf("neinfo hostId not found")
 	}
 	hostIds := strings.Split(neInfo.HostIDs, ",")
@@ -395,15 +487,15 @@ func (r NeInfo) NeRunSSHClient(neType, neId string) (*ssh.ConnSSH, error) {
 }
 
 // NeRunSSHCmd 网元主机的SSH客户端发送cmd命令
-func (r NeInfo) NeRunSSHCmd(neType, neId, cmd string) (string, error) {
-	sshClient, err := r.NeRunSSHClient(neType, neId)
+func (r NeInfo) NeRunSSHCmd(coreUid, neUid string, cmdStr string) (string, error) {
+	sshClient, err := r.NeRunSSHClient(coreUid, neUid)
 	if err != nil {
 		return "", err
 	}
 	defer sshClient.Close()
 
 	// 执行命令
-	output, err := sshClient.RunCMD(cmd)
+	output, err := sshClient.RunCMD(cmdStr)
 	if err != nil {
 		logger.Errorf("NeRunSSHCmd RunCMD %s err => %s", output, err.Error())
 		return "", fmt.Errorf("neinfo ssh run cmd err")
@@ -413,15 +505,15 @@ func (r NeInfo) NeRunSSHCmd(neType, neId, cmd string) (string, error) {
 
 // NeRunTelnetClient 网元主机的Telnet客户端-为创建相关连接，注意结束后 Close()
 // num 是网元主机telnet 1：4100 2：5200（UPF标准版）
-func (r NeInfo) NeRunTelnetClient(neType, neId string, num int) (*telnet.ConnTelnet, error) {
-	neInfo := r.FindByNeTypeAndNeID(neType, neId)
-	if neInfo.NeId != neId {
-		logger.Errorf("NeRunTelnetClient NeType:%s NeID:%s not found", neType, neId)
+func (r NeInfo) NeRunTelnetClient(coreUid, neUid string, num int) (*telnet.ConnTelnet, error) {
+	neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
+		logger.Errorf("NeRunSSHClient CoreUID:%s or NeUID:%s not found", coreUid, neUid)
 		return nil, fmt.Errorf("neinfo not found")
 	}
 	// 取主机信息
 	if neInfo.HostIDs == "" {
-		logger.Errorf("NeRunTelnetClient NeType:%s NeID:%s hostId not found", neType, neId)
+		logger.Errorf("NeRunTelnetClient CoreUID:%s or NeUID:%s hostId not found", coreUid, neUid)
 		return nil, fmt.Errorf("neinfo hostId not found")
 	}
 	hostIds := strings.Split(neInfo.HostIDs, ",")
@@ -449,15 +541,15 @@ func (r NeInfo) NeRunTelnetClient(neType, neId string, num int) (*telnet.ConnTel
 
 // NeRunRedisClient 网元主机的Redis客户端-为创建相关连接，注意结束后 Close()
 // 暂时只有UDM有Redis配置项
-func (r NeInfo) NeRunRedisClient(neType, neId string) (*redis.ConnRedis, error) {
-	neInfo := r.FindByNeTypeAndNeID(neType, neId)
-	if neInfo.NeId != neId {
-		logger.Errorf("NeRunRedisClient NeType:%s NeID:%s not found", neType, neId)
+func (r NeInfo) NeRunRedisClient(coreUid, neUid string) (*redis.ConnRedis, error) {
+	neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
+		logger.Errorf("NeRunRedisClient CoreUid:%s NeUid:%s not found", coreUid, neUid)
 		return nil, fmt.Errorf("neinfo not found")
 	}
 	// 取主机信息
 	if neInfo.HostIDs == "" {
-		logger.Errorf("NeRunRedisClient NeType:%s NeID:%s hostId not found", neType, neId)
+		logger.Errorf("NeRunRedisClient CoreUid:%s NeUid:%s hostId not found", coreUid, neUid)
 		return nil, fmt.Errorf("neinfo hostId not found")
 	}
 	hostIds := strings.Split(neInfo.HostIDs, ",")
@@ -484,8 +576,14 @@ func (r NeInfo) NeRunRedisClient(neType, neId string) (*redis.ConnRedis, error)
 }
 
 // NeConfOAMReadSync 网元OAM配置文件读取
-func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) {
-	oamData, err := r.neConfOAMRead(neType, neId, true)
+func (r NeInfo) NeConfOAMReadSync(coreUid, neUid string) (map[string]any, error) {
+	neInfo := r.FindByCoreUidAndNeUid(coreUid, neUid)
+	if neInfo.CoreUID != coreUid || neInfo.NeUID != neUid {
+		logger.Errorf("NeRunRedisClient CoreUid:%s NeUid:%s not found", coreUid, neUid)
+		return nil, fmt.Errorf("neinfo not found")
+	}
+
+	oamData, err := r.neConfOAMRead(neInfo, true)
 	if err != nil {
 		return nil, err
 	}
@@ -500,7 +598,7 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) {
 		}
 		oamData["httpManageCfg"] = item
 		delete(oamData, "httpmanagecfg")
-		r.neConfOAMWirte(neType, neId, oamData, false)
+		r.neConfOAMWirte(neInfo, oamData, false)
 	}
 	// 对网管HTTP配置
 	if v, ok := oamData["oamconfig"]; ok && v != nil {
@@ -515,7 +613,7 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) {
 		}
 		oamData["oamConfig"] = item
 		delete(oamData, "oamconfig")
-		r.neConfOAMWirte(neType, neId, oamData, false)
+		r.neConfOAMWirte(neInfo, oamData, false)
 	}
 	// 对网管SNMP配置
 	if v, ok := oamData["snmpconfig"]; ok && v != nil {
@@ -526,14 +624,14 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) {
 		}
 		oamData["snmpConfig"] = item
 		delete(oamData, "snmpconfig")
-		r.neConfOAMWirte(neType, neId, oamData, false)
+		r.neConfOAMWirte(neInfo, oamData, false)
 	}
 	// 对网管KPI上报配置
 	if v, ok := oamData["kpiconfig"]; ok && v != nil {
 		item := v.(map[string]any)
 		oamData["kpiConfig"] = item
 		delete(oamData, "kpiconfig")
-		r.neConfOAMWirte(neType, neId, oamData, false)
+		r.neConfOAMWirte(neInfo, oamData, false)
 	}
 
 	// NSSF和MME 配置KPIconfig名不一致时
@@ -541,7 +639,7 @@ func (r NeInfo) NeConfOAMReadSync(neType, neId string) (map[string]any, error) {
 		item := v.(map[string]any)
 		oamData["kpiConfig"] = item
 		delete(oamData, "KPIconfig")
-		r.neConfOAMWirte(neType, neId, oamData, false)
+		r.neConfOAMWirte(neInfo, oamData, false)
 	}
 
 	return oamData, nil
@@ -591,11 +689,11 @@ func (r NeInfo) neConfOAMData() map[string]any {
 }
 
 // neConfOAMRead 网元OAM配置文件读取 sync从网元端同步到本地
-func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, error) {
-	neTypeLower := strings.ToLower(neType)
+func (r NeInfo) neConfOAMRead(neInfo model.NeInfo, sync bool) (map[string]any, error) {
+	neTypeLower := strings.ToLower(neInfo.NeType)
 	fileName := "oam_manager.yaml"
 	// 网管本地路径
-	localFilePath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s/%s", neTypeLower, neId, fileName)
+	localFilePath := fmt.Sprintf("/usr/local/omc/backup/ne_config/%s/%s/%s", neTypeLower, neInfo.NeUID, fileName)
 	if runtime.GOOS == "windows" {
 		localFilePath = fmt.Sprintf("C:%s", localFilePath)
 	}
@@ -603,7 +701,7 @@ func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, e
 	// 从网元端同步到本地
 	if sync {
 		// 网元主机的SSH客户端
-		sshClient, err := r.NeRunSSHClient(neType, neId)
+		sshClient, err := r.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 		if err != nil {
 			return nil, fmt.Errorf("ne info ssh client err")
 		}
@@ -631,7 +729,7 @@ func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, e
 		// return nil, fmt.Errorf("read file error")
 		// 无保留文件时返回默认文件数据
 		oamData := r.neConfOAMData()
-		r.neConfOAMWirte(neType, neId, oamData, false)
+		r.neConfOAMWirte(neInfo, oamData, false)
 		return oamData, nil
 	}
 	content := string(bytes)
@@ -646,15 +744,15 @@ func (r NeInfo) neConfOAMRead(neType, neId string, sync bool) (map[string]any, e
 }
 
 // neConfOAMWirte 网元OAM配置文件写入 content内容 sync同步到网元端
-func (r NeInfo) neConfOAMWirte(neType, neId string, content any, sync bool) error {
-	neTypeLower := strings.ToLower(neType)
+func (r NeInfo) neConfOAMWirte(neInfo model.NeInfo, content any, sync bool) error {
+	neTypeLower := strings.ToLower(neInfo.NeType)
 	fileName := "oam_manager.yaml"
 	// 网管本地路径
 	omcPath := "/usr/local/omc/backup/ne_config"
 	if runtime.GOOS == "windows" {
 		omcPath = fmt.Sprintf("C:%s", omcPath)
 	}
-	localFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neId, fileName)
+	localFilePath := fmt.Sprintf("%s/%s/%s/%s", omcPath, neTypeLower, neInfo.NeUID, fileName)
 
 	// 写入文件
 	if err := parse.ConvertConfigToFile("yaml", localFilePath, content); err != nil {
@@ -664,7 +762,7 @@ func (r NeInfo) neConfOAMWirte(neType, neId string, content any, sync bool) erro
 	// 同步到网元端
 	if sync {
 		// 网元主机的SSH客户端
-		sshClient, err := r.NeRunSSHClient(neType, neId)
+		sshClient, err := r.NeRunSSHClient(neInfo.CoreUID, neInfo.NeUID)
 		if err != nil {
 			return err
 		}
@@ -692,7 +790,7 @@ func (r NeInfo) neConfOAMWirte(neType, neId string, content any, sync bool) erro
 
 // NeConfOAMWirteSync 网元OAM配置文件生成并同步
 func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any, sync bool) error {
-	oamData, err := r.neConfOAMRead(neInfo.NeType, neInfo.NeId, false)
+	oamData, err := r.neConfOAMRead(neInfo, false)
 	if oamData == nil || err != nil {
 		return fmt.Errorf("error read OAM file info")
 	}
@@ -703,13 +801,13 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any,
 		httpManageCfg = neConfOAMData["httpManageCfg"].(map[string]any)
 	}
 	httpManageCfg["port"] = neInfo.Port
-	if strings.Contains(neInfo.IP, ":") {
+	if strings.Contains(neInfo.IPAddr, ":") {
 		httpManageCfg["ipType"] = "ipv6"
-		httpManageCfg["ipv6"] = neInfo.IP
+		httpManageCfg["ipv6"] = neInfo.IPAddr
 	}
-	if strings.Contains(neInfo.IP, ".") {
+	if strings.Contains(neInfo.IPAddr, ".") {
 		httpManageCfg["ipType"] = "ipv4"
-		httpManageCfg["ipv4"] = neInfo.IP
+		httpManageCfg["ipv4"] = neInfo.IPAddr
 	}
 	delete(httpManageCfg, "iptype")
 	delete(oamData, "httpmanagecfg")
@@ -723,8 +821,8 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any,
 	}
 	delete(oamConfig, "neconfig")
 	oamConfig["neConfig"] = map[string]string{
-		"neId":       neInfo.NeId,
-		"rmUid":      neInfo.RmUID,
+		"coreId":     neInfo.CoreUID,
+		"neUid":      neInfo.NeUID,
 		"neName":     neInfo.NeName,
 		"dn":         neInfo.Dn,
 		"vendorName": neInfo.VendorName,
@@ -770,13 +868,13 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any,
 		neConfOAMData := r.neConfOAMData()
 		snmpConfig = neConfOAMData["snmpConfig"].(map[string]any)
 	}
-	if strings.Contains(neInfo.IP, ":") {
+	if strings.Contains(neInfo.IPAddr, ":") {
 		snmpConfig["ipType"] = "ipv6"
-		snmpConfig["ipv6"] = neInfo.IP
+		snmpConfig["ipv6"] = neInfo.IPAddr
 	}
-	if strings.Contains(neInfo.IP, ".") {
+	if strings.Contains(neInfo.IPAddr, ".") {
 		snmpConfig["ipType"] = "ipv4"
-		snmpConfig["ipv4"] = neInfo.IP
+		snmpConfig["ipv4"] = neInfo.IPAddr
 	}
 	delete(snmpConfig, "iptype")
 	if snmpEnable, ok := content["snmpEnable"]; ok && snmpEnable != nil {
@@ -808,7 +906,7 @@ func (r NeInfo) NeConfOAMWirteSync(neInfo model.NeInfo, content map[string]any,
 	delete(oamData, "kpiconfig")
 	oamData["kpiConfig"] = kpiConfig
 
-	if err := r.neConfOAMWirte(neInfo.NeType, neInfo.NeId, oamData, sync); err != nil {
+	if err := r.neConfOAMWirte(neInfo, oamData, sync); err != nil {
 		return fmt.Errorf("error wirte OAM file info")
 	}
 	return nil
@@ -858,7 +956,7 @@ func (r *NeInfo) NeConfPara5GWirte(content map[string]any, syncNE []string) erro
 			// 网元主机的SSH客户端
 			sshClient, err := r.NeRunSSHClient(ti[0], ti[1])
 			if err != nil {
-				errMsg = append(errMsg, fmt.Sprintf("%s : %s", ti, err.Error()))
+				errMsg = append(errMsg, fmt.Sprintf("core_ne %s : %s", ti, err.Error()))
 				continue
 			}
 			defer sshClient.Close()

src/modules/ne/service/ne_license.go

@@ -71,23 +71,11 @@ func (r *NeLicense) DeleteByIds(ids []int64) (int64, error) {
 	return 0, fmt.Errorf("delete fail")
 }
 
-// FindByTypeAndID 通过网元类型和网元ID查询
-func (r *NeLicense) FindByTypeAndID(neType, neId string) model.NeLicense {
+// FindByCoreUidAndNeUid 通过核心网和网元唯一标识查询
+func (r *NeLicense) FindByCoreUidAndNeUid(coreUid, neUid string) model.NeLicense {
 	neLicenses := r.neLicenseRepository.Select(model.NeLicense{
-		NeType: neType,
-		NeId:   neId,
-	})
-	if len(neLicenses) > 0 {
-		return neLicenses[0]
-	}
-	return model.NeLicense{}
-}
-
-// FindByNeTypeAndNeID 通过ne_type和ne_id查询信息
-func (r *NeLicense) FindByNeTypeAndNeID(neType, neId string) model.NeLicense {
-	neLicenses := r.neLicenseRepository.Select(model.NeLicense{
-		NeType: neType,
-		NeId:   neId,
+		CoreUID: coreUid,
+		NeUID:   neUid,
 	})
 	if len(neLicenses) > 0 {
 		return neLicenses[0]
@@ -104,12 +92,12 @@ func (r *NeLicense) ReadLicenseInfo(neLicense model.NeLicense) (string, string)
 	if runtime.GOOS == "windows" {
 		omcPath = fmt.Sprintf("C:%s", omcPath)
 	}
-	omcPath = fmt.Sprintf("%s/%s/%s", omcPath, neTypeLower, neLicense.NeId)
+	omcPath = fmt.Sprintf("%s/%s/%s", omcPath, neTypeLower, neLicense.NeUID)
 	// 网元端授权文件路径
 	nePath := fmt.Sprintf("/usr/local/etc/%s/license", neTypeLower)
 
 	// 网元主机的SSH客户端
-	sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.NeType, neLicense.NeId)
+	sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.CoreUID, neLicense.NeUID)
 	if err != nil {
 		return "", ""
 	}
@@ -154,7 +142,7 @@ func (r *NeLicense) UploadLicense(neLicense model.NeLicense) error {
 	}
 
 	// 网元主机的SSH客户端
-	sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.NeType, neLicense.NeId)
+	sshClient, err := NewNeInfo.NeRunSSHClient(neLicense.CoreUID, neLicense.NeUID)
 	if err != nil {
 		return err
 	}

src/modules/ne/service/ne_software.go

@@ -87,7 +87,7 @@ func (r NeSoftware) Update(neSoftware model.NeSoftware) int64 {
 }
 
 // DeleteByIds 批量删除信息
-func (r NeSoftware) DeleteByIds(ids []int64) (int64, error) {
+func (r NeSoftware) DeleteByIds(ids []int64, delFile bool) (int64, error) {
 	// 检查是否存在
 	rows := r.neSoftwareRepository.SelectByIds(ids)
 	if len(rows) <= 0 {
@@ -95,14 +95,16 @@ func (r NeSoftware) DeleteByIds(ids []int64) (int64, error) {
 	}
 
 	if len(rows) == len(ids) {
-		// 遍历软件包列表进行文件删除
-		for _, row := range rows {
-			// 检查文件是否存在
-			filePath := file.ParseUploadFileAbsPath(row.Path)
-			if _, err := os.Stat(filePath); err != nil {
-				continue
+		if delFile {
+			// 遍历软件包列表进行文件删除
+			for _, row := range rows {
+				// 检查文件是否存在
+				filePath := file.ParseUploadFileAbsPath(row.Path)
+				if _, err := os.Stat(filePath); err != nil {
+					continue
+				}
+				os.Remove(filePath)
 			}
-			os.Remove(filePath)
 		}
 		rows := r.neSoftwareRepository.DeleteByIds(ids)
 		return rows, nil

src/modules/ne/service/ne_version.go

@@ -55,8 +55,8 @@ func (r NeVersion) checkNeVersion(arr *[]model.NeVersion) {
 	for i := range *arr {
 		item := (*arr)[i]
 		// 查询网元获取IP
-		neInfo := r.neInfoService.FindByNeTypeAndNeID(item.NeType, item.NeId)
-		if neInfo.NeId != item.NeId || neInfo.IP == "" {
+		neInfo := r.neInfoService.FindByCoreUidAndNeUid(item.CoreUID, item.NeUID)
+		if neInfo.CoreUID != item.CoreUID || neInfo.NeUID != item.NeUID {
 			continue
 		}
 		result, err := neFetchlink.NeState(neInfo)
@@ -72,9 +72,8 @@ func (r NeVersion) checkNeVersion(arr *[]model.NeVersion) {
 			item.Path = "-"
 			item.Version = ver
 		}
-		if item.NeType != neInfo.NeType || item.NeId != neInfo.NeId {
+		if item.NeType != neInfo.NeType {
 			item.NeType = neInfo.NeType
-			item.NeId = neInfo.NeId
 		}
 		r.Update(item)
 		(*arr)[i] = item
@@ -119,11 +118,11 @@ func (r NeVersion) DeleteByIds(ids []int64) (int64, error) {
 	return 0, fmt.Errorf("delete fail")
 }
 
-// FindByNeTypeAndNeID 通过网元类型和网元ID查询
-func (r NeVersion) FindByNeTypeAndNeID(neType, neId string) model.NeVersion {
+// FindByCoreUidAndNeUid 通过核心网和网元唯一标识查询
+func (r NeVersion) FindByCoreUidAndNeUid(coreUid, neUid string) model.NeVersion {
 	neVersions := r.neVersionRepository.Select(model.NeVersion{
-		NeType: neType,
-		NeId:   neId,
+		CoreUID: coreUid,
+		NeUID:   neUid,
 	})
 	if len(neVersions) > 0 {
 		return neVersions[0]
@@ -136,7 +135,7 @@ func (r NeVersion) FindByNeTypeAndNeID(neType, neId string) model.NeVersion {
 // action 安装行为：install upgrade rollback
 func (r NeVersion) Operate(action string, neVersion model.NeVersion, preinput map[string]string) (string, error) {
 	// 网元主机的SSH客户端
-	sshClient, err := r.neInfoService.NeRunSSHClient(neVersion.NeType, neVersion.NeId)
+	sshClient, err := r.neInfoService.NeRunSSHClient(neVersion.CoreUID, neVersion.NeUID)
 	if err != nil {
 		return "", err
 	}
@@ -162,7 +161,7 @@ func (r NeVersion) Operate(action string, neVersion model.NeVersion, preinput ma
 		if para5GMap == nil || err != nil {
 			return "", fmt.Errorf("error read para5G file info")
 		}
-		if err := r.neInfoService.NeConfPara5GWirte(para5GMap, []string{fmt.Sprintf("%s@%s", neVersion.NeType, neVersion.NeId)}); err != nil {
+		if err := r.neInfoService.NeConfPara5GWirte(para5GMap, []string{fmt.Sprintf("%s@%s", neVersion.CoreUID, neVersion.NeUID)}); err != nil {
 			return "", fmt.Errorf("error wirte para5G file info")
 		}
 	}
@@ -694,8 +693,8 @@ func (r NeVersion) operateRun(sshClient *ssh.ConnSSH, preinput map[string]string
 func (r NeVersion) operateDome(action string, neVersion model.NeVersion) error {
 	if action == "install" {
 		// 网元信息
-		neInfo := r.neInfoService.FindByNeTypeAndNeID(neVersion.NeType, neVersion.NeId)
-		if neInfo.NeId != neVersion.NeId {
+		neInfo := r.neInfoService.FindByCoreUidAndNeUid(neVersion.CoreUID, neVersion.NeUID)
+		if neInfo.CoreUID != neVersion.CoreUID || neInfo.NeUID != neVersion.NeUID {
 			return fmt.Errorf("error found neinfo")
 		}
 
@@ -717,29 +716,29 @@ func (r NeVersion) operateDome(action string, neVersion model.NeVersion) error {
 			// IMS 配置
 			imsNEs := r.neInfoService.Find(model.NeInfo{NeType: "IMS"}, false, false)
 			for _, v := range imsNEs {
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscIPCMD)
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscHostCMD)
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smsHost)
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, "sudo sed -i '/^#!define WITH_SMS/ s/^/#/' /usr/local/etc/ims/vars.cfg")
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, "ims-stop || true && ims-start")
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscIPCMD)
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscHostCMD)
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smsHost)
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, "sudo sed -i '/^#!define WITH_SMS/ s/^/#/' /usr/local/etc/ims/vars.cfg")
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, "ims-stop || true && ims-start")
 			}
 			// UDM 配置
 			smscASName := fmt.Sprintf("sudo sed -i \"/- name: 'sms_as'/{n;s|serverName: .*|serverName: 'sip:%s:5060'|}\" /usr/local/etc/udm/as.yaml", para5GData["SMSC_IP"])
 			smscASAddress := fmt.Sprintf("sudo sed -i \"/- name: 'sms_as'/{n;n;n;s|diameterAddress: .*|diameterAddress: 'smsc.ims.%s.3gppnetwork.org'|}\" /usr/local/etc/udm/as.yaml", mnc_mcc)
 			udmNEs := r.neInfoService.Find(model.NeInfo{NeType: "UDM"}, false, false)
 			for _, v := range udmNEs {
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscIPCMD)
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscHostCMD)
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscASName)
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, smscASAddress)
-				r.neInfoService.NeRunSSHCmd(v.NeType, v.NeId, "sudo service udm restart")
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscIPCMD)
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscHostCMD)
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscASName)
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, smscASAddress)
+				r.neInfoService.NeRunSSHCmd(v.CoreUID, v.NeUID, "sudo service udm restart")
 			}
 		}
 	}
 
 	// 更新Version
-	verInfo := r.FindByNeTypeAndNeID(neVersion.NeType, neVersion.NeId)
-	if verInfo.NeId == neVersion.NeId {
+	verInfo := r.FindByCoreUidAndNeUid(neVersion.CoreUID, neVersion.NeUID)
+	if verInfo.CoreUID == neVersion.CoreUID && verInfo.NeUID == neVersion.NeUID {
 		curName := verInfo.Name
 		curVersion := verInfo.Version
 		curPath := verInfo.Path

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
 		}