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

src/modules/network_data/controller/amf.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"
 	sysService "be.ems/src/modules/system/service"
 	"github.com/gin-gonic/gin"
@@ -57,7 +58,7 @@ func (s *AMFController) UEList(c *gin.Context) {
 	// for multi-tenancy
 	querys.UserName = ctx.LoginUserToUserName(c)
 	// 查询数据
-	data := s.ueEventService.SelectPage(querys)
+	data := s.ueEventService.SelectPageMT(querys)
 	c.JSON(200, result.Ok(data))
 }
 
@@ -105,7 +106,7 @@ func (s *AMFController) UEExport(c *gin.Context) {
 	if querys.PageSize > 10000 {
 		querys.PageSize = 10000
 	}
-	data := s.ueEventService.SelectPage(querys)
+	data := s.ueEventService.SelectPageMT(querys)
 	if parse.Number(data["total"]) == 0 {
 		// 导出数据记录为空
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
@@ -215,3 +216,36 @@ func (s *AMFController) UEExport(c *gin.Context) {
 
 	c.FileAttachment(saveFilePath, fileName)
 }
+
+// 接入基站信息列表
+//
+// GET /nb/list
+func (s *AMFController) NbInfoList(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var query struct {
+		NeId string `form:"neId" binding:"required"`
+		NbId string `form:"nbId"`
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 查询网元信息
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("AMF", query.NeId)
+	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+
+	// 网元直连
+	data, err := neFetchlink.AMFNbInfoList(neInfo, map[string]string{
+		"nbId": query.NbId,
+	})
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	c.JSON(200, result.OkData(data))
+}