merge: 合并代码20241228

src/modules/network_data/controller/all_alarm.go

@@ -48,8 +48,8 @@ func (s *AlarmController) List(c *gin.Context) {
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	data := s.alarmService.SelectPage(querys)
-	c.JSON(200, result.Ok(data))
+	rows, total := s.alarmService.SelectPage(querys)
+	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
 }
 
 // 告警删除

src/modules/network_data/controller/amf.go

@@ -1,24 +1,20 @@
 package controller
 
 import (
-	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
 	"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"
-	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 AMFController 结构体
@@ -47,16 +43,16 @@ func (s *AMFController) UEList(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	// neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
-	// if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-	// 	c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-	// 	return
-	// }
-	// querys.RmUID = neInfo.RmUID
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("AMF", querys.NeID)
+	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	data := s.ueEventService.SelectPage(querys)
-	c.JSON(200, result.Ok(data))
+	rows, total := s.ueEventService.SelectPage(querys)
+	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
 }
 
 // UE会话删除
@@ -92,7 +88,7 @@ func (s *AMFController) UEExport(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.UEEventAMFQuery
-	if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
+	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -100,105 +96,24 @@ func (s *AMFController) UEExport(c *gin.Context) {
 	if querys.PageSize > 10000 {
 		querys.PageSize = 10000
 	}
-	data := s.ueEventService.SelectPage(querys)
-	if parse.Number(data["total"]) == 0 {
+	// 查询网元获取IP
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("AMF", querys.NeID)
+	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	querys.RmUID = neInfo.RmUID
+	rows, total := s.ueEventService.SelectPage(querys)
+	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
-	rows := data["rows"].([]model.UEEventAMF)
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("amf_ue_event_export_%d_%d.xlsx", len(rows), time.Now().UnixMilli())
-	// 第一行表头标题
-	headerCells := map[string]string{
-		"A1": "ID",
-		"B1": "IMSI",
-		"C1": "Event Type",
-		"D1": "Result",
-		"E1": "Time",
-	}
-	// 读取字典数据 UE 事件类型
-	dictUEEventType := sysService.NewSysDictData.SelectDictDataByType("ue_event_type")
-	// 读取字典数据 UE 事件认证代码类型
-	dictUEAauthCode := sysService.NewSysDictData.SelectDictDataByType("ue_auth_code")
-	// 读取字典数据 UE 事件CM状态
-	dictUEEventCmState := sysService.NewSysDictData.SelectDictDataByType("ue_event_cm_state")
-	// 从第二行开始的数据
-	dataCells := make([]map[string]any, 0)
-	for i, row := range rows {
-		idx := strconv.Itoa(i + 2)
-		// 解析 JSON 字符串为 map
-		var eventJSON map[string]interface{}
-		err := json.Unmarshal([]byte(row.EventJSONStr), &eventJSON)
-		if err != nil {
-			logger.Warnf("UEExport Error parsing JSON: %s", err.Error())
-			continue
-		}
-
-		// 取IMSI
-		imsi := ""
-		if v, ok := eventJSON["imsi"]; ok && v != nil {
-			imsi = v.(string)
-		}
-		// 取类型
-		eventType := ""
-		for _, v := range dictUEEventType {
-			if row.EventType == v.DictValue {
-				eventType = i18n.TKey(language, v.DictLabel)
-				break
-			}
-		}
-		// 取结果
-		eventResult := ""
-		// 取时间
-		timeStr := ""
-		if row.EventType == "auth-result" {
-			if v, ok := eventJSON["authTime"]; ok && v != nil {
-				timeStr = v.(string)
-			}
-			if v, ok := eventJSON["authCode"]; ok && v != nil {
-				eventResult = v.(string)
-				for _, v := range dictUEAauthCode {
-					if eventResult == v.DictValue {
-						eventResult = i18n.TKey(language, v.DictLabel)
-						break
-					}
-				}
-			}
-		}
-		if row.EventType == "detach" {
-			if v, ok := eventJSON["detachTime"]; ok && v != nil {
-				timeStr = v.(string)
-			}
-			eventResult = "Success"
-		}
-		if row.EventType == "cm-state" {
-			if v, ok := eventJSON["changeTime"]; ok && v != nil {
-				timeStr = v.(string)
-			}
-			if v, ok := eventJSON["status"]; ok && v != nil {
-				eventResult = fmt.Sprint(v)
-				for _, v := range dictUEEventCmState {
-					if eventResult == v.DictValue {
-						eventResult = i18n.TKey(language, v.DictLabel)
-						break
-					}
-				}
-			}
-		}
-
-		dataCells = append(dataCells, map[string]any{
-			"A" + idx: row.ID,
-			"B" + idx: imsi,
-			"C" + idx: eventType,
-			"D" + idx: eventResult,
-			"E" + idx: timeStr,
-		})
-	}
-
 	// 导出数据表格
-	saveFilePath, err := file.WriteSheet(headerCells, dataCells, fileName, "")
+	saveFilePath, err := s.ueEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
 		return
@@ -206,3 +121,66 @@ 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:"id"`
+	}
+	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{
+		"id": query.NbId,
+	})
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	c.JSON(200, result.OkData(data))
+}
+
+// 接入基站状态信息列表
+//
+// GET /nb/list-cfg
+func (s *AMFController) NbStateList(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("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.AMFGnbStateList(neInfo)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	c.JSON(200, result.OkData(data))
+}

src/modules/network_data/controller/ims.go

@@ -1,25 +1,20 @@
 package controller
 
 import (
-	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/utils/date"
-	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
 	"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"
-	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 IMSController 结构体
@@ -56,8 +51,8 @@ func (s *IMSController) CDRList(c *gin.Context) {
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	data := s.cdrEventService.SelectPage(querys)
-	c.JSON(200, result.Ok(data))
+	rows, total := s.cdrEventService.SelectPage(querys)
+	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
 }
 
 // CDR会话删除
@@ -93,7 +88,7 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.CDREventIMSQuery
-	if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
+	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -108,106 +103,17 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	data := s.cdrEventService.SelectPage(querys)
-	if parse.Number(data["total"]) == 0 {
+	rows, total := s.cdrEventService.SelectPage(querys)
+	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
-	rows := data["rows"].([]model.CDREventIMS)
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("ims_cdr_event_export_%d_%d.xlsx", len(rows), time.Now().UnixMilli())
-	// 第一行表头标题
-	headerCells := map[string]string{
-		"A1": "ID",
-		"B1": "Record Behavior",
-		"C1": "Type",
-		"D1": "Caller",
-		"E1": "Called",
-		"F1": "Duration",
-		"G1": "Result",
-		"H1": "Time",
-	}
-	// 读取字典数据 CDR SIP响应代码类别类型
-	dictCDRSipCode := sysService.NewSysDictData.SelectDictDataByType("cdr_sip_code")
-	// 读取字典数据 CDR 呼叫类型
-	dictCDRCallType := sysService.NewSysDictData.SelectDictDataByType("cdr_call_type")
-	// 从第二行开始的数据
-	dataCells := make([]map[string]any, 0)
-	for i, row := range rows {
-		idx := strconv.Itoa(i + 2)
-		// 解析 JSON 字符串为 map
-		var cdrJSON map[string]interface{}
-		err := json.Unmarshal([]byte(row.CDRJSONStr), &cdrJSON)
-		if err != nil {
-			logger.Warnf("CDRExport Error parsing JSON: %s", err.Error())
-			continue
-		}
-		// 记录类型
-		recordType := ""
-		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"
-		if v, ok := cdrJSON["callType"]; ok && v != nil {
-			callType = v.(string)
-			for _, v := range dictCDRCallType {
-				if callType == v.DictValue {
-					callTypeLable = i18n.TKey(language, v.DictLabel)
-					break
-				}
-			}
-		}
-		// 时长
-		duration := "-"
-		if v, ok := cdrJSON["callDuration"]; ok && v != nil && callType != "sms" {
-			duration = fmt.Sprint(parse.Number(v))
-		}
-		// 呼叫结果 非短信都有code作为结果 sms短信都ok
-		callResult := "Success"
-		if v, ok := cdrJSON["cause"]; ok && v != nil && callType != "sms" {
-			cause := fmt.Sprint(v)
-			for _, v := range dictCDRSipCode {
-				if cause == v.DictValue {
-					callResult = i18n.TKey(language, v.DictLabel)
-					break
-				}
-			}
-		}
-		// 取时间
-		timeStr := ""
-		if v, ok := cdrJSON["releaseTime"]; ok && v != nil {
-			releaseTime := parse.Number(v)
-			timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
-		}
-
-		dataCells = append(dataCells, map[string]any{
-			"A" + idx: row.ID,
-			"B" + idx: recordType,
-			"C" + idx: callTypeLable,
-			"D" + idx: caller,
-			"E" + idx: called,
-			"F" + idx: duration,
-			"G" + idx: callResult,
-			"H" + idx: timeStr,
-		})
-	}
-
 	// 导出数据表格
-	saveFilePath, err := file.WriteSheet(headerCells, dataCells, fileName, "")
+	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
 		return
@@ -215,3 +121,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))
+}

src/modules/network_data/controller/mme.go

@@ -1,23 +1,18 @@
 package controller
 
 import (
-	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/utils/date"
-	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
 	"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"
 	"github.com/gin-gonic/gin/binding"
 )
@@ -48,16 +43,16 @@ func (s *MMEController) UEList(c *gin.Context) {
 	}
 
 	// 查询网元获取IP
-	// neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
-	// if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-	// 	c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-	// 	return
-	// }
-	// querys.RmUID = neInfo.RmUID
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("MME", querys.NeID)
+	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	data := s.ueEventService.SelectPage(querys)
-	c.JSON(200, result.Ok(data))
+	rows, total := s.ueEventService.SelectPage(querys)
+	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
 }
 
 // UE会话删除
@@ -101,94 +96,24 @@ func (s *MMEController) UEExport(c *gin.Context) {
 	if querys.PageSize > 10000 {
 		querys.PageSize = 10000
 	}
-	data := s.ueEventService.SelectPage(querys)
-	if parse.Number(data["total"]) == 0 {
+	// 查询网元获取IP
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("MME", querys.NeID)
+	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	querys.RmUID = neInfo.RmUID
+	rows, total := s.ueEventService.SelectPage(querys)
+	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
-	rows := data["rows"].([]model.UEEventMME)
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("mme_ue_event_export_%d_%d.xlsx", len(rows), time.Now().UnixMilli())
-	// 第一行表头标题
-	headerCells := map[string]string{
-		"A1": "ID",
-		"B1": "IMSI",
-		"C1": "Event Type",
-		"D1": "Result",
-		"E1": "Time",
-	}
-	// 读取字典数据 UE 事件类型
-	dictUEEventType := sysService.NewSysDictData.SelectDictDataByType("ue_event_type")
-	// 读取字典数据 UE 事件认证代码类型
-	dictUEAauthCode := sysService.NewSysDictData.SelectDictDataByType("ue_auth_code")
-	// 读取字典数据 UE 事件CM状态
-	dictUEEventCmState := sysService.NewSysDictData.SelectDictDataByType("ue_event_cm_state")
-	// 从第二行开始的数据
-	dataCells := make([]map[string]any, 0)
-	for i, row := range rows {
-		idx := strconv.Itoa(i + 2)
-		// 解析 JSON 字符串为 map
-		var eventJSON map[string]interface{}
-		err := json.Unmarshal([]byte(row.EventJSONStr), &eventJSON)
-		if err != nil {
-			logger.Warnf("UEExport Error parsing JSON: %s", err.Error())
-			continue
-		}
-
-		// 取IMSI
-		imsi := ""
-		if v, ok := eventJSON["imsi"]; ok && v != nil {
-			imsi = v.(string)
-		}
-		// 取类型
-		eventType := row.EventType
-		for _, v := range dictUEEventType {
-			if row.EventType == v.DictValue {
-				eventType = i18n.TKey(language, v.DictLabel)
-				break
-			}
-		}
-		// 取结果
-		eventResult := ""
-		if v, ok := eventJSON["result"]; ok && v != nil {
-			eventResult = v.(string)
-			if row.EventType == "auth-result" {
-				for _, v := range dictUEAauthCode {
-					if eventResult == v.DictValue {
-						eventResult = i18n.TKey(language, v.DictLabel)
-						break
-					}
-				}
-			}
-			if row.EventType == "cm-state" {
-				for _, v := range dictUEEventCmState {
-					if eventResult == v.DictValue {
-						eventResult = i18n.TKey(language, v.DictLabel)
-						break
-					}
-				}
-			}
-		}
-		// 取时间
-		timeStr := ""
-		if v, ok := eventJSON["timestamp"]; ok && v != nil {
-			rowTime := parse.Number(v)
-			timeStr = date.ParseDateToStr(rowTime, date.YYYY_MM_DDTHH_MM_SSZ)
-		}
-
-		dataCells = append(dataCells, map[string]any{
-			"A" + idx: row.ID,
-			"B" + idx: imsi,
-			"C" + idx: eventType,
-			"D" + idx: eventResult,
-			"E" + idx: timeStr,
-		})
-	}
-
 	// 导出数据表格
-	saveFilePath, err := file.WriteSheet(headerCells, dataCells, fileName, "")
+	saveFilePath, err := s.ueEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
 		return
@@ -196,3 +121,36 @@ func (s *MMEController) UEExport(c *gin.Context) {
 
 	c.FileAttachment(saveFilePath, fileName)
 }
+
+// 接入基站信息列表
+//
+// GET /nb/list
+func (s *MMEController) NbInfoList(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var query struct {
+		NeId string `form:"neId" binding:"required"`
+		NbId string `form:"id"`
+	}
+	if err := c.ShouldBindQuery(&query); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 查询网元信息
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("MME", query.NeId)
+	if neInfo.NeId != query.NeId || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+
+	// 网元直连
+	data, err := neFetchlink.MMENbInfoList(neInfo, map[string]string{
+		"id": query.NbId,
+	})
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	c.JSON(200, result.OkData(data))
+}

src/modules/network_data/controller/sgwc.go

@@ -0,0 +1,123 @@
+package controller
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_data/model"
+	neDataService "be.ems/src/modules/network_data/service"
+	neService "be.ems/src/modules/network_element/service"
+	"github.com/gin-gonic/gin"
+)
+
+// 实例化控制层 SGWCController 结构体
+var NewSGWC = &SGWCController{
+	neInfoService:      neService.NewNeInfo,
+	cdrEventService:    neDataService.NewCDREventSGWC,
+	udmUserInfoService: neDataService.NewUDMUserInfo,
+}
+
+// 网元SGWC
+//
+// PATH /SGWC
+type SGWCController struct {
+	neInfoService      *neService.NeInfo           // 网元信息服务
+	cdrEventService    *neDataService.CDREventSGWC // CDR会话事件服务
+	udmUserInfoService *neDataService.UDMUserInfo  // UDM用户信息服务
+}
+
+// CDR会话列表
+//
+// GET /cdr/list
+func (s *SGWCController) CDRList(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var querys model.CDREventSGWCQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 查询网元信息 rmUID
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	querys.RmUID = neInfo.RmUID
+
+	// 查询数据
+	rows, total := s.cdrEventService.SelectPage(querys)
+	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
+}
+
+// CDR会话删除
+//
+// DELETE /cdr/:cdrIds
+func (s *SGWCController) CDRRemove(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	cdrIds := c.Param("cdrIds")
+	if cdrIds == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+	// 处理字符转id数组后去重
+	ids := strings.Split(cdrIds, ",")
+	uniqueIDs := parse.RemoveDuplicates(ids)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, result.Err(nil))
+		return
+	}
+	rows, err := s.cdrEventService.DeleteByIds(uniqueIDs)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, result.OkMsg(msg))
+}
+
+// CDR会话列表导出
+//
+// POST /cdr/export
+func (s *SGWCController) CDRExport(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	// 查询结果，根据查询条件结果，单页最大值限制
+	var querys model.CDREventSGWCQuery
+	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+	// 限制导出数据集
+	if querys.PageSize > 10000 {
+		querys.PageSize = 10000
+	}
+	// 查询网元信息 rmUID
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	querys.RmUID = neInfo.RmUID
+	rows, total := s.cdrEventService.SelectPage(querys)
+	if total == 0 {
+		// 导出数据记录为空
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		return
+	}
+
+	// 导出文件名称
+	fileName := fmt.Sprintf("sgwc_cdr_event_export_%d_%d.xlsx", len(rows), time.Now().UnixMilli())
+	// 导出数据表格
+	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(err.Error()))
+		return
+	}
+
+	c.FileAttachment(saveFilePath, fileName)
+}

src/modules/network_data/controller/smf.go

@@ -1,16 +1,12 @@
 package controller
 
 import (
-	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/network_data/model"
@@ -57,8 +53,8 @@ func (s *SMFController) CDRList(c *gin.Context) {
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	data := s.cdrEventService.SelectPage(querys)
-	c.JSON(200, result.Ok(data))
+	rows, total := s.cdrEventService.SelectPage(querys)
+	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
 }
 
 // CDR会话删除
@@ -109,206 +105,17 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	data := s.cdrEventService.SelectPage(querys)
-	if parse.Number(data["total"]) == 0 {
+	rows, total := s.cdrEventService.SelectPage(querys)
+	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
-	rows := data["rows"].([]model.CDREventSMF)
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("smf_cdr_event_export_%d_%d.xlsx", len(rows), time.Now().UnixMilli())
-	// 第一行表头标题
-	headerCells := map[string]string{
-		"A1": "ID",
-		"B1": "Charging ID",
-		"C1": "NE Name",
-		"D1": "Resource Unique ID",
-		"E1": "Subscriber ID Data",
-		"F1": "Subscriber ID Type",
-		"G1": "Data Volume Uplink",
-		"H1": "Data Volume Downlink",
-		"I1": "Data Total Volume",
-		"J1": "Duration",
-		"K1": "Invocation Time",
-		"L1": "User Identifier",
-		"M1": "SSC Mode",
-		"N1": "DNN ID",
-		"O1": "PDU Type",
-		"P1": "RAT Type",
-		"Q1": "PDU IPv4 Address",
-		"R1": "Network Function IPv4",
-		"S1": "PDU IPv6 Address Swith Prefix",
-		"T1": "Record Network Function ID",
-		"U1": "Record Type",
-		"V1": "Record Opening Time",
-	}
-	// 从第二行开始的数据
-	dataCells := make([]map[string]any, 0)
-
-	for i, row := range rows {
-		idx := strconv.Itoa(i + 2)
-		// 解析 JSON 字符串为 map
-		var cdrJSON map[string]interface{}
-		err := json.Unmarshal([]byte(row.CDRJSONStr), &cdrJSON)
-		if err != nil {
-			logger.Warnf("CDRExport Error parsing JSON: %s", err.Error())
-			continue
-		}
-		// 计费ID
-		chargingID := ""
-		if v, ok := cdrJSON["chargingID"]; ok && v != nil {
-			chargingID = fmt.Sprint(parse.Number(v))
-		}
-		// 订阅 ID 类型
-		subscriptionIDType := "-"
-		// 订阅 ID 数据
-		subscriptionIDData := "-"
-		if v, ok := cdrJSON["subscriberIdentifier"]; ok && v != nil {
-			if sub, subOk := v.(map[string]any); subOk && sub != nil {
-				subscriptionIDType = sub["subscriptionIDType"].(string)
-				subscriptionIDData = sub["subscriptionIDData"].(string)
-			}
-		}
-
-		// 网络功能 IPv4 地址
-		networkFunctionIPv4Address := ""
-		if v, ok := cdrJSON["nFunctionConsumerInformation"]; ok && v != nil {
-			if conInfo, conInfoOk := v.(map[string]any); conInfoOk && conInfo != nil {
-				networkFunctionIPv4Address = conInfo["networkFunctionIPv4Address"].(string)
-			}
-		}
-
-		// 数据量上行链路
-		dataVolumeUplink := []string{}
-		// 数据量下行链路
-		dataVolumeDownlink := []string{}
-		// 数据总量
-		dataTotalVolume := []string{}
-
-		if v, ok := cdrJSON["listOfMultipleUnitUsage"]; ok && v != nil {
-			usageList := v.([]any)
-			if len(usageList) > 0 {
-				for _, used := range usageList {
-					usedUnit := used.(map[string]any)
-					usedUnitList := usedUnit["usedUnitContainer"].([]any)
-					if len(usedUnitList) > 0 {
-						for _, data := range usedUnitList {
-							udata := data.(map[string]any)
-							if dup, dupOk := udata["dataVolumeUplink"]; dupOk {
-								dataVolumeUplink = append(dataVolumeUplink, fmt.Sprint(parse.Number(dup)))
-							}
-							if ddown, ddownOk := udata["dataVolumeDownlink"]; ddownOk {
-								dataVolumeDownlink = append(dataVolumeDownlink, fmt.Sprint(parse.Number(ddown)))
-							}
-							if dt, dtOk := udata["dataTotalVolume"]; dtOk {
-								dataTotalVolume = append(dataTotalVolume, fmt.Sprint(parse.Number(dt)))
-							}
-						}
-					}
-				}
-			}
-		}
-		// 时长
-		duration := "-"
-		if v, ok := cdrJSON["duration"]; ok && v != nil {
-			duration = fmt.Sprint(parse.Number(v))
-		}
-		// 调用时间
-		invocationTimestamp := ""
-		if v, ok := cdrJSON["invocationTimestamp"]; ok && v != nil {
-			invocationTimestamp = v.(string)
-		}
-		// 记录打开时间
-		User_Identifier := ""
-		SSC_Mode := ""
-		RAT_Type := ""
-		DNN_ID := ""
-		PDU_Type := ""
-		PDU_IPv4 := ""
-		PDU_IPv6 := ""
-		if v, ok := cdrJSON["pDUSessionChargingInformation"]; ok && v != nil {
-			pduInfo := v.(map[string]any)
-
-			if v, ok := pduInfo["userIdentifier"]; ok && v != nil {
-				User_Identifier = v.(string)
-			}
-			if v, ok := pduInfo["sSCMode"]; ok && v != nil {
-				SSC_Mode = v.(string)
-			}
-			if v, ok := pduInfo["rATType"]; ok && v != nil {
-				RAT_Type = v.(string)
-			}
-			if v, ok := pduInfo["dNNID"]; ok && v != nil {
-				DNN_ID = v.(string)
-			}
-			if v, ok := pduInfo["pDUType"]; ok && v != nil {
-				PDU_Type = v.(string)
-			}
-			if v, ok := pduInfo["pDUAddress"]; ok && v != nil {
-				pDUAddress := v.(map[string]any)
-				if addr, ok := pDUAddress["pDUIPv4Address"]; ok && addr != nil {
-					PDU_IPv4 = addr.(string)
-				}
-				if addr, ok := pDUAddress["pDUIPv6AddresswithPrefix"]; ok && addr != nil {
-					PDU_IPv6 = addr.(string)
-				}
-			}
-
-			// 			pduSessionChargingInformation = fmt.Sprintf(`User Identifier: %s
-			// SSC Mode: %s    RAT Type: %s    DNN ID: %s
-			// PDU Type: %s
-			// PDU IPv4 Address: %s
-			// PDU IPv6 Addres Swith Prefix: %s`, User_Identifier, SSC_Mode, RAT_Type, DNN_ID, PDU_Type, PDU_IPv4, PDU_IPv6)
-		}
-
-		// 记录网络参数ID
-		recordNFID := ""
-		if v, ok := cdrJSON["recordingNetworkFunctionID"]; ok && v != nil {
-			recordNFID = v.(string)
-		}
-
-		//记录开始时间
-		recordOpeningTime := ""
-		if v, ok := cdrJSON["recordOpeningTime"]; ok && v != nil {
-			recordOpeningTime = v.(string)
-		}
-
-		//记录类型
-		recordType := ""
-		if v, ok := cdrJSON["recordType"]; ok && v != nil {
-			recordType = v.(string)
-		}
-
-		dataCells = append(dataCells, map[string]any{
-			"A" + idx: row.ID,
-			"B" + idx: chargingID,
-			"C" + idx: row.NeName,
-			"D" + idx: row.RmUID,
-			"E" + idx: subscriptionIDData,
-			"F" + idx: subscriptionIDType,
-			"G" + idx: strings.Join(dataVolumeUplink, ","),
-			"H" + idx: strings.Join(dataVolumeDownlink, ","),
-			"I" + idx: strings.Join(dataTotalVolume, ","),
-			"J" + idx: duration,
-			"K" + idx: invocationTimestamp,
-			"L" + idx: User_Identifier,
-			"M" + idx: SSC_Mode,
-			"N" + idx: DNN_ID,
-			"O" + idx: PDU_Type,
-			"P" + idx: RAT_Type,
-			"Q" + idx: PDU_IPv4,
-			"R" + idx: networkFunctionIPv4Address,
-			"S" + idx: PDU_IPv6,
-			"T" + idx: recordNFID,
-			"U" + idx: recordType,
-			"V" + idx: recordOpeningTime,
-		})
-	}
-
 	// 导出数据表格
-	saveFilePath, err := file.WriteSheet(headerCells, dataCells, fileName, "")
+	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
 		return
@@ -317,9 +124,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 {
@@ -334,7 +171,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")))
@@ -364,7 +201,7 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 				imsiStr = strings.TrimPrefix(imsiStr, "imsi-")
 				item["imsi"] = imsiStr
 				// 查UDM拓展信息
-				info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "")
+				info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "%")
 				item["remark"] = info.Remark
 			}
 			if v, ok := item["msisdn"]; ok && v != nil {

src/modules/network_data/controller/smsc.go

@@ -1,24 +1,19 @@
 package controller
 
 import (
-	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/utils/date"
-	"be.ems/src/framework/utils/file"
 	"be.ems/src/framework/utils/parse"
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
 	neService "be.ems/src/modules/network_element/service"
+
 	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 SMSCController 结构体
@@ -55,8 +50,8 @@ func (s *SMSCController) CDRList(c *gin.Context) {
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	data := s.cdrEventService.SelectPage(querys)
-	c.JSON(200, result.Ok(data))
+	rows, total := s.cdrEventService.SelectPage(querys)
+	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
 }
 
 // CDR会话删除
@@ -92,7 +87,7 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.CDREventSMSCQuery
-	if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
+	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
 		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
@@ -107,85 +102,17 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	data := s.cdrEventService.SelectPage(querys)
-	if parse.Number(data["total"]) == 0 {
+	rows, total := s.cdrEventService.SelectPage(querys)
+	if total == 0 {
 		// 导出数据记录为空
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
-	rows := data["rows"].([]model.CDREventSMSC)
 
 	// 导出文件名称
 	fileName := fmt.Sprintf("smsc_cdr_event_export_%d_%d.xlsx", len(rows), time.Now().UnixMilli())
-	// 第一行表头标题
-	headerCells := map[string]string{
-		"A1": "ID",
-		"B1": "Record Behavior",
-		"C1": "Service Type",
-		"D1": "Caller",
-		"E1": "Called",
-		"F1": "Result",
-		"G1": "Time",
-	}
-	// 从第二行开始的数据
-	dataCells := make([]map[string]any, 0)
-	for i, row := range rows {
-		idx := strconv.Itoa(i + 2)
-		// 解析 JSON 字符串为 map
-		var cdrJSON map[string]interface{}
-		err := json.Unmarshal([]byte(row.CDRJSONStr), &cdrJSON)
-		if err != nil {
-			logger.Warnf("CDRExport Error parsing JSON: %s", err.Error())
-			continue
-		}
-		// 记录类型
-		recordType := ""
-		if v, ok := cdrJSON["recordType"]; ok && v != nil {
-			recordType = v.(string)
-		}
-		// 服务类型
-		serviceType := ""
-		if v, ok := cdrJSON["serviceType"]; ok && v != nil {
-			serviceType = 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)
-		}
-		// 呼叫结果 0失败，1成功
-		callResult := "Fail"
-		if v, ok := cdrJSON["result"]; ok && v != nil {
-			resultVal := parse.Number(v)
-			if resultVal == 1 {
-				callResult = "Success"
-			}
-		}
-		// 取时间
-		timeStr := ""
-		if v, ok := cdrJSON["updateTime"]; ok && v != nil {
-			releaseTime := parse.Number(v)
-			timeStr = date.ParseDateToStr(releaseTime, date.YYYY_MM_DDTHH_MM_SSZ)
-		}
-
-		dataCells = append(dataCells, map[string]any{
-			"A" + idx: row.ID,
-			"B" + idx: recordType,
-			"C" + idx: serviceType,
-			"D" + idx: caller,
-			"E" + idx: called,
-			"F" + idx: callResult,
-			"G" + idx: timeStr,
-		})
-	}
-
 	// 导出数据表格
-	saveFilePath, err := file.WriteSheet(headerCells, dataCells, fileName, "")
+	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
 		c.JSON(200, result.ErrMsg(err.Error()))
 		return