Merge remote-tracking branch 'origin/main' into multi-tenant

2024-09-20 20:23:39 +08:00
parent dab8b3b926 4c304d9f9a
commit 89d9efb334
142 changed files with 7687 additions and 2096 deletions
--- a/src/modules/network_data/controller/smf.go
+++ b/src/modules/network_data/controller/smf.go
@@ -15,6 +15,7 @@ import (
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
+	neFetchlink "be.ems/src/modules/network_element/fetch_link"
 	neService "be.ems/src/modules/network_element/service"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
@@ -22,8 +23,9 @@ import (

 // 实例化控制层 SMFController 结构体
 var NewSMFController = &SMFController{
-	neInfoService:   neService.NewNeInfoImpl,
-	cdrEventService: neDataService.NewCDREventSMFImpl,
+	neInfoService:      neService.NewNeInfoImpl,
+	cdrEventService:    neDataService.NewCDREventSMFImpl,
+	udmUserInfoService: *neDataService.NewUDMUserInfo,
 }

 // 网元SMF
@@ -34,6 +36,8 @@ type SMFController struct {
 	neInfoService neService.INeInfo
 	// CDR会话事件服务
 	cdrEventService neDataService.ICDREventSMF
+	// UDM用户信息服务
+	udmUserInfoService neDataService.UDMUserInfo
 }

 // CDR会话列表
@@ -263,3 +267,63 @@ PDU IPv6 Addres Swith Prefix: %s`, User_Identifier, SSC_Mode, RAT_Type, DNN_ID,

 	c.FileAttachment(saveFilePath, fileName)
 }
+
+// 在线订阅用户列表信息
+//
+// GET /subscribers
+func (s *SMFController) SubUserList(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var query struct {
+		NeId    string `form:"neId" binding:"required"`
+		IMSI    string `form:"imsi"`
+		MSISDN  string `form:"msisdn"`
+		Upstate string `form:"upstate"`
+		PageNum string `form:"pageNum"`
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 查询网元信息 rmUID
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("SMF", query.NeId)
+	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+
+	// 网元直连
+	data, err := neFetchlink.SMFSubInfo(neInfo, map[string]string{
+		"imsi":    query.IMSI,
+		"msisdn":  query.MSISDN,
+		"upstate": query.Upstate,
+		"pageNum": query.PageNum,
+	})
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	// 对数据进行处理，去掉前缀，并加入imsi拓展信息
+	rows := data["rows"].([]any)
+	arr := &rows
+	for i := range *arr {
+		item := (*arr)[i].(map[string]any)
+		if v, ok := item["imsi"]; ok && v != nil {
+			imsiStr := v.(string)
+			imsiStr = strings.TrimPrefix(imsiStr, "imsi-")
+			item["imsi"] = imsiStr
+			// 查UDM拓展信息
+			info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "")
+			item["remark"] = info.Remark
+		}
+		if v, ok := item["msisdn"]; ok && v != nil {
+			item["msisdn"] = strings.TrimPrefix(v.(string), "msisdn-")
+		}
+	}
+
+	c.JSON(200, result.Ok(map[string]any{
+		"total": data["total"],
+		"rows":  data["rows"],
+	}))
+}
--- a/src/modules/network_data/controller/udm_auth.go
+++ b/src/modules/network_data/controller/udm_auth.go
@@ -8,10 +8,10 @@ import (

 	"be.ems/src/framework/constants/uploadsubpath"
 	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/telnet"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/telnet"
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
@@ -23,7 +23,7 @@ import (

 // 实例化控制层 UDMAuthController 结构体
 var NewUDMAuth = &UDMAuthController{
-	udmAuthService: neDataService.NewUDMAuthImpl,
+	udmAuthService: neDataService.NewUDMAuthUser,
 	neInfoService:  neService.NewNeInfoImpl,
 }

@@ -32,7 +32,7 @@ var NewUDMAuth = &UDMAuthController{
 // PATH /udm/auth
 type UDMAuthController struct {
 	// UDM鉴权信息服务
-	udmAuthService neDataService.IUDMAuth
+	udmAuthService *neDataService.UDMAuthUser
 	// 网元信息服务
 	neInfoService neService.INeInfo
 }
@@ -103,26 +103,9 @@ func (s *UDMAuthController) Info(c *gin.Context) {
 	}

 	neId = ""
-	u := model.UDMAuth{
-		IMSI:      imsi,
-		Amf:       data["amf"],
-		Status:    "1",
-		Ki:        data["ki"],
-		AlgoIndex: data["algo"],
-		Opc:       data["opc"],
-		NeId:      neId,
-	}
-
-	// 查询imsi存在赋予id用于更新
-	list := s.udmAuthService.SelectList(u)
-	if len(list) > 0 {
-		item := list[0]
-		if item.ID != "" {
-			u.ID = item.ID
-		}
-	}
-	go s.udmAuthService.Insert(neId, u)
-
+	// 解析返回的数据
+	u := s.udmAuthService.ParseInfo(imsi, neId, data)
+	s.udmAuthService.Insert(neId, u)
 	c.JSON(200, result.OkData(u))
 }

@@ -137,7 +120,7 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 		return
 	}

-	var body model.UDMAuth
+	var body model.UDMAuthUser
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
 	if err != nil || body.IMSI == "" {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -169,7 +152,7 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 	// 命令ok时
 	if strings.Contains(data, "ok") {
 		neId = ""
-		go s.udmAuthService.Insert(neId, body)
+		s.udmAuthService.Insert(neId, body)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -186,7 +169,7 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 		return
 	}

-	var body model.UDMAuth
+	var body model.UDMAuthUser
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
 	if err != nil || body.IMSI == "" {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -234,7 +217,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 		return
 	}

-	var body model.UDMAuth
+	var body model.UDMAuthUser
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
 	if err != nil || body.IMSI == "" {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -279,7 +262,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 	// 命令ok时
 	if strings.Contains(data, "ok") {
 		neId = ""
-		go s.udmAuthService.Insert(neId, body)
+		s.udmAuthService.Insert(neId, body)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -330,7 +313,7 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
 		// 命令ok时
 		if strings.Contains(data, "ok") {
 			neId = ""
-			go s.udmAuthService.Delete(neId, imsi)
+			s.udmAuthService.Delete(imsi, neId)
 		}
 		resultData[imsi] = data
 	}
@@ -402,7 +385,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 	}

 	neId := ""
-	list := s.udmAuthService.SelectList(model.UDMAuth{NeId: neId})
+	list := s.udmAuthService.SelectList(model.UDMAuthUser{NeId: neId})
 	// 文件名
 	fileName := fmt.Sprintf("udm_auth_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), body.Type)
 	filePath := fmt.Sprintf("%s/%s", file.ParseUploadFileDir(uploadsubpath.EXPORT), fileName)
--- a/src/modules/network_data/controller/udm_sub.go
+++ b/src/modules/network_data/controller/udm_sub.go
@@ -3,16 +3,15 @@ package controller
 import (
 	"fmt"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"time"

 	"be.ems/src/framework/constants/uploadsubpath"
 	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/telnet"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/telnet"
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
@@ -23,7 +22,7 @@ import (

 // 实例化控制层 UDMSubController 结构体
 var NewUDMSub = &UDMSubController{
-	udmSubService: neDataService.NewUDMSubImpl,
+	udmSubService: neDataService.NewUDMSub,
 	neInfoService: neService.NewNeInfoImpl,
 }

@@ -32,7 +31,7 @@ var NewUDMSub = &UDMSubController{
 // PATH /udm/sub
 type UDMSubController struct {
 	// UDM签约信息服务
-	udmSubService neDataService.IUDMSub
+	udmSubService *neDataService.UDMSubUser
 	// 网元信息服务
 	neInfoService neService.INeInfo
 }
@@ -103,53 +102,10 @@ func (s *UDMSubController) Info(c *gin.Context) {
 		return
 	}

-	// 解析返回的数据
-	cnType, _ := strconv.ParseInt(data["CNType"][:4], 0, 64)
-	rat, _ := strconv.ParseInt(data["RAT"][:4], 0, 64)
-	msisdn := data["MSISDN"]
-	imsMsisdnLen := strings.Index(msisdn, ",")
-	if imsMsisdnLen != -1 {
-		msisdn = msisdn[:imsMsisdnLen]
-	}
 	neId = ""
-	u := model.UDMSub{
-		IMSI:   imsi,
-		Msisdn: msisdn,
-		Ambr:   data["AMBR"],
-		Arfb:   data["AreaForbidden"],
-		Cn:     fmt.Sprint(cnType),
-		SmData: data["SM-Data(snssai+dnn[1..n])"],
-		Sar:    data["ServiceAreaRestriction"],
-		Nssai:  data["NSSAI"],
-		SmfSel: data["Smf-Selection"],
-		Rat:    fmt.Sprint(rat),
-		NeId:   neId,
-	}
-	// 1,64,24,65,def_eps,1,2,010200000000,-
-	if v, ok := data["EPS-Data"]; ok {
-		u.EpsDat = v
-		arr := strings.Split(v, ",")
-		u.EpsFlag = arr[0]
-		u.EpsOdb = arr[1]
-		u.HplmnOdb = arr[2]
-		u.Ard = arr[3]
-		u.Epstpl = arr[4]
-		u.ContextId = arr[5]
-		u.ApnContext = arr[7]
-		// [6] 是不要的，导入和导出不用
-		u.StaticIp = arr[8]
-	}
-
-	// 查询imsi存在赋予id用于更新
-	list := s.udmSubService.SelectList(u)
-	if len(list) > 0 {
-		item := list[0]
-		if item.ID != "" {
-			u.ID = item.ID
-		}
-	}
-	go s.udmSubService.Insert(neId, u)
-
+	// 解析返回的数据
+	u := s.udmSubService.ParseInfo(imsi, neId, data)
+	s.udmSubService.Insert(neId, u)
 	c.JSON(200, result.OkData(u))
 }

@@ -164,9 +120,9 @@ func (s *UDMSubController) Add(c *gin.Context) {
 		return
 	}

-	var body model.UDMSub
+	var body model.UDMSubUser
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
-	if err != nil || body.IMSI == "" {
+	if err != nil || len(body.IMSI) < 15 {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -186,8 +142,8 @@ func (s *UDMSubController) Add(c *gin.Context) {
 	defer telnetClient.Close()

 	// 发送MML
-	cmd := fmt.Sprintf("add udmuser:imsi=%s,msisdn=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s",
-		body.IMSI, body.Msisdn, body.Ambr, body.Nssai, body.Arfb, body.Sar, body.Rat, body.Cn, body.SmfSel, body.SmData, body.EpsFlag, body.EpsOdb, body.HplmnOdb, body.Ard, body.Epstpl, body.ContextId, body.ApnContext)
+	cmd := fmt.Sprintf("add udmuser:imsi=%s,msisdn=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s,cag=%s",
+		body.IMSI, body.MSISDN, body.Ambr, body.Nssai, body.Arfb, body.Sar, body.Rat, body.Cn, body.SmfSel, body.SmData, body.EpsFlag, body.EpsOdb, body.HplmnOdb, body.Ard, body.Epstpl, body.ContextId, body.ApnContext, body.Cag)
 	// static_ip指给4G UE分配的静态IP，没有可不带此字段名，批量添加IP会自动递增
 	if body.StaticIp != "" {
 		cmd += fmt.Sprintf(",static_ip=%s", body.StaticIp)
@@ -201,7 +157,8 @@ func (s *UDMSubController) Add(c *gin.Context) {
 	// 命令ok时
 	if strings.Contains(data, "ok") {
 		neId = ""
-		go s.udmSubService.Insert(neId, body)
+		body.NeId = neId
+		s.udmSubService.Insert(neId, body)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -218,9 +175,9 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 		return
 	}

-	var body model.UDMSub
+	var body model.UDMSubUser
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
-	if err != nil || body.IMSI == "" {
+	if err != nil || len(body.IMSI) < 15 {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -240,8 +197,8 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 	defer telnetClient.Close()

 	// 发送MML
-	cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s",
-		body.IMSI, body.Msisdn, num, body.Ambr, body.Nssai, body.Arfb, body.Sar, body.Rat, body.Cn, body.SmfSel, body.SmData, body.EpsFlag, body.EpsOdb, body.HplmnOdb, body.Ard, body.Epstpl, body.ContextId, body.ApnContext)
+	cmd := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s,cag=%s",
+		body.IMSI, body.MSISDN, num, body.Ambr, body.Nssai, body.Arfb, body.Sar, body.Rat, body.Cn, body.SmfSel, body.SmData, body.EpsFlag, body.EpsOdb, body.HplmnOdb, body.Ard, body.Epstpl, body.ContextId, body.ApnContext, body.Cag)
 	// static_ip指给4G UE分配的静态IP，没有可不带此字段名，批量添加IP会自动递增
 	if body.StaticIp != "" {
 		cmd += fmt.Sprintf(",static_ip=%s", body.StaticIp)
@@ -255,7 +212,7 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 	// 命令ok时
 	if strings.Contains(data, "ok") {
 		neId = ""
-		go s.udmSubService.LoadData(neId, body.IMSI, num)
+		go s.udmSubService.LoadData(neId, body.IMSI, num, body.Remark)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -271,9 +228,9 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 		return
 	}

-	var body model.UDMSub
+	var body model.UDMSubUser
 	err := c.ShouldBindBodyWith(&body, binding.JSON)
-	if err != nil || body.IMSI == "" {
+	if err != nil || len(body.IMSI) < 15 {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -295,8 +252,8 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 	// 发送MML
 	cmd := fmt.Sprintf("mod udmuser:imsi=%s", body.IMSI)
 	// 修改的参数名称
-	if body.Msisdn != "" {
-		cmd += fmt.Sprintf(",msisdn=%s", body.Msisdn)
+	if body.MSISDN != "" {
+		cmd += fmt.Sprintf(",msisdn=%s", body.MSISDN)
 	}
 	if body.Ambr != "" {
 		cmd += fmt.Sprintf(",ambr=%s", body.Ambr)
@@ -346,6 +303,9 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 	if body.ApnContext != "" {
 		cmd += fmt.Sprintf(",apn_context=%s", body.ApnContext)
 	}
+	if body.Cag != "" {
+		cmd += fmt.Sprintf(",cag=%s", body.Cag)
+	}
 	if body.StaticIp != "" {
 		cmd += fmt.Sprintf(",static_ip=%s", body.StaticIp)
 	}
@@ -358,7 +318,8 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 	// 命令ok时
 	if strings.Contains(data, "ok") {
 		neId = ""
-		go s.udmSubService.Insert(neId, body)
+		body.NeId = neId
+		s.udmSubService.Insert(neId, body)
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -370,7 +331,7 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
-	if neId == "" || imsi == "" {
+	if neId == "" || len(imsi) < 15 {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -409,7 +370,7 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 		// 命令ok时
 		if strings.Contains(data, "ok") {
 			neId = ""
-			go s.udmSubService.Delete(neId, imsi)
+			s.udmSubService.Delete(neId, imsi)
 		}
 		resultData[imsi] = data
 	}
@@ -425,7 +386,7 @@ func (s *UDMSubController) Removes(c *gin.Context) {
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
 	num := c.Param("num")
-	if neId == "" || imsi == "" || num == "" {
+	if neId == "" || len(imsi) < 15 || num == "" {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -455,7 +416,8 @@ func (s *UDMSubController) Removes(c *gin.Context) {
 	// 命令ok时
 	if strings.Contains(data, "ok") {
 		neId = ""
-		go s.udmSubService.LoadData(neId, imsi, num)
+		go s.udmSubService.LoadData(neId, imsi, num, "-(Deleted)-")
+
 	}
 	c.JSON(200, result.OkData(data))
 }
@@ -481,7 +443,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 	}

 	neId := ""
-	list := s.udmSubService.SelectList(model.UDMSub{NeId: neId})
+	list := s.udmSubService.SelectList(model.UDMSubUser{NeId: neId})
 	// 文件名
 	fileName := fmt.Sprintf("udm_sub_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), body.Type)
 	filePath := fmt.Sprintf("%s/%s", file.ParseUploadFileDir(uploadsubpath.EXPORT), fileName)
@@ -492,7 +454,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 		data = append(data, []string{"imsi", "msisdn", "ambr", "nssai", "arfb", "sar", "rat", "cn", "smf_sel", "sm_dat", "eps_dat"})
 		for _, v := range list {
 			epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
-			data = append(data, []string{v.IMSI, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
+			data = append(data, []string{v.IMSI, v.MSISDN, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
 		}
 		// 输出到文件
 		err = file.WriterFileCSV(data, filePath)
@@ -507,7 +469,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 		data := [][]string{}
 		for _, v := range list {
 			epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
-			data = append(data, []string{v.IMSI, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
+			data = append(data, []string{v.IMSI, v.MSISDN, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
 		}
 		// 输出到文件
 		err = file.WriterFileTXT(data, ",", filePath)
--- a/src/modules/network_data/controller/upf.go
+++ b/src/modules/network_data/controller/upf.go
@@ -32,9 +32,8 @@ type UPFController struct {
 func (s *UPFController) TotalFlow(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var querys struct {
-		NeType string `json:"neType" form:"neType" binding:"required"`
-		NeID   string `form:"neId" binding:"required"`
-		Day    int    `form:"day" binding:"required"`
+		NeID string `form:"neId" binding:"required"`
+		Day  int    `form:"day" binding:"required"`
 	}
 	if err := c.ShouldBindQuery(&querys); querys.Day < 0 || err != nil {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
@@ -42,7 +41,7 @@ func (s *UPFController) TotalFlow(c *gin.Context) {
 	}

 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UPF", querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return