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

src/modules/network_data/controller/ims.go

@@ -16,6 +16,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"
@@ -58,7 +59,7 @@ func (s *IMSController) CDRList(c *gin.Context) {
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	data := s.cdrEventService.SelectPage(querys)
+	data := s.cdrEventService.SelectPageMT(querys)
 	c.JSON(200, result.Ok(data))
 }
 
@@ -113,7 +114,7 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	data := s.cdrEventService.SelectPage(querys)
+	data := s.cdrEventService.SelectPageMT(querys)
 	if parse.Number(data["total"]) == 0 {
 		// 导出数据记录为空
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
@@ -155,16 +156,6 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 		if v, ok := cdrJSON["recordType"]; ok && v != nil {
 			recordType = v.(string)
 		}
-		// 被叫
-		called := ""
-		if v, ok := cdrJSON["calledParty"]; ok && v != nil {
-			called = v.(string)
-		}
-		// 主叫
-		caller := ""
-		if v, ok := cdrJSON["callerParty"]; ok && v != nil {
-			caller = v.(string)
-		}
 		// 呼叫类型
 		callType := "sms"
 		callTypeLable := "SMS"
@@ -177,6 +168,16 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 				}
 			}
 		}
+		// 被叫
+		called := ""
+		if v, ok := cdrJSON["calledParty"]; ok && v != nil {
+			called = v.(string)
+		}
+		// 主叫
+		caller := ""
+		if v, ok := cdrJSON["callerParty"]; ok && v != nil {
+			caller = v.(string)
+		}
 		// 时长
 		duration := "-"
 		if v, ok := cdrJSON["callDuration"]; ok && v != nil && callType != "sms" {
@@ -196,8 +197,11 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 		// 取时间
 		timeStr := ""
 		if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
-			releaseTime := parse.Number(v)
-			timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
+			if releaseTime := parse.Number(v); releaseTime > 0 {
+				timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
+			} else {
+				timeStr = v.(string)
+			}
 		}
 		// for multi-tenant, get tenant name
 		tenantName := row.TenantName
@@ -224,3 +228,68 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 
 	c.FileAttachment(saveFilePath, fileName)
 }
+
+// 在线会话用户数量
+//
+// GET /session/num
+func (s *IMSController) UeSessionNum(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var query struct {
+		NeId string `form:"neId" binding:"required"`
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 查询网元信息
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("IMS", query.NeId)
+	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+
+	// 网元直连
+	num, err := neFetchlink.IMSUeSessionNum(neInfo)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	c.JSON(200, result.OkData(num))
+}
+
+// 在线会话用户列表信息
+//
+// GET /session/list
+func (s *IMSController) UeSessionList(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var query struct {
+		NeId   string `form:"neId" binding:"required"`
+		IMSI   string `form:"imsi"`
+		MSISDN string `form:"msisdn"`
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 查询网元信息
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("IMS", query.NeId)
+	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+
+	// 网元直连
+	data, err := neFetchlink.IMSUeSessionList(neInfo, map[string]string{
+		"imsi":   query.IMSI,
+		"msisdn": query.MSISDN,
+	})
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	c.JSON(200, result.OkData(data))
+}