OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

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

Browse Source
This commit is contained in:
TsMask
2024-12-24 17:24:24 +08:00
parent 73c40d95d6 30bd6c85a2
commit 10d198cb87
119 changed files with 3113 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/modules/network_data/controller/smf.go
View File

@@ -59,7 +59,7 @@ func (s *SMFController) CDRList(c *gin.Context) {
querys.RmUID = neInfo.RmUID
// 查询数据
data := s.cdrEventService.SelectPage(querys)
data := s.cdrEventService.SelectPageMT(querys)
c.JSON(200, result.Ok(data))
}
@@ -114,7 +114,7 @@ func (s *SMFController) 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")))
@@ -326,9 +326,39 @@ func (s *SMFController) CDRExport(c *gin.Context) {
c.FileAttachment(saveFilePath, fileName)
}
// 在线订阅用户数量
//
// GET /sub/num
func (s *SMFController) SubUserNum(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("SMF", query.NeId)
if neInfo.NeId != query.NeId || neInfo.IP == "" {
c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
return
}
// 网元直连
num, err := neFetchlink.SMFSubNum(neInfo)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
}
c.JSON(200, result.OkData(num))
}
// 在线订阅用户列表信息
//
// GET /subscribers
// GET /sub/list
func (s *SMFController) SubUserList(c *gin.Context) {
language := ctx.AcceptLanguage(c)
var query struct {
@@ -343,7 +373,7 @@ func (s *SMFController) SubUserList(c *gin.Context) {
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")))