feat: 更新多个模块以支持新的数据结构和日志格式

src/modules/network_data/controller/all_alarm.go

@@ -1,12 +1,12 @@
 package controller
 
 import (
-	"strings"
+	"fmt"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
@@ -31,49 +31,63 @@ type AlarmController struct {
 // 告警列表
 //
 // GET /list
+//
+//	@Tags			network_data/alarm
+//	@Accept			json
+//	@Produce		json
+//	@Param			neType			query		string	false	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
+//	@Param			neId			query		string	false	"NE ID The actual record is the network element RmUid"
+//	@Param			neName			query		string	false	"NE Name"
+//	@Param			pvFlag			query		string	false	"PV Flag"	Enums(PNF,VNF)
+//	@Param			alarmCode		query		string	false	"alarm status code"
+//	@Param			alarmType		query		string	false	"Alarm type Communication alarms=1, Equipment alarms=2, Processing faults=3, Environmental alarms=4, Quality of service alarms=5"	Enums(1,2,3,4,5)
+//	@Param			alarmStatus		query		string	false	"Alarm status 0:clear, 1:active"																									Enums(0,1)
+//	@Param			origSeverity	query		string	false	"Alarm Type 1: Critical, 2: Major, 3: Minor, 4: Warning"																			Enums(1,2,3,4)
+//	@Param			sortField		query		string	false	"Sort fields, fill in result fields"																								default(event_time)
+//	@Param			sortOrder		query		string	false	"Sort by ascending or descending order, asc desc"																					default(asc)
+//	@Param			pageNum			query		number	true	"pageNum"																															default(1)
+//	@Param			pageSize		query		number	true	"pageSize"																															default(10)
+//	@Success		200				{object}	object	"Response Results"
+//	@Security		TokenAuth
+//	@Summary		Alarm List
+//	@Description	Alarm List
+//	@Router			/neData/alarm/list [get]
 func (s *AlarmController) List(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	var querys model.AlarmQuery
-	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	var query model.AlarmQuery
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
-
-	// 查询网元获取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
-
 	// 查询数据
-	rows, total := s.alarmService.SelectPage(querys)
-	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
+	rows, total := s.alarmService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // 告警删除
 //
-// DELETE /:alarmIds
+// DELETE /:id
 func (s *AlarmController) Remove(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	alarmIds := c.Param("alarmIds")
-	if alarmIds == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(alarmIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.alarmService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.alarmService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.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))
+	c.JSON(200, resp.OkMsg(msg))
 }

src/modules/network_data/controller/all_alarm_log.go

@@ -0,0 +1,93 @@
+package controller
+
+import (
+	"fmt"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
+	"be.ems/src/framework/utils/parse"
+	"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"
+)
+
+// 实例化控制层 AlarmLogController 结构体
+var NewAlarmLog = &AlarmLogController{
+	neInfoService:   neService.NewNeInfo,
+	alarmLogService: neDataService.NewAlarmLog,
+}
+
+// 告警数据
+//
+// PATH /alarm/log
+type AlarmLogController struct {
+	neInfoService   *neService.NeInfo       // 网元信息服务
+	alarmLogService *neDataService.AlarmLog // 告警信息服务
+}
+
+// 告警日志列表
+//
+// GET /list
+//
+//	@Tags			network_data/alarm_log
+//	@Accept			json
+//	@Produce		json
+//	@Param			neType			query		string	false	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
+//	@Param			neId			query		string	false	"NE ID The actual record is the network element RmUid"
+//	@Param			neName			query		string	false	"NE Name"
+//	@Param			pvFlag			query		string	false	"PV Flag"	Enums(PNF,VNF)
+//	@Param			alarmLogCode	query		string	false	"AlarmLog status code"
+//	@Param			alarmLogType	query		string	false	"AlarmLog type Communication AlarmLogs=1, Equipment AlarmLogs=2, Processing faults=3, Environmental AlarmLogs=4, Quality of service AlarmLogs=5"	Enums(1,2,3,4,5)
+//	@Param			alarmLogStatus	query		string	false	"AlarmLog status 0:clear, 1:active"																													Enums(0,1)
+//	@Param			origSeverity	query		string	false	"AlarmLog Type 1: Critical, 2: Major, 3: Minor, 4: Warning"																							Enums(1,2,3,4)
+//	@Param			sortField		query		string	false	"Sort fields, fill in result fields"																												default(event_time)
+//	@Param			sortOrder		query		string	false	"Sort by ascending or descending order, asc desc"																									default(asc)
+//	@Param			pageNum			query		number	true	"pageNum"																																			default(1)
+//	@Param			pageSize		query		number	true	"pageSize"																																			default(10)
+//	@Success		200				{object}	object	"Response Results"
+//	@Security		TokenAuth
+//	@Summary		AlarmLog List
+//	@Description	AlarmLog List
+//	@Router			/neData/alarm/log/list [get]
+func (s *AlarmLogController) List(c *gin.Context) {
+	var query model.AlarmLogQuery
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
+		return
+	}
+	// 查询数据
+	rows, total := s.alarmLogService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
+}
+
+// 告警删除
+//
+// DELETE /:id
+func (s AlarmLogController) Remove(c *gin.Context) {
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
+		return
+	}
+
+	// 处理字符转id数组后去重
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
+	}
+
+	rows, err := s.alarmLogService.DeleteByIds(ids)
+	if err != nil {
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, resp.OkMsg(msg))
+}

src/modules/network_data/controller/all_kpi.go

@@ -1,27 +1,30 @@
 package controller
 
 import (
+	"fmt"
+
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/vo/result"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
 )
 
-// 实例化控制层 PerfKPIController 结构体
-var NewPerfKPI = &PerfKPIController{
-	neInfoService:  neService.NewNeInfo,
-	perfKPIService: neDataService.NewPerfKPI,
+// 实例化控制层 KPIController 结构体
+var NewKPI = &KPIController{
+	neInfoService:    neService.NewNeInfo,
+	kpiReportService: neDataService.NewKpiReport,
 }
 
 // 性能统计
 //
 // PATH /kpi
-type PerfKPIController struct {
-	neInfoService  *neService.NeInfo      // 网元信息服务
-	perfKPIService *neDataService.PerfKPI // 统计信息服务
+type KPIController struct {
+	neInfoService    *neService.NeInfo        // 网元信息服务
+	kpiReportService *neDataService.KpiReport // 指标统计服务
 }
 
 // 获取统计数据
@@ -31,39 +34,36 @@ type PerfKPIController struct {
 //	@Tags			network_data/kpi
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType		query		string	true	"NE Type"								Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC) default(AMF)
+//	@Param			neType		query		string	true	"NE Type"								Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC) default(AMF)
 //	@Param			neId		query		string	true	"NE ID"									default(001)
-//	@Param			startTime	query		number	true	"Start time (timestamped milliseconds)"	default(1729162507596)
-//	@Param			endTime		query		number	true	"End time (timestamped milliseconds)"	default(1729164187611)
+//	@Param			beginTime	query		number	true	"begin time (timestamped milliseconds)"	default(1729162507596)
+//	@Param			endTime		query		number	true	"end time (timestamped milliseconds)"	default(1729164187611)
 //	@Param			interval	query		number	true	"interval"								Enums(5,10,15,30,60,300,600,900,1800,3600) default(60)
 //	@Success		200			{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Access to statistical data
 //	@Description	Access to statistical data
 //	@Router			/neData/kpi/data [get]
-func (s *PerfKPIController) GoldKPI(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	var querys model.GoldKPIQuery
+func (s KPIController) KPIData(c *gin.Context) {
+	language := reqctx.AcceptLanguage(c)
+	var querys model.KPIQuery
 	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-		return
-	}
-	if querys.Interval < 5 || querys.Interval > 3600 {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	kpiData := s.perfKPIService.SelectGoldKPI(querys)
-	c.JSON(200, result.OkData(kpiData))
+	kpiData := s.kpiReportService.FindData(querys)
+	c.JSON(200, resp.OkData(kpiData))
 }
 
 // 获取统计标题
@@ -73,21 +73,18 @@ func (s *PerfKPIController) GoldKPI(c *gin.Context) {
 //	@Tags			network_data/kpi
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType	query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC) default(AMF)
+//	@Param			neType	query		string	true	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC) default(AMF)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Get Statistical Headings
 //	@Description	Get Statistical Headings
 //	@Router			/neData/kpi/title [get]
-func (s *PerfKPIController) Title(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+func (s KPIController) KPITitle(c *gin.Context) {
 	neType := c.Query("neType")
 	if neType == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(40010, "bind err: neType is empty"))
 		return
 	}
-
-	kpiTitles := s.perfKPIService.SelectGoldKPITitle(neType)
-
-	c.JSON(200, result.OkData(kpiTitles))
+	kpiTitles := s.kpiReportService.FindTitle(neType)
+	c.JSON(200, resp.OkData(kpiTitles))
 }

src/modules/network_data/controller/all_nb_state.go

@@ -7,8 +7,8 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/vo/result"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
 	neService "be.ems/src/modules/network_element/service"
@@ -35,38 +35,39 @@ type NBStateController struct {
 //	@Tags			network_data/amf,network_data/mme
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType		query		string	true	"NE Type only AMF/MME"	Enums(AMF,MME) default(AMF)
-//	@Param			neId		query		string	true	"NE ID"				default(001)
-//	@Param			pageNum		query		number	true	"pageNum"	default(1)
-//	@Param			pageSize	query		number	true	"pageSize"	default(10)
+//	@Param			neType		query		string	true	"NE Type only AMF/MME"					Enums(AMF,MME)	default(AMF)
+//	@Param			neId		query		string	true	"NE ID"									default(001)
+//	@Param			pageNum		query		number	true	"pageNum"								default(1)
+//	@Param			pageSize	query		number	true	"pageSize"								default(10)
 //	@Param			startTime	query		number	false	"Start time (timestamped milliseconds)"	default(1729162507596)
 //	@Param			endTime		query		number	false	"End time (timestamped milliseconds)"	default(1729164187611)
-//	@Param			sortField	query		string	false	"Sort fields, fill in result fields"	Enums(id,create_time) default(id)
-//	@Param			sortOrder		query		string	false	"Sort by ascending or descending order" Enums(asc,desc)	default(asc)
+//	@Param			sortField	query		string	false	"Sort fields, fill in result fields"	Enums(id,create_time)	default(id)
+//	@Param			sortOrder	query		string	false	"Sort by ascending or descending order"	Enums(asc,desc)			default(asc)
 //	@Success		200			{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Base Station Status List
 //	@Description	Base Station Status List
 //	@Router			/nb-state/list [get]
 func (s NBStateController) List(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var query model.NBStateQuery
 	if err := c.ShouldBindQuery(&query); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(query.NeType, query.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(query.NeType, query.NeID)
 	if neInfo.NeId != query.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	query.RmUID = neInfo.RmUID
 
 	// 查询数据
-	rows, total := s.nbStateService.SelectPage(query)
-	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
+	rows, total := s.nbStateService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // 历史记录列表导出
@@ -83,11 +84,12 @@ func (s NBStateController) List(c *gin.Context) {
 //	@Description	Base Station Status List Export
 //	@Router			/nb-state/export [post]
 func (s NBStateController) Export(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.NBStateQuery
 	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 	// 限制导出数据集
@@ -95,16 +97,16 @@ func (s NBStateController) Export(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	rows, total := s.nbStateService.SelectPage(querys)
+	rows, total := s.nbStateService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
@@ -113,7 +115,7 @@ func (s NBStateController) Export(c *gin.Context) {
 	// 导出数据表格
 	saveFilePath, err := s.nbStateService.ExportXlsx(rows, fileName, language)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 

src/modules/network_data/controller/amf.go

@@ -2,13 +2,12 @@ package controller
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
@@ -49,60 +48,63 @@ type AMFController struct {
 //	@Description	UE Session List
 //	@Router			/neData/amf/ue/list [get]
 func (s *AMFController) UEList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var querys model.UEEventAMFQuery
 	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("AMF", querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	rows, total := s.ueEventService.SelectPage(querys)
-	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
+	rows, total := s.ueEventService.FindByPage(querys)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // UE会话删除
 //
-// DELETE /ue/:ueIds
+// DELETE /ue/:id
 //
 //	@Tags			network_data/amf
 //	@Accept			json
 //	@Produce		json
-//	@Param			ueIds	path		string	true	"list data id, multiple separated by a , sign"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			id	path		string	true	"list data id, multiple separated by a , sign"
+//	@Success		200	{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		UE Session Deletion
 //	@Description	UE Session Deletion
-//	@Router			/neData/amf/ue/{ueIds} [delete]
+//	@Router			/neData/amf/ue/{id} [delete]
 func (s *AMFController) UERemove(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	ueIds := c.Param("ueIds")
-	if ueIds == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(ueIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.ueEventService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.ueEventService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.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))
+	c.JSON(200, resp.OkMsg(msg))
 }
 
 // UE会话列表导出
@@ -119,11 +121,12 @@ func (s *AMFController) UERemove(c *gin.Context) {
 //	@Description	UE Session List Export
 //	@Router			/neData/amf/ue/export [post]
 func (s *AMFController) UEExport(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.UEEventAMFQuery
 	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 	// 限制导出数据集
@@ -131,16 +134,16 @@ func (s *AMFController) UEExport(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("AMF", querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	rows, total := s.ueEventService.SelectPage(querys)
+	rows, total := s.ueEventService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
@@ -149,7 +152,7 @@ func (s *AMFController) UEExport(c *gin.Context) {
 	// 导出数据表格
 	saveFilePath, err := s.ueEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -171,20 +174,21 @@ func (s *AMFController) UEExport(c *gin.Context) {
 //	@Description	Access Base Station Information List
 //	@Router			/neData/amf/nb/list [get]
 func (s *AMFController) NbInfoList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.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")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("AMF", query.NeId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", query.NeId)
 	if neInfo.NeId != query.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
@@ -193,11 +197,11 @@ func (s *AMFController) NbInfoList(c *gin.Context) {
 		"id": query.NbId,
 	})
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // 接入基站状态信息列表
@@ -214,28 +218,26 @@ func (s *AMFController) NbInfoList(c *gin.Context) {
 //	@Description	Access to the base station status information list
 //	@Router			/neData/amf/nb/list-cfg [get]
 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")))
+	language := reqctx.AcceptLanguage(c)
+	neId := c.Query("neId")
+	if neId == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: neId is empty"))
 		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")))
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("AMF", neId)
+	if neInfo.NeId != neId || neInfo.IP == "" {
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元直连
 	data, err := neFetchlink.AMFGnbStateList(neInfo)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }

src/modules/network_data/controller/ims.go

@@ -2,13 +2,12 @@ package controller
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
@@ -50,60 +49,63 @@ type IMSController struct {
 //	@Description	CDR Session List
 //	@Router			/neData/ims/cdr/list [get]
 func (s *IMSController) CDRList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var querys model.CDREventIMSQuery
 	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.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}))
+	rows, total := s.cdrEventService.FindByPage(querys)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // CDR会话删除
 //
-// DELETE /cdr/:cdrIds
+// DELETE /cdr/:id
 //
 //	@Tags			network_data/ims
 //	@Accept			json
 //	@Produce		json
-//	@Param			cdrIds	path		string	true	"list data id, multiple separated by a , sign"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			id	path		string	true	"list data id, multiple separated by a , sign"
+//	@Success		200	{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		CDR Session Delete
 //	@Description	CDR Session Delete
-//	@Router			/neData/ims/cdr/{cdrIds} [delete]
+//	@Router			/neData/ims/cdr/{id} [delete]
 func (s *IMSController) 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")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(cdrIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.cdrEventService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.cdrEventService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.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))
+	c.JSON(200, resp.OkMsg(msg))
 }
 
 // CDR会话列表导出
@@ -120,11 +122,12 @@ func (s *IMSController) CDRRemove(c *gin.Context) {
 //	@Description	CDR Session List Export
 //	@Router			/neData/ims/cdr/export [post]
 func (s *IMSController) CDRExport(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.CDREventIMSQuery
 	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 	// 限制导出数据集
@@ -132,16 +135,16 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	rows, total := s.cdrEventService.SelectPage(querys)
+	rows, total := s.cdrEventService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
@@ -150,7 +153,7 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 	// 导出数据表格
 	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -171,30 +174,28 @@ func (s *IMSController) CDRExport(c *gin.Context) {
 //	@Description	Number of online session users
 //	@Router			/neData/ims/session/num [get]
 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")))
+	language := reqctx.AcceptLanguage(c)
+	neId := c.Query("neId")
+	if neId == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: neId is empty"))
 		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")))
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("IMS", neId)
+	if neInfo.NeId != neId || neInfo.IP == "" {
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元直连
 	num, err := neFetchlink.IMSUeSessionNum(neInfo)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
-	c.JSON(200, result.OkData(num))
+	c.JSON(200, resp.OkData(num))
 }
 
 // 在线会话用户列表信息
@@ -213,21 +214,22 @@ func (s *IMSController) UeSessionNum(c *gin.Context) {
 //	@Description	Online session user list information
 //	@Router			/neData/ims/session/list [get]
 func (s *IMSController) UeSessionList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.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")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("IMS", query.NeId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("IMS", query.NeId)
 	if neInfo.NeId != query.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
@@ -237,9 +239,9 @@ func (s *IMSController) UeSessionList(c *gin.Context) {
 		"msisdn": query.MSISDN,
 	})
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }

src/modules/network_data/controller/mme.go

@@ -2,19 +2,18 @@ package controller
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
+
 	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 MMEController 结构体
@@ -49,60 +48,63 @@ type MMEController struct {
 //	@Description	UE Session List
 //	@Router			/neData/mme/ue/list [get]
 func (s *MMEController) UEList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var querys model.UEEventMMEQuery
 	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("MME", querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
 
 	// 查询数据
-	rows, total := s.ueEventService.SelectPage(querys)
-	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
+	rows, total := s.ueEventService.FindByPage(querys)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // UE会话删除
 //
-// DELETE /ue/:ueIds
+// DELETE /ue/:id
 //
 //	@Tags			network_data/mme
 //	@Accept			json
 //	@Produce		json
-//	@Param			ueIds	path		string	true	"list data id, multiple separated by a , sign"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			id	path		string	true	"list data id, multiple separated by a , sign"
+//	@Success		200	{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		UE Session Deletion
 //	@Description	UE Session Deletion
-//	@Router			/neData/mme/ue/{ueIds} [delete]
+//	@Router			/neData/mme/ue/{id} [delete]
 func (s *MMEController) UERemove(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	ueIds := c.Param("ueIds")
-	if ueIds == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(ueIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.ueEventService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.ueEventService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.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))
+	c.JSON(200, resp.OkMsg(msg))
 }
 
 // UE会话列表导出
@@ -119,11 +121,12 @@ func (s *MMEController) UERemove(c *gin.Context) {
 //	@Description	UE Session List Export
 //	@Router			/neData/mme/ue/export [post]
 func (s *MMEController) UEExport(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.UEEventMMEQuery
-	if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 	// 限制导出数据集
@@ -131,16 +134,16 @@ func (s *MMEController) UEExport(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("MME", querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	rows, total := s.ueEventService.SelectPage(querys)
+	rows, total := s.ueEventService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
@@ -149,7 +152,7 @@ func (s *MMEController) UEExport(c *gin.Context) {
 	// 导出数据表格
 	saveFilePath, err := s.ueEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -171,20 +174,21 @@ func (s *MMEController) UEExport(c *gin.Context) {
 //	@Description	Access Base Station Information List
 //	@Router			/neData/mme/nb/list [get]
 func (s *MMEController) NbInfoList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.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")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("MME", query.NeId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", query.NeId)
 	if neInfo.NeId != query.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
@@ -193,11 +197,11 @@ func (s *MMEController) NbInfoList(c *gin.Context) {
 		"id": query.NbId,
 	})
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // 接入基站状态信息列表
@@ -214,28 +218,26 @@ func (s *MMEController) NbInfoList(c *gin.Context) {
 //	@Description	Access to the base station status information list
 //	@Router			/neData/mme/nb/list-cfg [get]
 func (s *MMEController) 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")))
+	language := reqctx.AcceptLanguage(c)
+	neId := c.Query("neId")
+	if neId == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: neId is empty"))
 		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")))
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("MME", neId)
+	if neInfo.NeId != neId || neInfo.IP == "" {
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元直连
 	data, err := neFetchlink.MMEEnbStateList(neInfo)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }

src/modules/network_data/controller/sgwc.go

@@ -2,13 +2,12 @@ package controller
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
@@ -17,18 +16,18 @@ import (
 
 // 实例化控制层 SGWCController 结构体
 var NewSGWC = &SGWCController{
-	neInfoService:      neService.NewNeInfo,
-	cdrEventService:    neDataService.NewCDREventSGWC,
-	udmUserInfoService: neDataService.NewUDMUserInfo,
+	neInfoService:    neService.NewNeInfo,
+	cdrEventService:  neDataService.NewCDREventSGWC,
+	UDMExtendService: neDataService.NewUDMExtend,
 }
 
 // 网元SGWC
 //
 // PATH /sgwc
 type SGWCController struct {
-	neInfoService      *neService.NeInfo           // 网元信息服务
-	cdrEventService    *neDataService.CDREventSGWC // CDR会话事件服务
-	udmUserInfoService *neDataService.UDMUserInfo  // UDM用户信息服务
+	neInfoService    *neService.NeInfo           // 网元信息服务
+	cdrEventService  *neDataService.CDREventSGWC // CDR会话事件服务
+	UDMExtendService *neDataService.UDMExtend    // UDM用户信息服务
 }
 
 // CDR会话列表
@@ -50,60 +49,63 @@ type SGWCController struct {
 //	@Description	CDR Session List
 //	@Router			/neData/sgwc/cdr/list [get]
 func (s *SGWCController) CDRList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.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")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.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}))
+	rows, total := s.cdrEventService.FindByPage(querys)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // CDR会话删除
 //
-// DELETE /cdr/:cdrIds
+// DELETE /cdr/:id
 //
 //	@Tags			network_data/sgwc
 //	@Accept			json
 //	@Produce		json
-//	@Param			cdrIds	path		string	true	"list data id, multiple separated by a , sign"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			id	path		string	true	"list data id, multiple separated by a , sign"
+//	@Success		200	{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		CDR Session Delete
 //	@Description	CDR Session Delete
-//	@Router			/neData/sgwc/cdr/{cdrIds} [delete]
+//	@Router			/neData/sgwc/cdr/{id} [delete]
 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")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(cdrIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.cdrEventService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.cdrEventService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.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))
+	c.JSON(200, resp.OkMsg(msg))
 }
 
 // CDR会话列表导出
@@ -120,11 +122,12 @@ func (s *SGWCController) CDRRemove(c *gin.Context) {
 //	@Description	CDR Session List Export
 //	@Router			/neData/sgwc/cdr/export [post]
 func (s *SGWCController) CDRExport(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.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")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 	// 限制导出数据集
@@ -132,16 +135,16 @@ func (s *SGWCController) CDRExport(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	rows, total := s.cdrEventService.SelectPage(querys)
+	rows, total := s.cdrEventService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
@@ -150,7 +153,7 @@ func (s *SGWCController) CDRExport(c *gin.Context) {
 	// 导出数据表格
 	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 

src/modules/network_data/controller/smf.go

@@ -6,31 +6,31 @@ import (
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
+
 	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 SMFController 结构体
 var NewSMF = &SMFController{
-	neInfoService:      neService.NewNeInfo,
-	cdrEventService:    neDataService.NewCDREventSMF,
-	udmUserInfoService: neDataService.NewUDMUserInfo,
+	neInfoService:    neService.NewNeInfo,
+	cdrEventService:  neDataService.NewCDREventSMF,
+	UDMExtendService: neDataService.NewUDMExtend,
 }
 
 // 网元SMF
 //
 // PATH /smf
 type SMFController struct {
-	neInfoService      *neService.NeInfo          // 网元信息服务
-	cdrEventService    *neDataService.CDREventSMF // CDR会话事件服务
-	udmUserInfoService *neDataService.UDMUserInfo // UDM用户信息服务
+	neInfoService    *neService.NeInfo          // 网元信息服务
+	cdrEventService  *neDataService.CDREventSMF // CDR会话事件服务
+	UDMExtendService *neDataService.UDMExtend   // UDM用户信息服务
 }
 
 // CDR会话列表
@@ -51,60 +51,63 @@ type SMFController struct {
 //	@Description	CDR Session List
 //	@Router			/neData/smf/cdr/list [get]
 func (s *SMFController) CDRList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var querys model.CDREventSMFQuery
 	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.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}))
+	rows, total := s.cdrEventService.FindByPage(querys)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // CDR会话删除
 //
-// DELETE /cdr/:cdrIds
+// DELETE /cdr/:id
 //
 //	@Tags			network_data/smf
 //	@Accept			json
 //	@Produce		json
-//	@Param			cdrIds	path		string	true	"list data id, multiple separated by a , sign"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			id	path		string	true	"list data id, multiple separated by a , sign"
+//	@Success		200	{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		CDR Session Delete
 //	@Description	CDR Session Delete
-//	@Router			/neData/smf/cdr/{cdrIds} [delete]
+//	@Router			/neData/smf/cdr/{id} [delete]
 func (s *SMFController) 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")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(cdrIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.cdrEventService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.cdrEventService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.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))
+	c.JSON(200, resp.OkMsg(msg))
 }
 
 // CDR会话列表导出
@@ -121,11 +124,12 @@ func (s *SMFController) CDRRemove(c *gin.Context) {
 //	@Description	CDR Session List Export
 //	@Router			/neData/smf/cdr/export [post]
 func (s *SMFController) CDRExport(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.CDREventSMFQuery
-	if err := c.ShouldBindBodyWith(&querys, binding.JSON); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 	// 限制导出数据集
@@ -133,16 +137,16 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	rows, total := s.cdrEventService.SelectPage(querys)
+	rows, total := s.cdrEventService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
@@ -151,7 +155,7 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 	// 导出数据表格
 	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -172,30 +176,30 @@ func (s *SMFController) CDRExport(c *gin.Context) {
 //	@Description	Number of online session users
 //	@Router			/neData/smf/sub/num [get]
 func (s *SMFController) SubUserNum(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.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")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("SMF", query.NeId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("SMF", query.NeId)
 	if neInfo.NeId != query.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元直连
 	num, err := neFetchlink.SMFSubNum(neInfo)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
-	c.JSON(200, result.OkData(num))
+	c.JSON(200, resp.OkData(num))
 }
 
 // 在线订阅用户列表信息
@@ -216,7 +220,7 @@ func (s *SMFController) SubUserNum(c *gin.Context) {
 //	@Description	Online session user list information
 //	@Router			/neData/smf/session/list [get]
 func (s *SMFController) SubUserList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var query struct {
 		NeId    string `form:"neId" binding:"required"`
 		IMSI    string `form:"imsi"`
@@ -225,14 +229,14 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 		PageNum string `form:"pageNum"`
 	}
 	if err := c.ShouldBindQuery(&query); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元信息
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("SMF", query.NeId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("SMF", query.NeId)
 	if neInfo.NeId != query.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
@@ -244,7 +248,7 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 		"pageNum": query.PageNum,
 	})
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -259,7 +263,7 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 				imsiStr = strings.TrimPrefix(imsiStr, "imsi-")
 				item["imsi"] = imsiStr
 				// 查UDM拓展信息
-				info := s.udmUserInfoService.SelectByIMSIAndNeID(imsiStr, "%")
+				info := s.UDMExtendService.FindByIMSIAndNeID(imsiStr, "%")
 				item["remark"] = info.Remark
 			}
 			if v, ok := item["msisdn"]; ok && v != nil {
@@ -268,5 +272,5 @@ func (s *SMFController) SubUserList(c *gin.Context) {
 		}
 	}
 
-	c.JSON(200, result.Ok(data))
+	c.JSON(200, resp.OkData(data))
 }

src/modules/network_data/controller/smsc.go

@@ -2,13 +2,12 @@ package controller
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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"
@@ -49,60 +48,63 @@ type SMSCController struct {
 //	@Description	CDR Session List
 //	@Router			/neData/smsc/cdr/list [get]
 func (s *SMSCController) CDRList(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var querys model.CDREventSMSCQuery
 	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.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}))
+	rows, total := s.cdrEventService.FindByPage(querys)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // CDR会话删除
 //
-// DELETE /cdr/:cdrIds
+// DELETE /cdr/:id
 //
 //	@Tags			network_data/smsc
 //	@Accept			json
 //	@Produce		json
-//	@Param			cdrIds	path		string	true	"list data id, multiple separated by a , sign"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			id	path		string	true	"list data id, multiple separated by a , sign"
+//	@Success		200	{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		CDR Session Delete
 //	@Description	CDR Session Delete
-//	@Router			/neData/smsc/cdr/{cdrIds} [delete]
+//	@Router			/neData/smsc/cdr/{id} [delete]
 func (s *SMSCController) 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")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(cdrIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.cdrEventService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.cdrEventService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.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))
+	c.JSON(200, resp.OkMsg(msg))
 }
 
 // CDR会话列表导出
@@ -119,11 +121,12 @@ func (s *SMSCController) CDRRemove(c *gin.Context) {
 //	@Description	CDR Session List Export
 //	@Router			/neData/smsc/cdr/export [post]
 func (s *SMSCController) CDRExport(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
 	var querys model.CDREventSMSCQuery
 	if err := c.ShouldBindBodyWithJSON(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 	// 限制导出数据集
@@ -131,16 +134,16 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
 		querys.PageSize = 10000
 	}
 	// 查询网元信息 rmUID
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID(querys.NeType, querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	querys.RmUID = neInfo.RmUID
-	rows, total := s.cdrEventService.SelectPage(querys)
+	rows, total := s.cdrEventService.FindByPage(querys)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
@@ -149,7 +152,7 @@ func (s *SMSCController) CDRExport(c *gin.Context) {
 	// 导出数据表格
 	saveFilePath, err := s.cdrEventService.ExportXlsx(rows, fileName, language)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 

src/modules/network_data/controller/udm_auth.go

@@ -6,19 +6,19 @@ import (
 	"strings"
 	"time"
 
-	"be.ems/src/framework/constants/uploadsubpath"
+	"be.ems/src/framework/constants"
 	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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/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"
 )
 
 // 实例化控制层 UDMAuthController 结构体
@@ -45,19 +45,19 @@ type UDMAuthController struct {
 //	@Param			neId	path		string	true	"NE ID"	default(001)
 //	@Success		200		{object}	object	"Response Results"
 //	@Security		TokenAuth
-//	@Summary		UDM Authentication User Reload Data
-//	@Description	UDM Authentication User Reload Data
+//	@Summary		UDM Authentication User Data Refresh
+//	@Description	UDM Authenticated User Data List Refresh Synchronization Latest
 //	@Router			/neData/udm/auth/resetData/{neId} [put]
 func (s *UDMAuthController) ResetData(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	if neId == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	data := s.udmAuthService.ResetData(neId)
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM鉴权用户列表
@@ -77,9 +77,9 @@ func (s *UDMAuthController) ResetData(c *gin.Context) {
 //	@Description	UDM Authentication User List
 //	@Router			/neData/udm/auth/list [get]
 func (s *UDMAuthController) List(c *gin.Context) {
-	querys := ctx.QueryMap(c)
-	total, rows := s.udmAuthService.SelectPage(querys)
-	c.JSON(200, result.Ok(map[string]any{"total": total, "rows": rows}))
+	query := reqctx.QueryMap(c)
+	total, rows := s.udmAuthService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // UDM鉴权用户信息
@@ -97,24 +97,24 @@ func (s *UDMAuthController) List(c *gin.Context) {
 //	@Description	UDM Authentication User Information
 //	@Router			/neData/udm/auth/{neId}/{value} [get]
 func (s *UDMAuthController) Info(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
 	if neId == "" || imsi == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -123,19 +123,19 @@ func (s *UDMAuthController) Info(c *gin.Context) {
 	cmd := fmt.Sprintf("dsp authdat:imsi=%s", imsi)
 	data, err := telnet.ConvertToMap(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
 	if len(data) == 0 {
-		c.JSON(200, result.ErrMsg("No Auth Data"))
+		c.JSON(200, resp.ErrMsg("No Auth Data"))
 		return
 	}
 
 	// 解析返回的数据
 	u := s.udmAuthService.ParseInfo(imsi, neId, data)
 	s.udmAuthService.Insert(neId, u)
-	c.JSON(200, result.OkData(u))
+	c.JSON(200, resp.OkData(u))
 }
 
 // UDM鉴权用户新增
@@ -153,30 +153,30 @@ func (s *UDMAuthController) Info(c *gin.Context) {
 //	@Description	UDM Authentication User Added
 //	@Router			/neData/udm/auth/{neId} [post]
 func (s *UDMAuthController) Add(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	if neId == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	var body model.UDMAuthUser
-	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	err := c.ShouldBindBodyWithJSON(&body)
 	if err != nil || body.IMSI == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -186,7 +186,7 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 	cmd += s.udmAuthService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -194,7 +194,7 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		s.udmAuthService.Insert(neId, body)
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM鉴权用户批量新增
@@ -213,31 +213,31 @@ func (s *UDMAuthController) Add(c *gin.Context) {
 //	@Description	UDM Authentication User Batch Add
 //	@Router			/neData/udm/auth/{neId}/{value} [post]
 func (s *UDMAuthController) Adds(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	num := c.Param("num")
 	if neId == "" || num == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	var body model.UDMAuthUser
-	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	err := c.ShouldBindBodyWithJSON(&body)
 	if err != nil || body.IMSI == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -247,7 +247,7 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 	cmd += s.udmAuthService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -255,7 +255,7 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		s.udmAuthService.LoadData(neId, body.IMSI, num)
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM鉴权用户修改
@@ -273,30 +273,30 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 //	@Description	UDM Authenticated User Modification
 //	@Router			/neData/udm/auth/{neId} [put]
 func (s *UDMAuthController) Edit(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	if neId == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	var body model.UDMAuthUser
-	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	err := c.ShouldBindBodyWithJSON(&body)
 	if err != nil || body.IMSI == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -306,7 +306,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 	cmd += s.udmAuthService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -314,7 +314,7 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		s.udmAuthService.Insert(neId, body)
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM鉴权用户删除
@@ -332,11 +332,11 @@ func (s *UDMAuthController) Edit(c *gin.Context) {
 //	@Description	UDM Authenticated User Deletion
 //	@Router			/neData/udm/auth/{neId}/{value} [delete]
 func (s *UDMAuthController) Remove(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
 	if neId == "" || imsi == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
@@ -344,20 +344,20 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
 	imsiArr := strings.Split(imsi, ",")
 	uniqueIDs := parse.RemoveDuplicates(imsiArr)
 	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
+		c.JSON(200, resp.Err(nil))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -378,7 +378,7 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
 		resultData[imsi] = data
 	}
 
-	c.JSON(200, result.OkData(resultData))
+	c.JSON(200, resp.OkData(resultData))
 }
 
 // UDM鉴权用户批量删除
@@ -397,25 +397,25 @@ func (s *UDMAuthController) Remove(c *gin.Context) {
 //	@Description	UDM Authentication User Batch Deletion
 //	@Router			/neData/udm/auth/{neId}/{imsi}/{num} [delete]
 func (s *UDMAuthController) Removes(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
 	num := c.Param("num")
 	if neId == "" || imsi == "" || num == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -424,7 +424,7 @@ func (s *UDMAuthController) Removes(c *gin.Context) {
 	cmd := fmt.Sprintf("bde authdat:start_imsi=%s,sub_num=%s", imsi, num)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -432,56 +432,58 @@ func (s *UDMAuthController) Removes(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		s.udmAuthService.LoadData(neId, imsi, num)
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM鉴权用户导出
 //
-// POST /export
+// GET /export
 //
 //	@Tags			network_data/udm/auth
 //	@Accept			json
 //	@Produce		json
-//	@Param			data	body		object	true	"Request Param"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			neId		query		string	true	"NE ID"		default(001)
+//	@Param			type		query		string	true	"File Type"	Enums(csv,txt)	default(txt)
+//	@Param			imsi		query		string	false	"IMSI"
+//	@Param			pageNum		query		number	true	"pageNum"	default(1)
+//	@Param			pageSize	query		number	true	"pageSize"	default(10)
+//	@Success		200			{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		UDM Authenticated User Export
 //	@Description	UDM Authenticated User Export
-//	@Router			/neData/udm/auth/export [post]
+//	@Router			/neData/udm/auth/export [get]
 func (s *UDMAuthController) Export(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
-	querys := ctx.BodyJSONMap(c)
-	neId := querys["neId"].(string)
-	fileType := querys["type"].(string)
-	if neId == "" || fileType == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	neId := c.Query("neId")
+	fileType := c.Query("type")
+	if neId == "" {
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 	if !(fileType == "csv" || fileType == "txt") {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
 		return
 	}
 
-	querys["pageNum"] = 1
-	querys["pageSize"] = 10000
-	total, rows := s.udmAuthService.SelectPage(querys)
+	query := reqctx.QueryMap(c)
+	total, rows := s.udmAuthService.FindByPage(query)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
 	// rows := s.udmAuthService.SelectList(model.UDMAuthUser{NeId: neId})
 	if len(rows) <= 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
 	// 文件名
 	fileName := fmt.Sprintf("udm_auth_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType)
-	filePath := filepath.Join(file.ParseUploadFileDir(uploadsubpath.EXPORT), fileName)
+	filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName)
 
 	if fileType == "csv" {
 		// 转换数据
@@ -497,7 +499,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 		// 输出到文件
 		err := file.WriterFileCSV(data, filePath)
 		if err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
+			c.JSON(200, resp.ErrMsg(err.Error()))
 			return
 		}
 	}
@@ -515,7 +517,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 		// 输出到文件
 
 		if err := file.WriterFileTXT(data, ",", filePath); err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
+			c.JSON(200, resp.ErrMsg(err.Error()))
 			return
 		}
 	}
@@ -537,59 +539,60 @@ func (s *UDMAuthController) Export(c *gin.Context) {
 //	@Description	UDM Authenticated User Import
 //	@Router			/neData/udm/auth/import [post]
 func (s *UDMAuthController) Import(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var body struct {
 		NeId       string `json:"neId" binding:"required"`                     // 网元ID
 		UploadPath string `json:"uploadPath" binding:"required"`               // 上传文件路径
 		TypeVal    string `json:"typeVal" binding:"required,oneof=default k4"` // default: 默认导入方式, k4: k4类型导入方式
 		TypeData   any    `json:"typeData"`                                    // k4类型的数据密钥
 	}
-	if err := c.ShouldBindBodyWith(&body, binding.JSON); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 判断文件名
 	if !(strings.HasSuffix(body.UploadPath, ".csv") || strings.HasSuffix(body.UploadPath, ".txt")) {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserAuthFileFormat")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserAuthFileFormat")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", body.NeId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId)
 	if neInfo.NeId != body.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元主机的SSH客户端
 	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer sshClient.Close()
 	// 网元主机的SSH客户端进行文件传输
 	sftpClient, err := sshClient.NewClientSFTP()
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer sftpClient.Close()
 
 	// 本地文件
-	localFilePath := file.ParseUploadFilePath(body.UploadPath)
+	localFilePath := file.ParseUploadFileAbsPath(body.UploadPath)
 	neFilePath := fmt.Sprintf("/tmp/%s", filepath.Base(localFilePath))
 	// 复制到远程
 	if err = sftpClient.CopyFileLocalToRemote(localFilePath, neFilePath); err != nil {
-		c.JSON(200, result.ErrMsg("error uploading file"))
+		c.JSON(200, resp.ErrMsg("error uploading file"))
 		return
 	}
 
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -612,7 +615,7 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 	}
 
 	if resultErr != nil {
-		c.JSON(200, result.ErrMsg(resultErr.Error()))
+		c.JSON(200, resp.ErrMsg(resultErr.Error()))
 		return
 	}
 
@@ -627,5 +630,5 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 			go s.udmAuthService.InsertData(neInfo.NeId, "txt", data)
 		}
 	}
-	c.JSON(200, result.OkMsg(resultMsg))
+	c.JSON(200, resp.OkMsg(resultMsg))
 }

src/modules/network_data/controller/udm_sub.go

@@ -6,18 +6,18 @@ import (
 	"strings"
 	"time"
 
-	"be.ems/src/framework/constants/uploadsubpath"
+	"be.ems/src/framework/constants"
 	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"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/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"
 )
 
 // 实例化控制层 UDMSubController 结构体
@@ -48,15 +48,15 @@ type UDMSubController struct {
 //	@Description	UDM Subscriber User Reload Data
 //	@Router			/neData/udm/sub/resetData/{neId} [put]
 func (s *UDMSubController) ResetData(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	if neId == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	data := s.udmSubService.ResetData(neId)
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM签约用户列表
@@ -77,9 +77,9 @@ func (s *UDMSubController) ResetData(c *gin.Context) {
 //	@Description	UDM Subscriber User List
 //	@Router			/neData/udm/sub/list [get]
 func (s *UDMSubController) List(c *gin.Context) {
-	querys := ctx.QueryMap(c)
-	total, rows := s.udmSubService.SelectPage(querys)
-	c.JSON(200, result.Ok(map[string]any{"total": total, "rows": rows}))
+	query := reqctx.QueryMap(c)
+	total, rows := s.udmSubService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // UDM签约用户信息
@@ -97,24 +97,24 @@ func (s *UDMSubController) List(c *gin.Context) {
 //	@Description	UDM Subscriber User Information
 //	@Router			/neData/udm/sub/{neId}/{value} [get]
 func (s *UDMSubController) Info(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
 	if neId == "" || imsi == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -123,19 +123,19 @@ func (s *UDMSubController) Info(c *gin.Context) {
 	cmd := fmt.Sprintf("dsp udmuser:imsi=%s", imsi)
 	data, err := telnet.ConvertToMap(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
 	if len(data) == 0 {
-		c.JSON(200, result.ErrMsg("No Subs Data"))
+		c.JSON(200, resp.ErrMsg("No Subs Data"))
 		return
 	}
 
 	// 解析返回的数据
 	u := s.udmSubService.ParseInfo(imsi, neId, data)
 	s.udmSubService.Insert(neId, u)
-	c.JSON(200, result.OkData(u))
+	c.JSON(200, resp.OkData(u))
 }
 
 // UDM签约用户新增
@@ -153,30 +153,34 @@ func (s *UDMSubController) Info(c *gin.Context) {
 //	@Description	UDM Subscriber User Added
 //	@Router			/neData/udm/sub/{neId} [post]
 func (s *UDMSubController) Add(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	if neId == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	var body model.UDMSubUser
-	err := c.ShouldBindBodyWith(&body, binding.JSON)
-	if err != nil || len(body.IMSI) < 15 {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
+		return
+	}
+	if len(body.IMSI) != 15 {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: IMSI length is not 15 bits"))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -186,7 +190,7 @@ func (s *UDMSubController) Add(c *gin.Context) {
 	cmd += s.udmSubService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -195,7 +199,7 @@ func (s *UDMSubController) Add(c *gin.Context) {
 		body.NeId = neId
 		s.udmSubService.Insert(neId, body)
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM签约用户批量新增
@@ -214,31 +218,35 @@ func (s *UDMSubController) Add(c *gin.Context) {
 //	@Description	UDM Subscriber User Batch Add
 //	@Router			/neData/udm/sub/{neId}/{value} [post]
 func (s *UDMSubController) Adds(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	num := c.Param("num")
 	if neId == "" || num == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	var body model.UDMSubUser
-	err := c.ShouldBindBodyWith(&body, binding.JSON)
-	if err != nil || len(body.IMSI) < 15 {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
+		return
+	}
+	if len(body.IMSI) != 15 {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: IMSI length is not 15 bits"))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -251,7 +259,7 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 	cmd = strings.Replace(cmd, omemsisdn, ",", 1)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -259,7 +267,7 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		s.udmSubService.LoadData(neId, body.IMSI, num, body.Remark)
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM签约用户修改
@@ -277,30 +285,34 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 //	@Description	UDM Subscriber User Modification
 //	@Router			/neData/udm/sub/{neId} [put]
 func (s *UDMSubController) Edit(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	if neId == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	var body model.UDMSubUser
-	err := c.ShouldBindBodyWith(&body, binding.JSON)
-	if err != nil || len(body.IMSI) < 15 {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
+		return
+	}
+	if len(body.IMSI) != 15 {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: IMSI length is not 15 bits"))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -310,7 +322,7 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 	cmd += s.udmSubService.ParseCommandParams(body)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -319,7 +331,7 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 		body.NeId = neId
 		s.udmSubService.Insert(neId, body)
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM签约用户删除
@@ -337,11 +349,11 @@ func (s *UDMSubController) Edit(c *gin.Context) {
 //	@Description	UDM Subscriber User Deletion
 //	@Router			/neData/udm/sub/{neId}/{value} [delete]
 func (s *UDMSubController) Remove(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
 	if neId == "" || len(imsi) < 15 {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
@@ -349,20 +361,20 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 	imsiArr := strings.Split(imsi, ",")
 	uniqueIDs := parse.RemoveDuplicates(imsiArr)
 	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
+		c.JSON(200, resp.Err(nil))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -383,7 +395,7 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 		resultData[imsi] = data
 	}
 
-	c.JSON(200, result.OkData(resultData))
+	c.JSON(200, resp.OkData(resultData))
 }
 
 // UDM签约用户批量删除
@@ -402,25 +414,25 @@ func (s *UDMSubController) Remove(c *gin.Context) {
 //	@Description	UDM Subscriber User Batch Deletion
 //	@Router			/neData/udm/sub/{neId}/{imsi}/{num} [delete]
 func (s *UDMSubController) Removes(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	neId := c.Param("neId")
 	imsi := c.Param("imsi")
 	num := c.Param("num")
 	if neId == "" || len(imsi) < 15 || num == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", neId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", neId)
 	if neInfo.NeId != neId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient("UDM", neId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -429,7 +441,7 @@ func (s *UDMSubController) Removes(c *gin.Context) {
 	cmd := fmt.Sprintf("bde udmuser:start_imsi=%s,sub_num=%s", imsi, num)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -437,56 +449,59 @@ func (s *UDMSubController) Removes(c *gin.Context) {
 	if strings.Contains(data, "ok") {
 		s.udmSubService.LoadData(neId, imsi, num, "-(Deleted)-")
 	}
-	c.JSON(200, result.OkData(data))
+	c.JSON(200, resp.OkData(data))
 }
 
 // UDM签约用户导出
 //
-// POST /export
+// GET /export
 //
 //	@Tags			network_data/udm/sub
 //	@Accept			json
 //	@Produce		json
-//	@Param			data	body		object	true	"Request Param"
-//	@Success		200		{object}	object	"Response Results"
+//	@Param			neId		query		string	true	"NE ID"		default(001)
+//	@Param			type		query		string	true	"File Type"	Enums(csv,txt)	default(txt)
+//	@Param			imsi		query		string	false	"IMSI"
+//	@Param			msisdn		query		string	false	"Msisdn"
+//	@Param			pageNum		query		number	true	"pageNum"	default(1)
+//	@Param			pageSize	query		number	true	"pageSize"	default(10)
+//	@Success		200			{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		UDM Subscriber User Export
 //	@Description	UDM Subscriber User Export
 //	@Router			/neData/udm/sub/export [post]
 func (s *UDMSubController) Export(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	// 查询结果，根据查询条件结果，单页最大值限制
-	querys := ctx.BodyJSONMap(c)
-	neId := querys["neId"].(string)
-	fileType := querys["type"].(string)
+	neId := c.Query("neId")
+	fileType := c.Query("type")
 	if neId == "" || fileType == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 	if !(fileType == "csv" || fileType == "txt") {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
 		return
 	}
 
-	querys["pageNum"] = 1
-	querys["pageSize"] = 10000
-	total, rows := s.udmSubService.SelectPage(querys)
+	query := reqctx.QueryMap(c)
+	total, rows := s.udmSubService.FindByPage(query)
 	if total == 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
 	// rows := s.udmSubService.SelectList(model.UDMSubUser{NeId: neId})
 	if len(rows) <= 0 {
 		// 导出数据记录为空
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.exportEmpty")))
 		return
 	}
 
 	// 文件名
 	fileName := fmt.Sprintf("udm_sub_user_export_%s_%d.%s", neId, time.Now().UnixMilli(), fileType)
-	filePath := filepath.Join(file.ParseUploadFileDir(uploadsubpath.EXPORT), fileName)
+	filePath := filepath.Join(file.ParseUploadFileDir(constants.UPLOAD_EXPORT), fileName)
 
 	if fileType == "csv" {
 		// 转换数据
@@ -498,7 +513,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 		}
 		// 输出到文件
 		if err := file.WriterFileCSV(data, filePath); err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
+			c.JSON(200, resp.ErrMsg(err.Error()))
 			return
 		}
 	}
@@ -512,7 +527,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
 		}
 		// 输出到文件
 		if err := file.WriterFileTXT(data, ",", filePath); err != nil {
-			c.JSON(200, result.ErrMsg(err.Error()))
+			c.JSON(200, resp.ErrMsg(err.Error()))
 			return
 		}
 	}
@@ -534,57 +549,58 @@ func (s *UDMSubController) Export(c *gin.Context) {
 //	@Description	UDM Subscriber User Import
 //	@Router			/neData/udm/sub/import [post]
 func (s *UDMSubController) Import(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var body struct {
 		NeId       string `json:"neId" binding:"required"`
 		UploadPath string `json:"uploadPath" binding:"required"`
 	}
-	if err := c.ShouldBindBodyWith(&body, binding.JSON); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	if err := c.ShouldBindBodyWithJSON(&body); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
 
 	// 判断文件名
 	if !(strings.HasSuffix(body.UploadPath, ".csv") || strings.HasSuffix(body.UploadPath, ".txt")) {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "ne.udm.errImportUserSubFileFormat")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UDM", body.NeId)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UDM", body.NeId)
 	if neInfo.NeId != body.NeId || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
 	// 网元主机的SSH客户端
 	sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer sshClient.Close()
 	// 网元主机的SSH客户端进行文件传输
 	sftpClient, err := sshClient.NewClientSFTP()
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer sftpClient.Close()
 
 	// 本地文件
-	localFilePath := file.ParseUploadFilePath(body.UploadPath)
+	localFilePath := file.ParseUploadFileAbsPath(body.UploadPath)
 	neFilePath := fmt.Sprintf("/tmp/%s", filepath.Base(localFilePath))
 	// 复制到远程
 	if err = sftpClient.CopyFileLocalToRemote(localFilePath, neFilePath); err != nil {
-		c.JSON(200, result.ErrMsg("error uploading file"))
+		c.JSON(200, resp.ErrMsg("error uploading file"))
 		return
 	}
 
 	// 网元主机的Telnet客户端
 	telnetClient, err := s.neInfoService.NeRunTelnetClient(neInfo.NeType, neInfo.NeId, 1)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 	defer telnetClient.Close()
@@ -593,7 +609,7 @@ func (s *UDMSubController) Import(c *gin.Context) {
 	cmd := fmt.Sprintf("import udmuser:path=%s", neFilePath)
 	data, err := telnet.ConvertToStr(telnetClient, cmd)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(err.Error()))
+		c.JSON(200, resp.ErrMsg(err.Error()))
 		return
 	}
 
@@ -608,5 +624,5 @@ func (s *UDMSubController) Import(c *gin.Context) {
 			go s.udmSubService.InsertData(neInfo.NeId, "txt", data)
 		}
 	}
-	c.JSON(200, result.OkMsg(data))
+	c.JSON(200, resp.OkMsg(data))
 }

src/modules/network_data/controller/upf.go

@@ -2,25 +2,26 @@ package controller
 
 import (
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
-	"be.ems/src/framework/vo/result"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	neDataService "be.ems/src/modules/network_data/service"
 	neService "be.ems/src/modules/network_element/service"
+
 	"github.com/gin-gonic/gin"
 )
 
 // 实例化控制层 UPFController 结构体
 var NewUPF = &UPFController{
-	neInfoService:  neService.NewNeInfo,
-	perfKPIService: neDataService.NewPerfKPI,
+	neInfoService:    neService.NewNeInfo,
+	kpiReportService: neDataService.NewKpiReport,
 }
 
 // 网元UPF
 //
 // PATH /upf
 type UPFController struct {
-	neInfoService  *neService.NeInfo      // 网元信息服务
-	perfKPIService *neDataService.PerfKPI // 统计信息服务
+	neInfoService    *neService.NeInfo        // 网元信息服务
+	kpiReportService *neDataService.KpiReport // 统计信息服务
 }
 
 // 总流量数 N3上行 N6下行
@@ -38,25 +39,24 @@ type UPFController struct {
 //	@Summary		Total number of flows N3 upstream N6 downstream
 //	@Description	Total number of flows N3 upstream N6 downstream
 //	@Router			/neData/upf/totalFlow [get]
-func (s *UPFController) TotalFlow(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+func (s UPFController) TotalFlow(c *gin.Context) {
+	language := reqctx.AcceptLanguage(c)
 	var querys struct {
 		NeID string `form:"neId" binding:"required"`
 		Day  int    `form:"day"`
 	}
 	if err := c.ShouldBindQuery(&querys); querys.Day < 0 || err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		c.JSON(400, resp.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
 		return
 	}
 
 	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID("UPF", querys.NeID)
+	neInfo := s.neInfoService.FindByNeTypeAndNeID("UPF", querys.NeID)
 	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 
-	data := s.perfKPIService.SelectUPFTotalFlow(neInfo.NeType, neInfo.RmUID, querys.Day)
-
-	c.JSON(200, result.OkData(data))
+	data := s.kpiReportService.FindUPFTotalFlow(neInfo.RmUID, querys.Day)
+	c.JSON(200, resp.OkData(data))
 }

src/modules/network_data/model/alarm.go

@@ -1,40 +1,36 @@
 package model
 
-import "time"
-
-// Alarm 告警数据对象 alarm
+// Alarm 告警记录
 type Alarm struct {
-	ID                string    `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	AlarmSeq          string    `json:"alarmSeq" gorm:"column:alarm_seq"`
-	AlarmId           string    `json:"alarmId" gorm:"column:alarm_id"`
-	AlarmTitle        string    `json:"alarmTitle" gorm:"column:alarm_title"`
-	NeType            string    `json:"neType" gorm:"column:ne_type"`
-	NeId              string    `json:"neId" gorm:"column:ne_id"`
-	AlarmCode         string    `json:"alarmCode" gorm:"column:alarm_code"`
-	EventTime         time.Time `json:"eventTime" gorm:"column:event_time"`
-	AlarmType         string    `json:"alarmType" gorm:"column:alarm_type"`
-	OrigSeverity      string    `json:"origSeverity" gorm:"column:orig_severity"`           // 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
-	PerceivedSeverity string    `json:"perceivedSeverity" gorm:"column:perceived_severity"` // 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
-	PvFlag            string    `json:"pvFlag" gorm:"column:pv_flag"`
-	NeName            string    `json:"neName" gorm:"column:ne_name"`
-	ObjectUid         string    `json:"objectUid" gorm:"column:object_uid"`
-	ObjectName        string    `json:"objectName" gorm:"column:object_name"`
-	ObjectType        string    `json:"objectType" gorm:"column:object_type"`
-	LocationInfo      string    `json:"locationInfo" gorm:"column:location_info"`
-	Province          string    `json:"province" gorm:"column:province"`
-	AlarmStatus       string    `json:"alarmStatus" gorm:"column:alarm_status"` // 0:clear, 1:active
-	SpecificProblem   string    `json:"specificProblem" gorm:"column:specific_problem"`
-	SpecificProblemId string    `json:"specificProblemId" gorm:"column:specific_problem_id"`
-	AddInfo           string    `json:"addInfo" gorm:"column:add_info"`
-	Counter           string    `json:"counter" gorm:"column:counter"`
-	LatestEventTime   time.Time `json:"latestEventTime" gorm:"column:latest_event_time"`
-	AckState          string    `json:"ackState" gorm:"column:ack_state"` // 0: Unacked, 1: Acked
-	AckTime           time.Time `json:"ackTime" gorm:"column:ack_time"`
-	AckUser           string    `json:"ackUser" gorm:"column:ack_user"`
-	ClearType         string    `json:"clearType" gorm:"column:clear_type"` // 0: Unclear, 1: AutoClear, 2: ManualClear
-	ClearTime         time.Time `json:"clearTime" gorm:"column:clear_time"`
-	ClearUser         string    `json:"clearUser" gorm:"column:clear_user"`
-	Timestamp         time.Time `json:"timestamp" gorm:"column:timestamp"`
+	ID                int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType            string `json:"neType" gorm:"column:ne_type"`                        // 网元类型
+	NeId              string `json:"neId" gorm:"column:ne_id"`                            // 网元ID
+	NeName            string `json:"neName" gorm:"column:ne_name"`                        // 网元名称
+	Province          string `json:"province" gorm:"column:province"`                     // 网元省份地域
+	PvFlag            string `json:"pvFlag" gorm:"column:pv_flag"`                        // 网元标识虚拟化标识
+	AlarmSeq          int64  `json:"alarmSeq" gorm:"column:alarm_seq"`                    // 告警序号 同网元类型连续递增
+	AlarmId           string `json:"alarmId" gorm:"column:alarm_id"`                      // 告警ID
+	AlarmTitle        string `json:"alarmTitle" gorm:"column:alarm_title"`                // 告警标题
+	AlarmCode         int64  `json:"alarmCode" gorm:"column:alarm_code"`                  // 告警状态码
+	EventTime         int64  `json:"eventTime" gorm:"column:event_time"`                  // 事件产生时间 秒级
+	AlarmType         string `json:"alarmType" gorm:"column:alarm_type"`                  // 告警类型 CommunicationAlarm=1,EquipmentAlarm=2,ProcessingFailure=3,EnvironmentalAlarm=4,QualityOfServiceAlarm=5
+	OrigSeverity      string `json:"origSeverity" gorm:"column:orig_severity"`            // 严重程度 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
+	PerceivedSeverity string `json:"perceivedSeverity" gorm:"column:perceived_severity"`  // 告警级别 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
+	ObjectUid         string `json:"objectUid" gorm:"column:object_uid"`                  // 对象ID
+	ObjectName        string `json:"objectName" gorm:"column:object_name"`                // 对象名称
+	ObjectType        string `json:"objectType" gorm:"column:object_type"`                // 对象类型
+	LocationInfo      string `json:"locationInfo" gorm:"column:location_info"`            // 告警定位信息
+	AlarmStatus       string `json:"alarmStatus" gorm:"column:alarm_status"`              // 告警状态 0:clear, 1:active
+	SpecificProblem   string `json:"specificProblem" gorm:"column:specific_problem"`      // 告警问题原因
+	SpecificProblemId string `json:"specificProblemId" gorm:"column:specific_problem_id"` // 告警问题原因ID
+	AddInfo           string `json:"addInfo" gorm:"column:add_info"`                      // 告警辅助信息
+	AckState          int64  `json:"ackState" gorm:"column:ack_state"`                    // 确认状态 0: Unacked, 1: Acked
+	AckTime           int64  `json:"ackTime" gorm:"column:ack_time"`                      // 确认时间 秒级
+	AckUser           string `json:"ackUser" gorm:"column:ack_user"`                      // 确认用户
+	ClearType         int64  `json:"clearType" gorm:"column:clear_type"`                  // 清除状态 0: Unclear, 1: AutoClear, 2: ManualClear
+	ClearTime         int64  `json:"clearTime" gorm:"column:clear_time"`                  // 清除时间
+	ClearUser         string `json:"clearUser" gorm:"column:clear_user"`                  // 清除用户
+	Timestamp         int64  `json:"timestamp" gorm:"column:timestamp"`                   // 创建时间
 }
 
 // TableName 表名称
@@ -44,14 +40,18 @@ func (*Alarm) TableName() string {
 
 // AlarmQuery 告警数据查询参数结构体
 type AlarmQuery struct {
-	NeType       string `json:"neType" form:"neType" binding:"required"` // 网元类型
-	NeID         string `json:"neId" form:"neId" binding:"required"`
-	RmUID        string `json:"rmUID" form:"rmUID"`
-	OrigSeverity string `json:"origSeverity" form:"origSeverity"` // 告警类型 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
-	StartTime    string `json:"startTime" form:"startTime"`
-	EndTime      string `json:"endTime" form:"endTime"`
-	SortField    string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
-	SortOrder    string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
+	NeType       string `json:"neType" form:"neType"` // 网元类型
+	NeID         string `json:"neId" form:"neId"`     // 网元ID
+	NeName       string `json:"neName" form:"neName"`
+	PvFlag       string `json:"pvFlag" form:"pvFlag"`
+	AlarmCode    string `json:"alarmCode" form:"alarmCode"`
+	AlarmType    string `json:"alarmType" form:"alarmType"`
+	AlarmStatus  string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=0 1"` // 告警状态 0:clear, 1:active
+	OrigSeverity string `json:"origSeverity" form:"origSeverity"`                             // 告警类型 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
+	BeginTime    int64  `json:"beginTime" form:"beginTime"`                                   // 开始时间 查event_time
+	EndTime      int64  `json:"endTime" form:"endTime"`
+	SortField    string `json:"sortField" form:"sortField" binding:"omitempty,oneof=event_time id"` // 排序字段，填写结果字段
+	SortOrder    string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`      // 排序升降序，asc desc
 	PageNum      int64  `json:"pageNum" form:"pageNum" binding:"required"`
 	PageSize     int64  `json:"pageSize" form:"pageSize" binding:"required"`
 }

src/modules/network_data/model/alarm_event.go

@@ -0,0 +1,44 @@
+package model
+
+// AlarmEvent 告警_事件记录表
+type AlarmEvent struct {
+	ID                int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType            string `json:"neType" gorm:"column:ne_type"`                        // 网元类型
+	NeId              string `json:"neId" gorm:"column:ne_id"`                            // 网元ID
+	AlarmSeq          int64  `json:"alarmSeq" gorm:"column:alarm_seq"`                    // 告警序号 同网元类型连续递增
+	AlarmId           string `json:"alarmId" gorm:"column:alarm_id"`                      // 告警ID
+	AlarmTitle        string `json:"alarmTitle" gorm:"column:alarm_title"`                // 告警标题
+	AlarmCode         int64  `json:"alarmCode" gorm:"column:alarm_code"`                  // 告警状态码
+	EventTime         int64  `json:"eventTime" gorm:"column:event_time"`                  // 事件产生时间 秒级
+	ObjectUid         string `json:"objectUid" gorm:"column:object_uid"`                  // 对象ID
+	ObjectName        string `json:"objectName" gorm:"column:object_name"`                // 对象名称
+	ObjectType        string `json:"objectType" gorm:"column:object_type"`                // 对象类型
+	LocationInfo      string `json:"locationInfo" gorm:"column:location_info"`            // 告警定位信息
+	AlarmStatus       string `json:"alarmStatus" gorm:"column:alarm_status"`              // 告警状态 0:clear, 1:active
+	SpecificProblem   string `json:"specificProblem" gorm:"column:specific_problem"`      // 告警问题原因
+	SpecificProblemId string `json:"specificProblemId" gorm:"column:specific_problem_id"` // 告警问题原因ID
+	AddInfo           string `json:"addInfo" gorm:"column:add_info"`                      // 告警辅助信息
+	ClearType         int64  `json:"clearType" gorm:"column:clear_type"`                  // 清除状态 0: Unclear, 1: AutoClear, 2: ManualClear
+	ClearTime         int64  `json:"clearTime" gorm:"column:clear_time"`                  // 清除时间
+	ClearUser         string `json:"clearUser" gorm:"column:clear_user"`                  // 清除用户
+	Timestamp         int64  `json:"timestamp" gorm:"column:timestamp"`                   // 创建时间
+}
+
+// TableName 表名称
+func (*AlarmEvent) TableName() string {
+	return "alarm_event"
+}
+
+// AlarmEventQuery 告警事件数据查询参数结构体
+type AlarmEventQuery struct {
+	NeType      string `json:"neType" form:"neType"` // 网元类型
+	NeID        string `json:"neId" form:"neId"`     // 网元ID
+	AlarmCode   string `json:"alarmCode" form:"alarmCode"`
+	AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=0 1"` // 告警状态 0:clear, 1:active
+	BeginTime   int64  `json:"beginTime" form:"beginTime"`                                   // 开始时间 查event_time
+	EndTime     int64  `json:"endTime" form:"endTime"`
+	SortField   string `json:"sortField" form:"sortField" binding:"omitempty,oneof=event_time id"` // 排序字段，填写结果字段
+	SortOrder   string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`      // 排序升降序，asc desc
+	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`
+	PageSize    int64  `json:"pageSize" form:"pageSize" binding:"required"`
+}

src/modules/network_data/model/alarm_forward_log.go

@@ -0,0 +1,38 @@
+package model
+
+// AlarmForwardLog 告警_转发日志记录
+type AlarmForwardLog struct {
+	ID           int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType       string `json:"neType" gorm:"column:ne_type"`
+	NeId         string `json:"neId" gorm:"column:ne_id"`
+	AlarmSeq     int64  `json:"alarmSeq" gorm:"column:alarm_seq"`         // 告警序号 同网元类型连续递增
+	AlarmId      string `json:"alarmId" gorm:"column:alarm_id"`           // 告警ID
+	AlarmCode    int64  `json:"alarmCode" gorm:"column:alarm_code"`       // 告警状态码
+	AlarmTitle   string `json:"alarmTitle" gorm:"column:alarm_title"`     // 告警标题
+	AlarmStatus  string `json:"alarmStatus" gorm:"column:alarm_status"`   // 告警状态 0:clear, 1:active
+	OrigSeverity string `json:"origSeverity" gorm:"column:orig_severity"` // 严重程度 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
+	EventTime    int64  `json:"eventTime" gorm:"column:event_time"`       // 事件产生时间 秒级
+	CreatedAt    int64  `json:"createdAt" gorm:"column:created_at"`       // 创建时间
+	Type         string `json:"type" gorm:"column:type"`                  // 转发方式 SMS/EMAIL
+	Target       string `json:"target" gorm:"column:target"`              // 发送目标用户
+	Result       string `json:"result" gorm:"column:result"`              // 发送结果
+}
+
+// TableName 表名称
+func (*AlarmForwardLog) TableName() string {
+	return "alarm_forward_log"
+}
+
+// AlarmForwardLogQuery 告警转发日志数据查询参数结构体
+type AlarmForwardLogQuery struct {
+	NeType      string `json:"neType" form:"neType"` // 网元类型
+	NeID        string `json:"neId" form:"neId"`     // 网元ID
+	NeName      string `json:"neName" form:"neName"`
+	AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=0 1"` // 告警状态 0:clear, 1:active
+	BeginTime   int64  `json:"beginTime" form:"beginTime"`                                   // 开始时间 查event_time
+	EndTime     int64  `json:"endTime" form:"endTime"`
+	SortField   string `json:"sortField" form:"sortField" binding:"omitempty,oneof=event_time id"` // 排序字段，填写结果字段
+	SortOrder   string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`      // 排序升降序，asc desc
+	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`
+	PageSize    int64  `json:"pageSize" form:"pageSize" binding:"required"`
+}

src/modules/network_data/model/alarm_log.go

@@ -0,0 +1,35 @@
+package model
+
+// AlarmLog 告警_日志记录
+type AlarmLog struct {
+	ID           int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType       string `json:"neType" gorm:"column:ne_type"`
+	NeId         string `json:"neId" gorm:"column:ne_id"`
+	AlarmSeq     int64  `json:"alarmSeq" gorm:"column:alarm_seq"`         // 告警序号 同网元类型连续递增
+	AlarmId      string `json:"alarmId" gorm:"column:alarm_id"`           // 告警ID
+	AlarmCode    int64  `json:"alarmCode" gorm:"column:alarm_code"`       // 告警状态码
+	AlarmTitle   string `json:"alarmTitle" gorm:"column:alarm_title"`     // 告警标题
+	AlarmStatus  string `json:"alarmStatus" gorm:"column:alarm_status"`   // 告警状态 0:clear, 1:active
+	OrigSeverity string `json:"origSeverity" gorm:"column:orig_severity"` // 严重程度 1: Critical, 2: Major, 3: Minor, 4: Warning, 5: Event(Only VNF)
+	EventTime    int64  `json:"eventTime" gorm:"column:event_time"`       // 事件产生时间 秒级
+	CreatedAt    int64  `json:"createdAt" gorm:"column:created_at"`       // 创建时间
+}
+
+// TableName 表名称
+func (*AlarmLog) TableName() string {
+	return "alarm_log"
+}
+
+// AlarmLogQuery 告警日志数据查询参数结构体
+type AlarmLogQuery struct {
+	NeType      string `json:"neType" form:"neType"` // 网元类型
+	NeID        string `json:"neId" form:"neId"`     // 网元ID
+	NeName      string `json:"neName" form:"neName"`
+	AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"omitempty,oneof=0 1"` // 告警状态 0:clear, 1:active
+	BeginTime   int64  `json:"beginTime" form:"beginTime"`                                   // 开始时间 查event_time
+	EndTime     int64  `json:"endTime" form:"endTime"`
+	SortField   string `json:"sortField" form:"sortField" binding:"omitempty,oneof=event_time id"` // 排序字段，填写结果字段
+	SortOrder   string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`      // 排序升降序，asc desc
+	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`
+	PageSize    int64  `json:"pageSize" form:"pageSize" binding:"required"`
+}

src/modules/network_data/model/cdr_event_ims.go

@@ -1,16 +1,14 @@
 package model
 
-import "time"
-
 // CDREventIMS CDR会话对象IMS cdr_event_ims
 type CDREventIMS struct {
-	ID         string    `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType     string    `json:"neType" gorm:"column:ne_type"`
-	NeName     string    `json:"neName" gorm:"column:ne_name"`
-	RmUID      string    `json:"rmUID" gorm:"column:rm_uid"`
-	Timestamp  int64     `json:"timestamp" gorm:"column:timestamp"`
-	CDRJSONStr string    `json:"cdrJSON" gorm:"column:cdr_json"`
-	CreatedAt  time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
+	ID        int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType    string `json:"neType" gorm:"column:ne_type"`
+	NeName    string `json:"neName" gorm:"column:ne_name"`
+	RmUid     string `json:"rmUid" gorm:"column:rm_uid"`
+	Timestamp int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到的timestamp秒级存储毫秒时间戳
+	CdrJson   string `json:"cdrJSON" gorm:"column:cdr_json"`     // data JSON String
+	CreatedAt int64  `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -26,8 +24,8 @@ type CDREventIMSQuery struct {
 	RecordType  string `json:"recordType" form:"recordType"`   // 记录行为 MOC MTC
 	CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码
 	CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码
-	StartTime   string `json:"startTime" form:"startTime"`
-	EndTime     string `json:"endTime" form:"endTime"`
+	BeginTime   int64  `json:"beginTime" form:"beginTime"`     // 开始时间 查timestamp
+	EndTime     int64  `json:"endTime" form:"endTime"`
 	SortField   string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
 	SortOrder   string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
 	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`

src/modules/network_data/model/cdr_event_sgwc.go

@@ -1,18 +1,14 @@
 package model
 
-import "time"
-
 // CDREventSGWC CDR会话对象SGWC cdr_event_sgwc
 type CDREventSGWC struct {
-	ID         string    `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType     string    `json:"neType" gorm:"column:ne_type"`
-	NeName     string    `json:"neName" gorm:"column:ne_name"`
-	RmUID      string    `json:"rmUID" gorm:"column:rm_uid"`
-	Timestamp  int64     `json:"timestamp" gorm:"column:timestamp"`
-	CDRJSONStr string    `json:"cdrJSON" gorm:"column:cdr_json"`
-	CreatedAt  time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
-
-	// ====== 非数据库字段属性 ======
+	ID        int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType    string `json:"neType" gorm:"column:ne_type"`
+	NeName    string `json:"neName" gorm:"column:ne_name"`
+	RmUid     string `json:"rmUid" gorm:"column:rm_uid"`
+	Timestamp int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到的timestamp秒级存储毫秒时间戳
+	CdrJson   string `json:"cdrJSON" gorm:"column:cdr_json"`     // data JSON String
+	CreatedAt int64  `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -27,8 +23,8 @@ type CDREventSGWCQuery struct {
 	RmUID     string `json:"rmUID" form:"rmUID"`
 	IMSI      string `json:"imsi" form:"imsi"`
 	MSISDN    string `json:"msisdn" form:"msisdn"`
-	StartTime string `json:"startTime" form:"startTime"`
-	EndTime   string `json:"endTime" form:"endTime"`
+	BeginTime int64  `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp
+	EndTime   int64  `json:"endTime" form:"endTime"`
 	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
 	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
 	PageNum   int64  `json:"pageNum" form:"pageNum" binding:"required"`

src/modules/network_data/model/cdr_event_smf.go

@@ -1,18 +1,14 @@
 package model
 
-import "time"
-
 // CDREventSMF CDR会话对象SMF cdr_event_smf
 type CDREventSMF struct {
-	ID         string    `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType     string    `json:"neType" gorm:"column:ne_type"`
-	NeName     string    `json:"neName" gorm:"column:ne_name"`
-	RmUID      string    `json:"rmUID" gorm:"column:rm_uid"`
-	Timestamp  int64     `json:"timestamp" gorm:"column:timestamp"`
-	CDRJSONStr string    `json:"cdrJSON" gorm:"column:cdr_json"`
-	CreatedAt  time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
-
-	// ====== 非数据库字段属性 ======
+	ID        int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType    string `json:"neType" gorm:"column:ne_type"`
+	NeName    string `json:"neName" gorm:"column:ne_name"`
+	RmUid     string `json:"rmUid" gorm:"column:rm_uid"`
+	Timestamp int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到的timestamp秒级存储毫秒时间戳
+	CdrJson   string `json:"cdrJSON" gorm:"column:cdr_json"`     // data JSON String
+	CreatedAt int64  `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -28,8 +24,8 @@ type CDREventSMFQuery struct {
 	RecordType   string `json:"recordType" form:"recordType"` // 暂时没用到
 	SubscriberID string `json:"subscriberID" form:"subscriberID"`
 	DNN          string `json:"dnn" form:"dnn"`
-	StartTime    string `json:"startTime" form:"startTime"`
-	EndTime      string `json:"endTime" form:"endTime"`
+	BeginTime    int64  `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp
+	EndTime      int64  `json:"endTime" form:"endTime"`
 	SortField    string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
 	SortOrder    string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
 	PageNum      int64  `json:"pageNum" form:"pageNum" binding:"required"`

src/modules/network_data/model/cdr_event_smsc.go

@@ -1,16 +1,14 @@
 package model
 
-import "time"
-
 // CDREventSMSC CDR会话对象SMSC cdr_event_smsc
 type CDREventSMSC struct {
-	ID         string    `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType     string    `json:"neType" gorm:"column:ne_type"`
-	NeName     string    `json:"neName" gorm:"column:ne_name"`
-	RmUID      string    `json:"rmUID" gorm:"column:rm_uid"` // 可能没有
-	Timestamp  int64     `json:"timestamp" gorm:"column:timestamp"`
-	CDRJSONStr string    `json:"cdrJSON" gorm:"column:cdr_json"`
-	CreatedAt  time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
+	ID        int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType    string `json:"neType" gorm:"column:ne_type"`
+	NeName    string `json:"neName" gorm:"column:ne_name"`
+	RmUid     string `json:"rmUid" gorm:"column:rm_uid"`         // 可能没有
+	Timestamp int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到的timestamp秒级存储毫秒时间戳
+	CdrJson   string `json:"cdrJSON" gorm:"column:cdr_json"`     // data JSON String
+	CreatedAt int64  `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -26,8 +24,8 @@ type CDREventSMSCQuery struct {
 	RecordType  string `json:"recordType" form:"recordType"`   // 记录行为 MOSM MTSM
 	CallerParty string `json:"callerParty" form:"callerParty"` // 主叫号码
 	CalledParty string `json:"calledParty" form:"calledParty"` // 被叫号码
-	StartTime   string `json:"startTime" form:"startTime"`
-	EndTime     string `json:"endTime" form:"endTime"`
+	BeginTime   int64  `json:"beginTime" form:"beginTime"`     // 开始时间 查timestamp
+	EndTime     int64  `json:"endTime" form:"endTime"`
 	SortField   string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
 	SortOrder   string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
 	PageNum     int64  `json:"pageNum" form:"pageNum" binding:"required"`

src/modules/network_data/model/kpi_c_report.go

@@ -0,0 +1,52 @@
+package model
+
+// KpiCTitle 自定义指标标题信息对象 kpi_title
+type KpiCTitle struct {
+	ID          int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType      string `json:"neType" gorm:"column:ne_type"`
+	KpiId       string `json:"kpiId" gorm:"column:kpi_id"`
+	Title       string `json:"title" gorm:"column:title"`
+	Expression  string `json:"expression" gorm:"column:expression"`
+	Unit        string `json:"unit" gorm:"column:unit"`
+	Status      string `json:"status" gorm:"column:status"` // 0-Inactive/1-Active/2-Deleted
+	Description string `json:"description" gorm:"column:description"`
+	CreatedBy   string `json:"createdBy" gorm:"column:created_by"`
+	UpdatedAt   int64  `json:"updatedAt" gorm:"column:updated_at"`
+}
+
+// TableName 表名称
+func (*KpiCTitle) TableName() string {
+	return "kpi_c_title"
+}
+
+// KpiCReport 自定义指标报表信息对象
+type KpiCReport struct {
+	ID          int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType      string `json:"neType" gorm:"column:ne_type"`
+	NeName      string `json:"neName" gorm:"column:ne_name"`
+	RmUid       string `json:"rmUid" gorm:"column:rm_uid"`
+	Date        string `json:"date" gorm:"column:date"`               // Date of the report yyyy-mm-dd hh:mi:ss
+	StartTime   string `json:"startTime" gorm:"column:start_time"`    // Start time of the report hh:mi:ss
+	EndTime     string `json:"endTime" gorm:"column:end_time"`        // End time of the report hh:mi:ss
+	Index       int64  `json:"index" gorm:"column:index"`             // Index of the report
+	Granularity int64  `json:"granularity" gorm:"column:granularity"` // Time granualarity: 5/10/.../60/300 (second)
+	KpiValues   string `json:"kpiValues" gorm:"column:kpi_values"`    // KPI values JSON String
+	CreatedAt   int64  `json:"createdAt" gorm:"column:created_at"`    // Creation time
+}
+
+// TableName 表名称
+func (*KpiCReport) TableName() string {
+	return "kpi_c_report"
+}
+
+// KPICQuery 指标查询参数结构体
+type KPICQuery struct {
+	NeType    string `form:"neType" binding:"required"`
+	NeID      string `form:"neId" binding:"required"`
+	BeginTime int64  `form:"beginTime" binding:"required"` // 开始时间戳（毫秒）1739361200999
+	EndTime   int64  `form:"endTime" binding:"required"`   // 结束时间戳（毫秒）1739361210088
+	Interval  int64  `form:"interval" binding:"required,oneof=5 60 300 900 1800 3600"`
+	RmUID     string `form:"rmUID"`
+	SortField string `form:"sortField" binding:"omitempty,oneof=timeGroup"`
+	SortOrder string `form:"sortOrder" binding:"omitempty,oneof=asc desc"`
+}

src/modules/network_data/model/kpi_report.go

@@ -0,0 +1,48 @@
+package model
+
+// KpiTitle 指标标题信息对象 kpi_title
+type KpiTitle struct {
+	ID        int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType    string `json:"neType" gorm:"column:ne_type"` // 网元类型
+	KpiId     string `json:"kpiId" gorm:"column:kpi_id"`   // KPI标识
+	TitleJson string `json:"titleJson" gorm:"column:title_json"`
+	CnTitle   string `json:"cnTitle" gorm:"column:cn_title"` // 中文名
+	EnTitle   string `json:"enTitle" gorm:"column:en_title"` // 英文名
+}
+
+// TableName 表名称
+func (*KpiTitle) TableName() string {
+	return "kpi_title"
+}
+
+// KpiReport 指标报表信息对象
+type KpiReport struct {
+	ID          int64  `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType      string `json:"neType" gorm:"column:ne_type"`
+	NeName      string `json:"neName" gorm:"column:ne_name"`
+	RmUid       string `json:"rmUid" gorm:"column:rm_uid"`
+	Date        string `json:"date" gorm:"column:date"`               // Date of the report yyyy-mm-dd hh:mi:ss
+	StartTime   string `json:"startTime" gorm:"column:start_time"`    // Start time of the report hh:mi:ss
+	EndTime     string `json:"endTime" gorm:"column:end_time"`        // End time of the report hh:mi:ss
+	Index       int64  `json:"index" gorm:"column:index"`             // Index of the report
+	Granularity int64  `json:"granularity" gorm:"column:granularity"` // Time granualarity: 5/10/.../60/300 (second)
+	KpiValues   string `json:"kpiValues" gorm:"column:kpi_values"`    // KPI values JSON String
+	CreatedAt   int64  `json:"createdAt" gorm:"column:created_at"`    // Creation time 接收到的timestamp秒级存储毫秒时间戳
+}
+
+// TableName 表名称
+func (*KpiReport) TableName() string {
+	return "kpi_report"
+}
+
+// KPIQuery 指标查询参数结构体
+type KPIQuery struct {
+	NeType    string `form:"neType" binding:"required"`
+	NeID      string `form:"neId" binding:"required"`
+	BeginTime int64  `form:"beginTime" binding:"required"` // 开始时间戳（毫秒）1739361200999
+	EndTime   int64  `form:"endTime" binding:"required"`   // 结束时间戳（毫秒）1739361210088
+	Interval  int64  `form:"interval" binding:"required,oneof=5 60 300 900 1800 3600"`
+	RmUID     string `form:"rmUID"`
+	SortField string `form:"sortField" binding:"omitempty,oneof=timeGroup"`
+	SortOrder string `form:"sortOrder" binding:"omitempty,oneof=asc desc"`
+}

src/modules/network_data/model/perf_kpi.go

@@ -1,23 +0,0 @@
-package model
-
-// GoldKPITitle 黄金指标标题信息对象 kpi_title
-type GoldKPITitle struct {
-	ID        string `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType    string `json:"neType" gorm:"column:ne_type"`
-	KPIID     string `json:"kpiId" gorm:"column:kpi_id"`
-	TitleJson string `json:"titleJson" gorm:"column:title_json"`
-	CnTitle   string `json:"cnTitle" gorm:"column:cn_title"`
-	EnTitle   string `json:"enTitle" gorm:"column:en_title"`
-}
-
-// GoldKPIQuery 黄金指标查询参数结构体
-type GoldKPIQuery struct {
-	NeType    string `form:"neType" binding:"required"`
-	NeID      string `form:"neId" binding:"required"`
-	StartTime string `form:"startTime" binding:"required"`
-	EndTime   string `form:"endTime" binding:"required"`
-	Interval  int64  `form:"interval" binding:"required,oneof=5 60 300 900 1800 3600"`
-	RmUID     string `form:"rmUID"`
-	SortField string `form:"sortField" binding:"omitempty,oneof=timeGroup"`
-	SortOrder string `form:"sortOrder" binding:"omitempty,oneof=asc desc"`
-}

src/modules/network_data/model/udm_auth.go

@@ -1,6 +1,6 @@
 package model
 
-// UDMAuthUser UDM鉴权用户 u_auth_user
+// UDMAuthUser UDM鉴权用户 udm_auth
 type UDMAuthUser struct {
 	ID        string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID
 	IMSI      string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
@@ -13,5 +13,5 @@ type UDMAuthUser struct {
 
 // TableName 表名称
 func (*UDMAuthUser) TableName() string {
-	return "u_auth_user"
+	return "udm_auth"
 }

src/modules/network_data/model/udm_extend.go

@@ -1,7 +1,7 @@
 package model
 
-// UDMUserInfo UDM用户IMSI扩展信息 u_user_info
-type UDMUserInfo struct {
+// UDMExtend UDM用户IMSI扩展信息 udm_extend
+type UDMExtend struct {
 	ID     string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 默认ID
 	IMSI   string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
 	MSISDN string `json:"msisdn" gorm:"column:msisdn"`                  // 用户电话号码
@@ -10,6 +10,6 @@ type UDMUserInfo struct {
 }
 
 // TableName 表名称
-func (*UDMUserInfo) TableName() string {
-	return "u_user_info"
+func (*UDMExtend) TableName() string {
+	return "udm_extend"
 }

src/modules/network_data/model/udm_sub.go

@@ -1,6 +1,6 @@
 package model
 
-// UDMSubUser UDM签约用户 u_sub_user
+// UDMSubUser UDM签约用户 udm_sub
 type UDMSubUser struct {
 	ID     string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
 	IMSI   string `json:"imsi" gorm:"column:imsi"`                      // SIM卡/USIM卡ID
@@ -44,5 +44,5 @@ type UDMSubUser struct {
 
 // TableName 表名称
 func (*UDMSubUser) TableName() string {
-	return "u_sub_user"
+	return "udm_sub"
 }

src/modules/network_data/model/ue_event_amf.go

@@ -1,17 +1,15 @@
 package model
 
-import "time"
-
 // UEEventAMF UE会话对象AMF ue_event_amf
 type UEEventAMF struct {
-	ID           string    `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType       string    `json:"neType" gorm:"column:ne_type"`
-	NeName       string    `json:"neName" gorm:"column:ne_name"`
-	RmUID        string    `json:"rmUID" gorm:"column:rm_uid"` // 可能没有
-	Timestamp    int64     `json:"timestamp" gorm:"column:timestamp"`
-	EventType    string    `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state
-	EventJSONStr string    `json:"eventJSON" gorm:"column:event_json"`
-	CreatedAt    time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
+	ID           string `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType       string `json:"neType" gorm:"column:ne_type"`
+	NeName       string `json:"neName" gorm:"column:ne_name"`
+	RmUID        string `json:"rmUID" gorm:"column:rm_uid"`         // 可能没有
+	Timestamp    int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到的timestamp秒级存储毫秒时间戳
+	EventType    string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state
+	EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` // data JSON String
+	CreatedAt    int64  `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -26,8 +24,8 @@ type UEEventAMFQuery struct {
 	RmUID     string `json:"rmUID" form:"rmUID"`
 	EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state
 	IMSI      string `json:"imsi" form:"imsi"`           // imsi
-	StartTime string `json:"startTime" form:"startTime"`
-	EndTime   string `json:"endTime" form:"endTime"`
+	BeginTime int64  `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp
+	EndTime   int64  `json:"endTime" form:"endTime"`
 	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
 	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
 	PageNum   int64  `json:"pageNum" form:"pageNum" binding:"required"`

src/modules/network_data/model/ue_event_mme.go

@@ -1,17 +1,15 @@
 package model
 
-import "time"
-
 // UEEventMME UE会话对象MME ue_event_mme
 type UEEventMME struct {
-	ID           string    `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
-	NeType       string    `json:"neType" gorm:"column:ne_type"`
-	NeName       string    `json:"neName" gorm:"column:ne_name"`
-	RmUID        string    `json:"rmUID" gorm:"column:rm_uid"` // 可能没有
-	Timestamp    int64     `json:"timestamp" gorm:"column:timestamp"`
-	EventType    string    `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state
-	EventJSONStr string    `json:"eventJSON" gorm:"column:event_json"`
-	CreatedAt    time.Time `json:"createdAt" gorm:"column:created_at;default:CURRENT_TIMESTAMP"`
+	ID           string `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
+	NeType       string `json:"neType" gorm:"column:ne_type"`
+	NeName       string `json:"neName" gorm:"column:ne_name"`
+	RmUID        string `json:"rmUID" gorm:"column:rm_uid"`         // 可能没有
+	Timestamp    int64  `json:"timestamp" gorm:"column:timestamp"`  // 接收到的timestamp秒级存储毫秒时间戳
+	EventType    string `json:"eventType" gorm:"column:event_type"` // 事件类型 auth-result detach cm-state
+	EventJSONStr string `json:"eventJSON" gorm:"column:event_json"` // data JSON String
+	CreatedAt    int64  `json:"createdAt" gorm:"column:created_at"` // 记录创建存储毫秒
 }
 
 // TableName 表名称
@@ -26,8 +24,8 @@ type UEEventMMEQuery struct {
 	RmUID     string `json:"rmUID" form:"rmUID"`
 	EventType string `json:"eventType" form:"eventType"` // 事件类型 auth-result detach cm-state
 	IMSI      string `json:"imsi" form:"imsi"`           // imsi
-	StartTime string `json:"startTime" form:"startTime"`
-	EndTime   string `json:"endTime" form:"endTime"`
+	BeginTime int64  `json:"beginTime" form:"beginTime"` // 开始时间 查timestamp
+	EndTime   int64  `json:"endTime" form:"endTime"`
 	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=timestamp"` // 排序字段，填写结果字段
 	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`  // 排序升降序，asc desc
 	PageNum   int64  `json:"pageNum" form:"pageNum" binding:"required"`

src/modules/network_data/network_data.go

@@ -21,11 +21,11 @@ func Setup(router *gin.Engine) {
 	{
 		kpiGroup.GET("/title",
 			middleware.PreAuthorize(nil),
-			controller.NewPerfKPI.Title,
+			controller.NewKPI.KPITitle,
 		)
 		kpiGroup.GET("/data",
 			middleware.PreAuthorize(nil),
-			controller.NewPerfKPI.GoldKPI,
+			controller.NewKPI.KPIData,
 		)
 	}
 
@@ -36,7 +36,7 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewAlarm.List,
 		)
-		alarmGroup.DELETE("/:alarmIds",
+		alarmGroup.DELETE("/:id",
 			middleware.PreAuthorize(nil),
 			controller.NewAlarm.Remove,
 		)
@@ -62,7 +62,7 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewIMS.CDRList,
 		)
-		imsGroup.DELETE("/cdr/:cdrIds",
+		imsGroup.DELETE("/cdr/:id",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.imsCDR", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewIMS.CDRRemove,
@@ -89,7 +89,7 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewSMSC.CDRList,
 		)
-		smscGroup.DELETE("/cdr/:cdrIds",
+		smscGroup.DELETE("/cdr/:id",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smscCDR", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewSMSC.CDRRemove,
@@ -108,7 +108,7 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewSMF.CDRList,
 		)
-		smfGroup.DELETE("/cdr/:cdrIds",
+		smfGroup.DELETE("/cdr/:id",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.smfCDR", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewSMF.CDRRemove,
@@ -135,7 +135,7 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewAMF.UEList,
 		)
-		amfGroup.DELETE("/ue/:ueIds",
+		amfGroup.DELETE("/ue/:id",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.amfUE", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewAMF.UERemove,
@@ -206,7 +206,7 @@ func Setup(router *gin.Engine) {
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewUDMAuth.Removes,
 		)
-		udmAuthGroup.POST("/export",
+		udmAuthGroup.GET("/export",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_EXPORT)),
 			controller.NewUDMAuth.Export,
@@ -260,7 +260,7 @@ func Setup(router *gin.Engine) {
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewUDMSub.Removes,
 		)
-		udmSubGroup.POST("/export",
+		udmSubGroup.GET("/export",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_EXPORT)),
 			controller.NewUDMSub.Export,
@@ -279,7 +279,7 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewMME.UEList,
 		)
-		mmeGroup.DELETE("/ue/:ueIds",
+		mmeGroup.DELETE("/ue/:id",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.mmeUE", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewMME.UERemove,
@@ -306,7 +306,7 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewSGWC.CDRList,
 		)
-		sgwcGroup.DELETE("/cdr/:cdrIds",
+		sgwcGroup.DELETE("/cdr/:id",
 			middleware.PreAuthorize(nil),
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.sgwcCDR", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewSGWC.CDRRemove,

src/modules/network_data/repository/alarm.go

@@ -0,0 +1,194 @@
+package repository
+
+import (
+	"strings"
+	"time"
+
+	"be.ems/src/framework/database/db"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 Alarm 结构体
+var NewAlarm = &Alarm{}
+
+// Alarm 告警 数据层处理
+type Alarm struct{}
+
+// SelectByPage 分页查询集合
+func (r Alarm) SelectByPage(query model.AlarmQuery) ([]model.Alarm, int64) {
+	tx := db.DB("").Model(&model.Alarm{})
+	// 查询条件拼接
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
+	}
+	if query.NeID != "" {
+		tx = tx.Where("ne_id = ?", query.NeID)
+	}
+	if query.NeName != "" {
+		tx = tx.Where("ne_name = ?", query.NeName)
+	}
+	if query.PvFlag != "" {
+		tx = tx.Where("pv_flag = ?", query.PvFlag)
+	}
+	if query.AlarmCode != "" {
+		tx = tx.Where("alarm_code = ?", query.AlarmCode)
+	}
+	if query.AlarmType != "" {
+		tx = tx.Where("alarm_type in (?)", strings.Split(query.AlarmType, ","))
+	}
+	if query.AlarmStatus != "" {
+		tx = tx.Where("alarm_status = ?", query.AlarmStatus)
+	}
+	if query.OrigSeverity != "" {
+		tx = tx.Where("orig_severity in (?)", strings.Split(query.OrigSeverity, ","))
+	}
+
+	if query.BeginTime != 0 {
+		tx = tx.Where("event_time >= ?", query.BeginTime)
+	}
+	if query.EndTime != 0 {
+		tx = tx.Where("event_time <= ?", query.EndTime)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.Alarm{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// Select 查询集合
+func (r Alarm) Select(param model.Alarm) []model.Alarm {
+	tx := db.DB("").Model(&model.Alarm{})
+	// 查询条件拼接
+	if param.NeType != "" {
+		tx = tx.Where("ne_type = ?", param.NeType)
+	}
+	if param.NeId != "" {
+		tx = tx.Where("ne_id = ?", param.NeId)
+	}
+	if param.NeName != "" {
+		tx = tx.Where("ne_name = ?", param.NeName)
+	}
+	if param.AlarmCode > 0 {
+		tx = tx.Where("alarm_code = ?", param.AlarmCode)
+	}
+	if param.AlarmType != "" {
+		tx = tx.Where("alarm_type = ?", param.AlarmType)
+	}
+	if param.AlarmId != "" {
+		tx = tx.Where("alarm_id = ?", param.AlarmId)
+	}
+	if param.OrigSeverity != "" {
+		eventTypes := strings.Split(param.OrigSeverity, ",")
+		tx = tx.Where("orig_severity in (%s)", eventTypes)
+	}
+	if param.PvFlag != "" {
+		tx = tx.Where("pv_flag = ?", param.PvFlag)
+	}
+
+	// 查询数据
+	rows := []model.Alarm{}
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// SelectByIds 通过ID查询
+func (r Alarm) SelectByIds(ids []int64) []model.Alarm {
+	rows := []model.Alarm{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := db.DB("").Model(&model.Alarm{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// Insert 新增信息 返回新增数据ID
+func (r Alarm) Insert(param model.Alarm) int64 {
+	if param.Timestamp == 0 {
+		param.Timestamp = time.Now().UnixMilli()
+	}
+	// 执行插入
+	if err := db.DB("").Create(&param).Error; err != nil {
+		logger.Errorf("insert err => %v", err.Error())
+		return 0
+	}
+	return param.ID
+}
+
+// Update 修改信息 返回受影响的行数
+func (r Alarm) Update(param model.Alarm) int64 {
+	if param.ID <= 0 {
+		return 0
+	}
+	tx := db.DB("").Model(&model.Alarm{})
+	// 构建查询条件
+	tx = tx.Where("id = ?", param.ID)
+	tx = tx.Omit("id", "timestamp")
+	// 执行更新
+	if err := tx.Updates(param).Error; err != nil {
+		logger.Errorf("update err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// DeleteByIds 批量删除信息
+func (r Alarm) DeleteByIds(ids []int64) int64 {
+	if len(ids) <= 0 {
+		return 0
+	}
+	tx := db.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.Alarm{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// SelectAlarmSeqLast 查询网元告警最后一条序号
+func (r Alarm) SelectAlarmSeqLast(neType, neId string) int64 {
+	tx := db.DB("").Model(&model.Alarm{})
+	tx = tx.Where("ne_type=? and ne_id=?", neType, neId)
+	tx = tx.Select("alarm_seq").Order("alarm_seq DESC")
+	// 查询数据
+	var alarmSeq int64 = 0
+	if err := tx.Limit(1).Find(&alarmSeq).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return alarmSeq
+	}
+	return alarmSeq
+}

src/modules/network_data/repository/alarm_event.go

@@ -0,0 +1,169 @@
+package repository
+
+import (
+	"time"
+
+	"be.ems/src/framework/database/db"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 AlarmEvent 结构体
+var NewAlarmEvent = &AlarmEvent{}
+
+// AlarmEvent 告警 数据层处理
+type AlarmEvent struct{}
+
+// SelectByPage 分页查询集合
+func (r AlarmEvent) SelectByPage(query model.AlarmEventQuery) ([]model.AlarmEvent, int64) {
+	tx := db.DB("").Model(&model.AlarmEvent{})
+	// 查询条件拼接
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
+	}
+	if query.NeID != "" {
+		tx = tx.Where("ne_id = ?", query.NeID)
+	}
+	if query.AlarmCode != "" {
+		tx = tx.Where("alarm_code = ?", query.AlarmCode)
+	}
+	if query.AlarmStatus != "" {
+		tx = tx.Where("alarm_status = ?", query.AlarmStatus)
+	}
+	if query.BeginTime != 0 {
+		tx = tx.Where("event_time >= ?", query.BeginTime)
+	}
+	if query.EndTime != 0 {
+		tx = tx.Where("event_time <= ?", query.EndTime)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.AlarmEvent{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// Select 查询集合
+func (r AlarmEvent) Select(param model.AlarmEvent) []model.AlarmEvent {
+	tx := db.DB("").Model(&model.AlarmEvent{})
+	// 查询条件拼接
+	if param.NeType != "" {
+		tx = tx.Where("ne_type = ?", param.NeType)
+	}
+	if param.NeId != "" {
+		tx = tx.Where("ne_id = ?", param.NeId)
+	}
+	if param.AlarmId != "" {
+		tx = tx.Where("alarm_id = ?", param.AlarmId)
+	}
+	if param.AlarmCode != 0 {
+		tx = tx.Where("alarm_code = ?", param.AlarmCode)
+	}
+	if param.AlarmStatus != "" {
+		tx = tx.Where("alarm_status = ?", param.AlarmStatus)
+	}
+	// 查询数据
+	rows := []model.AlarmEvent{}
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// SelectByIds 通过ID查询
+func (r AlarmEvent) SelectByIds(ids []int64) []model.AlarmEvent {
+	rows := []model.AlarmEvent{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := db.DB("").Model(&model.AlarmEvent{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// Insert 新增信息 返回新增数据ID
+func (r AlarmEvent) Insert(param model.AlarmEvent) int64 {
+	if param.Timestamp == 0 {
+		param.Timestamp = time.Now().UnixMilli()
+	}
+	// 执行插入
+	if err := db.DB("").Create(&param).Error; err != nil {
+		logger.Errorf("insert err => %v", err.Error())
+		return 0
+	}
+	return param.ID
+}
+
+// Update 修改信息 返回受影响的行数
+func (r AlarmEvent) Update(param model.AlarmEvent) int64 {
+	if param.ID <= 0 {
+		return 0
+	}
+	tx := db.DB("").Model(&model.AlarmEvent{})
+	// 构建查询条件
+	tx = tx.Where("id = ?", param.ID)
+	tx = tx.Omit("id", "timestamp")
+	// 执行更新
+	if err := tx.Updates(param).Error; err != nil {
+		logger.Errorf("update err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// DeleteByIds 批量删除信息
+func (r AlarmEvent) DeleteByIds(ids []int64) int64 {
+	if len(ids) <= 0 {
+		return 0
+	}
+	tx := db.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.AlarmEvent{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// SelectAlarmEventSeqLast 查询网元告警最后一条序号
+func (r AlarmEvent) SelectAlarmEventSeqLast(neType, neId string) int64 {
+	tx := db.DB("").Model(&model.AlarmEvent{})
+	tx = tx.Where("ne_type=? and ne_id=?", neType, neId)
+	tx = tx.Select("alarm_seq").Order("alarm_seq DESC")
+	// 查询数据
+	var AlarmEventSeq int64 = 0
+	if err := tx.Limit(1).Find(&AlarmEventSeq).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return AlarmEventSeq
+	}
+	return AlarmEventSeq
+}

src/modules/network_data/repository/alarm_forward_log.go

@@ -0,0 +1,104 @@
+package repository
+
+import (
+	"time"
+
+	"be.ems/src/framework/database/db"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 AlarmForwardLog 结构体
+var NewAlarmForwardLog = &AlarmForwardLog{}
+
+// AlarmForwardLog 基站状态记录表 数据层处理
+type AlarmForwardLog struct{}
+
+// SelectByPage 分页查询集合
+func (r AlarmForwardLog) SelectByPage(query model.AlarmForwardLogQuery) ([]model.AlarmForwardLog, int64) {
+	tx := db.DB("").Model(&model.AlarmForwardLog{})
+	// 查询条件拼接
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
+	}
+	if query.NeID != "" {
+		tx = tx.Where("ne_id = ?", query.NeID)
+	}
+	if query.BeginTime != 0 {
+		tx = tx.Where("create_time >= ?", query.BeginTime)
+	}
+	if query.EndTime != 0 {
+		tx = tx.Where("create_time <= ?", query.EndTime)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.AlarmForwardLog{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r AlarmForwardLog) SelectByIds(ids []int64) []model.AlarmForwardLog {
+	rows := []model.AlarmForwardLog{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := db.DB("").Model(&model.AlarmForwardLog{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// DeleteByIds 批量删除信息
+func (r AlarmForwardLog) DeleteByIds(ids []int64) int64 {
+	if len(ids) <= 0 {
+		return 0
+	}
+	tx := db.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.AlarmForwardLog{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// Insert 新增信息
+func (r AlarmForwardLog) Insert(param model.AlarmForwardLog) int64 {
+	if param.CreatedAt == 0 {
+		param.CreatedAt = time.Now().UnixMilli()
+	}
+	// 执行插入
+	if err := db.DB("").Create(&param).Error; err != nil {
+		logger.Errorf("insert err => %v", err.Error())
+		return 0
+	}
+	return param.ID
+}

src/modules/network_data/repository/alarm_log.go

@@ -0,0 +1,104 @@
+package repository
+
+import (
+	"time"
+
+	"be.ems/src/framework/database/db"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 AlarmLog 结构体
+var NewAlarmLog = &AlarmLog{}
+
+// AlarmLog 基站状态记录表 数据层处理
+type AlarmLog struct{}
+
+// SelectByPage 分页查询集合
+func (r AlarmLog) SelectByPage(query model.AlarmLogQuery) ([]model.AlarmLog, int64) {
+	tx := db.DB("").Model(&model.AlarmLog{})
+	// 查询条件拼接
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
+	}
+	if query.NeID != "" {
+		tx = tx.Where("ne_id = ?", query.NeID)
+	}
+	if query.BeginTime != 0 {
+		tx = tx.Where("create_time >= ?", query.BeginTime)
+	}
+	if query.EndTime != 0 {
+		tx = tx.Where("create_time <= ?", query.EndTime)
+	}
+
+	// 查询结果
+	var total int64 = 0
+	rows := []model.AlarmLog{}
+
+	// 查询数量为0直接返回
+	if err := tx.Count(&total).Error; err != nil || total <= 0 {
+		return rows, total
+	}
+
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
+			sortField = sortField + " desc"
+		}
+		tx = tx.Order(sortField)
+	}
+
+	// 查询数据分页
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
+	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
+	err := tx.Find(&rows).Error
+	if err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows, total
+	}
+	return rows, total
+}
+
+// SelectByIds 通过ID查询
+func (r AlarmLog) SelectByIds(ids []int64) []model.AlarmLog {
+	rows := []model.AlarmLog{}
+	if len(ids) <= 0 {
+		return rows
+	}
+	tx := db.DB("").Model(&model.AlarmLog{})
+	// 构建查询条件
+	tx = tx.Where("id in ?", ids)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// DeleteByIds 批量删除信息
+func (r AlarmLog) DeleteByIds(ids []int64) int64 {
+	if len(ids) <= 0 {
+		return 0
+	}
+	tx := db.DB("").Where("id in ?", ids)
+	if err := tx.Delete(&model.AlarmLog{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}
+
+// Insert 新增信息
+func (r AlarmLog) Insert(param model.AlarmLog) int64 {
+	if param.CreatedAt == 0 {
+		param.CreatedAt = time.Now().UnixMilli()
+	}
+	// 执行插入
+	if err := db.DB("").Create(&param).Error; err != nil {
+		logger.Errorf("insert err => %v", err.Error())
+		return 0
+	}
+	return param.ID
+}

src/modules/network_data/repository/all_alarm.go

@@ -1,103 +0,0 @@
-package repository
-
-import (
-	"strings"
-
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 Alarm 结构体
-var NewAlarm = &Alarm{}
-
-// Alarm 告警 数据层处理
-type Alarm struct{}
-
-// SelectByPage 分页查询集合
-func (r Alarm) SelectByPage(querys model.AlarmQuery) ([]model.Alarm, int64) {
-	tx := datasource.DB("").Model(&model.Alarm{})
-	// 查询条件拼接
-	if querys.NeType != "" {
-		tx = tx.Where("ne_type = ?", querys.NeType)
-	}
-	if querys.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", querys.RmUID)
-	}
-	if querys.StartTime != "" {
-		startTime := querys.StartTime
-		if len(startTime) == 13 {
-			startTime = startTime[:10]
-		}
-		tx = tx.Where("timestamp >= ?", startTime)
-	}
-	if querys.EndTime != "" {
-		endTime := querys.EndTime
-		if len(endTime) == 13 {
-			endTime = endTime[:10]
-		}
-		tx = tx.Where("timestamp <= ?", endTime)
-	}
-	if querys.OrigSeverity != "" {
-		eventTypes := strings.Split(querys.OrigSeverity, ",")
-		tx = tx.Where("orig_severity in (%s)", eventTypes)
-	}
-
-	// 查询结果
-	var total int64 = 0
-	rows := []model.Alarm{}
-
-	// 查询数量为0直接返回
-	if err := tx.Count(&total).Error; err != nil || total <= 0 {
-		return rows, total
-	}
-
-	// 排序
-	if querys.SortField != "" {
-		sortField := querys.SortField
-		if querys.SortOrder == "desc" {
-			sortField = sortField + " desc"
-		}
-		tx = tx.Order(sortField)
-	}
-
-	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
-	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
-	err := tx.Find(&rows).Error
-	if err != nil {
-		logger.Errorf("query find err => %v", err.Error())
-		return rows, total
-	}
-	return rows, total
-}
-
-// SelectByIds 通过ID查询
-func (r *Alarm) SelectByIds(ids []string) []model.Alarm {
-	rows := []model.Alarm{}
-	if len(ids) <= 0 {
-		return rows
-	}
-	tx := datasource.DB("").Model(&model.Alarm{})
-	// 构建查询条件
-	tx = tx.Where("id in ?", ids)
-	// 查询数据
-	if err := tx.Find(&rows).Error; err != nil {
-		logger.Errorf("query find err => %v", err.Error())
-		return rows
-	}
-	return rows
-}
-
-// DeleteByIds 批量删除信息
-func (r *Alarm) DeleteByIds(ids []string) int64 {
-	if len(ids) <= 0 {
-		return 0
-	}
-	tx := datasource.DB("").Where("id in ?", ids)
-	if err := tx.Delete(&model.Alarm{}).Error; err != nil {
-		logger.Errorf("delete err => %v", err.Error())
-		return 0
-	}
-	return tx.RowsAffected
-}

src/modules/network_data/repository/all_perf_kpi.go

@@ -1,131 +0,0 @@
-package repository
-
-import (
-	"fmt"
-	"strings"
-
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/modules/network_data/model"
-)
-
-// 实例化数据层 PerfKPI 结构体
-var NewPerfKPI = &PerfKPI{}
-
-// PerfKPI 性能统计 数据层处理
-type PerfKPI struct{}
-
-// SelectGoldKPI 通过网元指标数据信息
-func (r *PerfKPI) SelectGoldKPI(query model.GoldKPIQuery, kpiIds []string) []map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	var tableName string = "kpi_report_"
-	if query.RmUID != "" {
-		conditions = append(conditions, "gk.rm_uid = ?")
-		params = append(params, query.RmUID)
-	}
-	if query.NeType != "" {
-		//conditions = append(conditions, "gk.ne_type = ?")
-		// params = append(params, query.NeType)
-		tableName += strings.ToLower(query.NeType)
-	}
-	if query.StartTime != "" {
-		conditions = append(conditions, "gk.created_at >= ?")
-		params = append(params, query.StartTime)
-	}
-	if query.EndTime != "" {
-		conditions = append(conditions, "gk.created_at <= ?")
-		params = append(params, query.EndTime)
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	// 查询字段列
-	var fields = []string{
-		// fmt.Sprintf("FROM_UNIXTIME(FLOOR(gk.created_at / (%d * 1000)) * %d) AS timeGroup", query.Interval, query.Interval),
-		fmt.Sprintf("CONCAT(FLOOR(gk.created_at / (%d * 1000)) * (%d * 1000)) AS timeGroup", query.Interval, query.Interval), // 时间戳毫秒
-		"min(CASE WHEN gk.index != '' THEN gk.index ELSE 0 END) AS startIndex",
-		"min(CASE WHEN gk.ne_type != '' THEN gk.ne_type ELSE 0 END) AS neType",
-		"min(CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END) AS neName",
-	}
-	for i, kid := range kpiIds {
-		// 特殊字段，只取最后一次收到的非0值
-		if kid == "AMF.01" || kid == "UDM.01" || kid == "UDM.02" || kid == "UDM.03" || kid == "SMF.01" {
-			str := fmt.Sprintf("IFNULL(SUBSTRING_INDEX(GROUP_CONCAT( CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') END  ), ',', 1), 0) AS '%s'", i, kid, i, kid)
-			fields = append(fields, str)
-		} else {
-			str := fmt.Sprintf("sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[%d].kpi_id') = '%s' THEN JSON_EXTRACT(gk.kpi_values, '$[%d].value') ELSE 0 END) AS '%s'", i, kid, i, kid)
-			fields = append(fields, str)
-		}
-	}
-	fieldsSql := strings.Join(fields, ",")
-
-	// 查询数据
-	if query.SortField == "" {
-		query.SortField = "timeGroup"
-	}
-	if query.SortOrder == "" {
-		query.SortOrder = "desc"
-	}
-	orderSql := fmt.Sprintf(" order by %s %s", query.SortField, query.SortOrder)
-	querySql := fmt.Sprintf("SELECT %s FROM %s gk %s GROUP BY timeGroup %s", fieldsSql, tableName, whereSql, orderSql)
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-	return results
-}
-
-// SelectGoldKPITitle 网元对应的指标名称
-func (r *PerfKPI) SelectGoldKPITitle(neType string) []model.GoldKPITitle {
-	result := []model.GoldKPITitle{}
-	tx := datasource.DefaultDB().Table("kpi_title").Where("ne_type = ?", neType).Find(&result)
-	if err := tx.Error; err != nil {
-		logger.Errorf("Find err => %v", err)
-	}
-	return result
-}
-
-// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
-func (r *PerfKPI) SelectUPFTotalFlow(neType, rmUID, startDate, endDate string) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if neType != "" {
-		conditions = append(conditions, "kupf.ne_type = ?")
-		params = append(params, neType)
-	}
-	if rmUID != "" {
-		conditions = append(conditions, "kupf.rm_uid = ?")
-		params = append(params, rmUID)
-	}
-	if startDate != "" {
-		conditions = append(conditions, "kupf.created_at >= ?")
-		params = append(params, startDate)
-	}
-	if endDate != "" {
-		conditions = append(conditions, "kupf.created_at <= ?")
-		params = append(params, endDate)
-	}
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	// 查询数据
-	querySql := `SELECT 
-	sum( CASE WHEN  JSON_EXTRACT(kupf.kpi_values, '$[2].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(kupf.kpi_values, '$[2].value') ELSE 0 END ) AS 'up', 
-	sum( CASE WHEN  JSON_EXTRACT(kupf.kpi_values, '$[5].kpi_id') = 'UPF.06' THEN JSON_EXTRACT(kupf.kpi_values, '$[5].value') ELSE 0 END ) AS 'down' 
-	FROM kpi_report_upf kupf`
-	results, err := datasource.RawDB("", querySql+whereSql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-	return results[0]
-}

src/modules/network_data/repository/cdr_event_ims.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
@@ -16,43 +16,35 @@ var NewCDREventIMS = &CDREventIMS{}
 type CDREventIMS struct{}
 
 // SelectByPage 分页查询集合
-func (r CDREventIMS) SelectByPage(querys model.CDREventIMSQuery) ([]model.CDREventIMS, int64) {
-	tx := datasource.DB("").Model(&model.CDREventIMS{})
+func (r CDREventIMS) SelectByPage(query model.CDREventIMSQuery) ([]model.CDREventIMS, int64) {
+	tx := db.DB("").Model(&model.CDREventIMS{})
 	// 查询条件拼接
-	if querys.NeType != "" {
-		tx = tx.Where("ne_type = ?", querys.NeType)
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if querys.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
 	}
-	if querys.StartTime != "" {
-		startTime := querys.StartTime
-		if len(startTime) == 13 {
-			startTime = startTime[:10]
-		}
-		tx = tx.Where("timestamp >= ?", startTime)
+	if query.BeginTime != 0 {
+		tx = tx.Where("timestamp >= ?", query.BeginTime)
 	}
-	if querys.EndTime != "" {
-		endTime := querys.EndTime
-		if len(endTime) == 13 {
-			endTime = endTime[:10]
-		}
-		tx = tx.Where("timestamp <= ?", endTime)
+	if query.EndTime != 0 {
+		tx = tx.Where("timestamp <= ?", query.EndTime)
 	}
-	if querys.CallerParty != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", querys.CallerParty)
+	if query.CallerParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", query.CallerParty)
 	}
-	if querys.CalledParty != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.calledParty') = ?", querys.CalledParty)
+	if query.CalledParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.calledParty') = ?", query.CalledParty)
 	}
 
-	if querys.RecordType != "" {
-		recordTypes := strings.Split(querys.RecordType, ",")
-		var queryStrArr []string
+	if query.RecordType != "" {
+		recordTypes := strings.Split(query.RecordType, ",")
+		var querytrArr []string
 		for _, recordType := range recordTypes {
-			queryStrArr = append(queryStrArr, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
+			querytrArr = append(querytrArr, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
 		}
-		tx = tx.Where(fmt.Sprintf("( %s )", strings.Join(queryStrArr, " OR ")))
+		tx = tx.Where(fmt.Sprintf("( %s )", strings.Join(querytrArr, " OR ")))
 	}
 
 	// 查询结果
@@ -65,16 +57,16 @@ func (r CDREventIMS) SelectByPage(querys model.CDREventIMSQuery) ([]model.CDREve
 	}
 
 	// 排序
-	if querys.SortField != "" {
-		sortField := querys.SortField
-		if querys.SortOrder == "desc" {
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
 			sortField = sortField + " desc"
 		}
 		tx = tx.Order(sortField)
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -85,12 +77,12 @@ func (r CDREventIMS) SelectByPage(querys model.CDREventIMSQuery) ([]model.CDREve
 }
 
 // SelectByIds 通过ID查询
-func (r *CDREventIMS) SelectByIds(ids []string) []model.CDREventIMS {
+func (r *CDREventIMS) SelectByIds(ids []int64) []model.CDREventIMS {
 	rows := []model.CDREventIMS{}
 	if len(ids) <= 0 {
 		return rows
 	}
-	tx := datasource.DB("").Model(&model.CDREventIMS{})
+	tx := db.DB("").Model(&model.CDREventIMS{})
 	// 构建查询条件
 	tx = tx.Where("id in ?", ids)
 	// 查询数据
@@ -102,11 +94,11 @@ func (r *CDREventIMS) SelectByIds(ids []string) []model.CDREventIMS {
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventIMS) DeleteByIds(ids []string) int64 {
+func (r *CDREventIMS) DeleteByIds(ids []int64) int64 {
 	if len(ids) <= 0 {
 		return 0
 	}
-	tx := datasource.DB("").Where("id in ?", ids)
+	tx := db.DB("").Where("id in ?", ids)
 	if err := tx.Delete(&model.CDREventIMS{}).Error; err != nil {
 		logger.Errorf("delete err => %v", err.Error())
 		return 0

src/modules/network_data/repository/cdr_event_sgwc.go

@@ -1,7 +1,7 @@
 package repository
 
 import (
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
@@ -13,34 +13,26 @@ var NewCDREventSGWC = &CDREventSGWC{}
 type CDREventSGWC struct{}
 
 // SelectByPage 分页查询集合
-func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDREventSGWC, int64) {
-	tx := datasource.DB("").Model(&model.CDREventSGWC{})
+func (r CDREventSGWC) SelectByPage(query model.CDREventSGWCQuery) ([]model.CDREventSGWC, int64) {
+	tx := db.DB("").Model(&model.CDREventSGWC{})
 	// 查询条件拼接
-	if querys.NeType != "" {
-		tx = tx.Where("ne_type = ?", querys.NeType)
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if querys.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
 	}
-	if querys.StartTime != "" {
-		startTime := querys.StartTime
-		if len(startTime) == 13 {
-			startTime = startTime[:10]
-		}
-		tx = tx.Where("timestamp >= ?", startTime)
+	if query.BeginTime != 0 {
+		tx = tx.Where("timestamp >= ?", query.BeginTime)
 	}
-	if querys.EndTime != "" {
-		endTime := querys.EndTime
-		if len(endTime) == 13 {
-			endTime = endTime[:10]
-		}
-		tx = tx.Where("timestamp <= ?", endTime)
+	if query.EndTime != 0 {
+		tx = tx.Where("timestamp <= ?", query.EndTime)
 	}
-	if querys.IMSI != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedIMSI') = ?", querys.IMSI)
+	if query.IMSI != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedIMSI') = ?", query.IMSI)
 	}
-	if querys.MSISDN != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedMSISDN') = ?", querys.MSISDN)
+	if query.MSISDN != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedMSISDN') = ?", query.MSISDN)
 	}
 
 	// 查询结果
@@ -53,16 +45,16 @@ func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDRE
 	}
 
 	// 排序
-	if querys.SortField != "" {
-		sortField := querys.SortField
-		if querys.SortOrder == "desc" {
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
 			sortField = sortField + " desc"
 		}
 		tx = tx.Order(sortField)
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -73,12 +65,12 @@ func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDRE
 }
 
 // SelectByIds 通过ID查询
-func (r *CDREventSGWC) SelectByIds(ids []string) []model.CDREventSGWC {
+func (r *CDREventSGWC) SelectByIds(ids []int64) []model.CDREventSGWC {
 	rows := []model.CDREventSGWC{}
 	if len(ids) <= 0 {
 		return rows
 	}
-	tx := datasource.DB("").Model(&model.CDREventSGWC{})
+	tx := db.DB("").Model(&model.CDREventSGWC{})
 	// 构建查询条件
 	tx = tx.Where("id in ?", ids)
 	// 查询数据
@@ -90,11 +82,11 @@ func (r *CDREventSGWC) SelectByIds(ids []string) []model.CDREventSGWC {
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSGWC) DeleteByIds(ids []string) int64 {
+func (r *CDREventSGWC) DeleteByIds(ids []int64) int64 {
 	if len(ids) <= 0 {
 		return 0
 	}
-	tx := datasource.DB("").Where("id in ?", ids)
+	tx := db.DB("").Where("id in ?", ids)
 	if err := tx.Delete(&model.CDREventSGWC{}).Error; err != nil {
 		logger.Errorf("delete err => %v", err.Error())
 		return 0

src/modules/network_data/repository/cdr_event_smf.go

@@ -1,7 +1,7 @@
 package repository
 
 import (
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
@@ -13,37 +13,29 @@ var NewCDREventSMF = &CDREventSMF{}
 type CDREventSMF struct{}
 
 // SelectByPage 分页查询集合
-func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREventSMF, int64) {
-	tx := datasource.DB("").Model(&model.CDREventSMF{})
+func (r CDREventSMF) SelectByPage(query model.CDREventSMFQuery) ([]model.CDREventSMF, int64) {
+	tx := db.DB("").Model(&model.CDREventSMF{})
 	// 查询条件拼接
-	if querys.NeType != "" {
-		tx = tx.Where("ne_type = ?", querys.NeType)
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if querys.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
 	}
-	if querys.StartTime != "" {
-		startTime := querys.StartTime
-		if len(startTime) == 13 {
-			startTime = startTime[:10]
-		}
-		tx = tx.Where("timestamp >= ?", startTime)
+	if query.BeginTime != 0 {
+		tx = tx.Where("timestamp >= ?", query.BeginTime)
 	}
-	if querys.EndTime != "" {
-		endTime := querys.EndTime
-		if len(endTime) == 13 {
-			endTime = endTime[:10]
-		}
-		tx = tx.Where("timestamp <= ?", endTime)
+	if query.EndTime != 0 {
+		tx = tx.Where("timestamp <= ?", query.EndTime)
 	}
-	if querys.RecordType != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.recordType') = ?", querys.RecordType)
+	if query.RecordType != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.recordType') = ?", query.RecordType)
 	}
-	if querys.SubscriberID != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?", querys.SubscriberID)
+	if query.SubscriberID != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?", query.SubscriberID)
 	}
-	if querys.DNN != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.pDUSessionChargingInformation.dNNID') = ?", querys.DNN)
+	if query.DNN != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.pDUSessionChargingInformation.dNNID') = ?", query.DNN)
 	}
 
 	// 查询结果
@@ -56,16 +48,16 @@ func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREve
 	}
 
 	// 排序
-	if querys.SortField != "" {
-		sortField := querys.SortField
-		if querys.SortOrder == "desc" {
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
 			sortField = sortField + " desc"
 		}
 		tx = tx.Order(sortField)
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -76,12 +68,12 @@ func (r CDREventSMF) SelectByPage(querys model.CDREventSMFQuery) ([]model.CDREve
 }
 
 // SelectByIds 通过ID查询
-func (r *CDREventSMF) SelectByIds(ids []string) []model.CDREventSMF {
+func (r *CDREventSMF) SelectByIds(ids []int64) []model.CDREventSMF {
 	rows := []model.CDREventSMF{}
 	if len(ids) <= 0 {
 		return rows
 	}
-	tx := datasource.DB("").Model(&model.CDREventSMF{})
+	tx := db.DB("").Model(&model.CDREventSMF{})
 	// 构建查询条件
 	tx = tx.Where("id in ?", ids)
 	// 查询数据
@@ -93,11 +85,11 @@ func (r *CDREventSMF) SelectByIds(ids []string) []model.CDREventSMF {
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSMF) DeleteByIds(ids []string) int64 {
+func (r *CDREventSMF) DeleteByIds(ids []int64) int64 {
 	if len(ids) <= 0 {
 		return 0
 	}
-	tx := datasource.DB("").Where("id in ?", ids)
+	tx := db.DB("").Where("id in ?", ids)
 	if err := tx.Delete(&model.CDREventSMF{}).Error; err != nil {
 		logger.Errorf("delete err => %v", err.Error())
 		return 0

src/modules/network_data/repository/cdr_event_smsc.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
@@ -16,43 +16,35 @@ var NewCDREventSMSC = &CDREventSMSC{}
 type CDREventSMSC struct{}
 
 // SelectByPage 分页查询集合
-func (r CDREventSMSC) SelectByPage(querys model.CDREventSMSCQuery) ([]model.CDREventSMSC, int64) {
-	tx := datasource.DB("").Model(&model.CDREventSMSC{})
+func (r CDREventSMSC) SelectByPage(query model.CDREventSMSCQuery) ([]model.CDREventSMSC, int64) {
+	tx := db.DB("").Model(&model.CDREventSMSC{})
 	// 查询条件拼接
-	if querys.NeType != "" {
-		tx = tx.Where("ne_type = ?", querys.NeType)
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if querys.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
 	}
-	if querys.StartTime != "" {
-		startTime := querys.StartTime
-		if len(startTime) == 13 {
-			startTime = startTime[:10]
-		}
-		tx = tx.Where("timestamp >= ?", startTime)
+	if query.BeginTime != 0 {
+		tx = tx.Where("timestamp >= ?", query.BeginTime)
 	}
-	if querys.EndTime != "" {
-		endTime := querys.EndTime
-		if len(endTime) == 13 {
-			endTime = endTime[:10]
-		}
-		tx = tx.Where("timestamp <= ?", endTime)
+	if query.EndTime != 0 {
+		tx = tx.Where("timestamp <= ?", query.EndTime)
 	}
-	if querys.CallerParty != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", querys.CallerParty)
+	if query.CallerParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.callerParty') = ?", query.CallerParty)
 	}
-	if querys.CalledParty != "" {
-		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.calledParty') = ?", querys.CalledParty)
+	if query.CalledParty != "" {
+		tx = tx.Where("JSON_EXTRACT(cdr_json, '$.calledParty') = ?", query.CalledParty)
 	}
 
-	if querys.RecordType != "" {
-		recordTypes := strings.Split(querys.RecordType, ",")
-		var queryStrArr []string
+	if query.RecordType != "" {
+		recordTypes := strings.Split(query.RecordType, ",")
+		var querytrArr []string
 		for _, recordType := range recordTypes {
-			queryStrArr = append(queryStrArr, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
+			querytrArr = append(querytrArr, fmt.Sprintf("JSON_EXTRACT(cdr_json, '$.recordType') = '%s'", recordType))
 		}
-		tx = tx.Where(fmt.Sprintf("( %s )", strings.Join(queryStrArr, " OR ")))
+		tx = tx.Where(fmt.Sprintf("( %s )", strings.Join(querytrArr, " OR ")))
 	}
 
 	// 查询结果
@@ -65,16 +57,16 @@ func (r CDREventSMSC) SelectByPage(querys model.CDREventSMSCQuery) ([]model.CDRE
 	}
 
 	// 排序
-	if querys.SortField != "" {
-		sortField := querys.SortField
-		if querys.SortOrder == "desc" {
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
 			sortField = sortField + " desc"
 		}
 		tx = tx.Order(sortField)
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -85,12 +77,12 @@ func (r CDREventSMSC) SelectByPage(querys model.CDREventSMSCQuery) ([]model.CDRE
 }
 
 // SelectByIds 通过ID查询
-func (r *CDREventSMSC) SelectByIds(ids []string) []model.CDREventSMSC {
+func (r *CDREventSMSC) SelectByIds(ids []int64) []model.CDREventSMSC {
 	rows := []model.CDREventSMSC{}
 	if len(ids) <= 0 {
 		return rows
 	}
-	tx := datasource.DB("").Model(&model.CDREventSMSC{})
+	tx := db.DB("").Model(&model.CDREventSMSC{})
 	// 构建查询条件
 	tx = tx.Where("id in ?", ids)
 	// 查询数据
@@ -102,11 +94,11 @@ func (r *CDREventSMSC) SelectByIds(ids []string) []model.CDREventSMSC {
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSMSC) DeleteByIds(ids []string) int64 {
+func (r *CDREventSMSC) DeleteByIds(ids []int64) int64 {
 	if len(ids) <= 0 {
 		return 0
 	}
-	tx := datasource.DB("").Where("id in ?", ids)
+	tx := db.DB("").Where("id in ?", ids)
 	if err := tx.Delete(&model.CDREventSMSC{}).Error; err != nil {
 		logger.Errorf("delete err => %v", err.Error())
 		return 0

src/modules/network_data/repository/kpi_c_report.go

@@ -0,0 +1,89 @@
+package repository
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"be.ems/src/framework/database/db"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 KpiCReport 结构体
+var NewKpiCReport = &KpiCReport{}
+
+// KpiCReport 性能统计 数据层处理
+type KpiCReport struct{}
+
+// SelectGoldKPI 通过网元指标数据信息
+func (r KpiCReport) SelectKPI(query model.KPIQuery) []model.KpiCReport {
+	rows := []model.KpiCReport{}
+	if query.NeType == "" {
+		return rows
+	}
+
+	tx := db.DB("").Model(&model.KpiCReport{})
+	// 表名
+	tableName := fmt.Sprintf("kpi_c_report_%s", strings.ToLower(query.NeType))
+	tx.Table(tableName)
+	// 构建查询条件
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
+	}
+	if query.BeginTime != 0 {
+		tx = tx.Where("created_at >= ?", query.BeginTime)
+	}
+	if query.EndTime != 0 {
+		tx = tx.Where("created_at <= ?", query.EndTime)
+	}
+	// 排序
+	if query.SortField == "" || query.SortField == "timeGroup" {
+		query.SortField = "created_at"
+	}
+	if query.SortOrder == "" {
+		query.SortOrder = "desc"
+	}
+	tx = tx.Order(fmt.Sprintf("%s %s", query.SortField, query.SortOrder))
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// Insert 新增信息 返回新增数据ID
+func (r KpiCReport) Insert(param model.KpiCReport) int64 {
+	if param.NeType == "" {
+		return 0
+	}
+	if param.CreatedAt == 0 {
+		param.CreatedAt = time.Now().UnixMilli()
+	}
+	// 表名
+	tableName := fmt.Sprintf("kpi_c_report_%s", strings.ToLower(param.NeType))
+	// 执行插入
+	if err := db.DB("").Table(tableName).Create(&param).Error; err != nil {
+		logger.Errorf("insert err => %v", err.Error())
+		return 0
+	}
+	return param.ID
+}
+
+// SelectKPITitle 网元对应的指标名称
+func (r KpiCReport) SelectKPITitle(neType string) []model.KpiCTitle {
+	rows := []model.KpiCTitle{}
+	if neType == "" {
+		return rows
+	}
+	tx := db.DB("").Model(&model.KpiCTitle{})
+	// 构建查询条件
+	tx = tx.Where("ne_type =?", neType)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}

src/modules/network_data/repository/kpi_report.go

@@ -0,0 +1,106 @@
+package repository
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"be.ems/src/framework/database/db"
+	"be.ems/src/framework/logger"
+	"be.ems/src/modules/network_data/model"
+)
+
+// 实例化数据层 KpiReport 结构体
+var NewKpiReport = &KpiReport{}
+
+// KpiReport 性能统计 数据层处理
+type KpiReport struct{}
+
+// SelectGoldKPI 通过网元指标数据信息
+func (r KpiReport) SelectKPI(query model.KPIQuery) []model.KpiReport {
+	rows := []model.KpiReport{}
+	if query.NeType == "" {
+		return rows
+	}
+
+	tx := db.DB("").Model(&model.KpiReport{})
+	// 表名
+	tableName := fmt.Sprintf("kpi_report_%s", strings.ToLower(query.NeType))
+	tx = tx.Table(tableName)
+	// 构建查询条件
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
+	}
+	if query.BeginTime != 0 {
+		tx = tx.Where("created_at >= ?", query.BeginTime)
+	}
+	if query.EndTime != 0 {
+		tx = tx.Where("created_at <= ?", query.EndTime)
+	}
+	// 排序
+	if query.SortField == "" || query.SortField == "timeGroup" {
+		query.SortField = "created_at"
+	}
+	if query.SortOrder == "" {
+		query.SortOrder = "desc"
+	}
+	tx = tx.Order(fmt.Sprintf("%s %s", query.SortField, query.SortOrder))
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// Insert 新增信息 返回新增数据ID
+func (r KpiReport) Insert(param model.KpiReport) int64 {
+	if param.NeType == "" {
+		return 0
+	}
+	if param.CreatedAt == 0 {
+		param.CreatedAt = time.Now().UnixMilli()
+	}
+	// 表名
+	tableName := fmt.Sprintf("kpi_report_%s", strings.ToLower(param.NeType))
+	// 执行插入
+	if err := db.DB("").Table(tableName).Create(&param).Error; err != nil {
+		logger.Errorf("insert err => %v", err.Error())
+		return 0
+	}
+	return param.ID
+}
+
+// SelectKPITitle 网元对应的指标名称
+func (r KpiReport) SelectKPITitle(neType string) []model.KpiTitle {
+	rows := []model.KpiTitle{}
+	if neType == "" {
+		return rows
+	}
+	tx := db.DB("").Model(&model.KpiTitle{})
+	// 构建查询条件
+	tx = tx.Where("ne_type =?", neType)
+	// 查询数据
+	if err := tx.Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}
+
+// SelectUPF 查询UPF数据 N3上行,N6下行
+func (r KpiReport) SelectUPF(rmUID string, beginTime, endTime int64) []model.KpiReport {
+	tx := db.DB("").Model(&model.KpiReport{})
+	// 表名
+	tx = tx.Table("kpi_report_upf")
+	tx = tx.Where("rm_uid = ?", rmUID)
+	tx = tx.Where("created_at >= ?", beginTime)
+	tx = tx.Where("created_at <= ?", endTime)
+	// 查询数据
+	rows := []model.KpiReport{}
+	if err := tx.Select("kpi_values").Find(&rows).Error; err != nil {
+		logger.Errorf("query find err => %v", err.Error())
+		return rows
+	}
+	return rows
+}

src/modules/network_data/repository/nb_state.go

@@ -3,7 +3,7 @@ package repository
 import (
 	"time"
 
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
@@ -16,7 +16,7 @@ type NBState struct{}
 
 // SelectByPage 分页查询集合
 func (r NBState) SelectByPage(query model.NBStateQuery) ([]model.NBState, int64) {
-	tx := datasource.DB("").Model(&model.NBState{})
+	tx := db.DB("").Model(&model.NBState{})
 	// 查询条件拼接
 	if query.NeType != "" {
 		tx = tx.Where("ne_type = ?", query.NeType)
@@ -64,7 +64,7 @@ func (r NBState) SelectByPage(query model.NBStateQuery) ([]model.NBState, int64)
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(query.PageNum, query.PageSize)
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -80,7 +80,7 @@ func (r NBState) SelectByIds(ids []string) []model.NBState {
 	if len(ids) <= 0 {
 		return rows
 	}
-	tx := datasource.DB("").Model(&model.NBState{})
+	tx := db.DB("").Model(&model.NBState{})
 	// 构建查询条件
 	tx = tx.Where("id in ?", ids)
 	// 查询数据
@@ -96,7 +96,7 @@ func (r NBState) DeleteByIds(ids []string) int64 {
 	if len(ids) <= 0 {
 		return 0
 	}
-	tx := datasource.DB("").Where("id in ?", ids)
+	tx := db.DB("").Where("id in ?", ids)
 	if err := tx.Delete(&model.NBState{}).Error; err != nil {
 		logger.Errorf("delete err => %v", err.Error())
 		return 0
@@ -108,7 +108,7 @@ func (r NBState) DeleteByIds(ids []string) int64 {
 func (r NBState) Insert(param model.NBState) int64 {
 	param.CreateTime = time.Now().UnixMilli()
 	// 执行插入
-	if err := datasource.DB("").Create(&param).Error; err != nil {
+	if err := db.DB("").Create(&param).Error; err != nil {
 		logger.Errorf("insert err => %v", err.Error())
 		return 0
 	}

src/modules/network_data/repository/udm_auth.go

@@ -1,9 +1,8 @@
 package repository
 
 import (
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/repo"
 	"be.ems/src/modules/network_data/model"
 )
 
@@ -17,7 +16,7 @@ type UDMAuthUser struct{}
 func (r *UDMAuthUser) ClearAndInsert(neId string, uArr []model.UDMAuthUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
 	// _, err := datasource.ExecDB("", "TRUNCATE TABLE u_auth_user", nil)
-	result := datasource.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMAuthUser{})
+	result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMAuthUser{})
 	if result.Error != nil {
 		logger.Errorf("Delete err => %v", result.Error)
 	}
@@ -25,8 +24,8 @@ func (r *UDMAuthUser) ClearAndInsert(neId string, uArr []model.UDMAuthUser) int6
 }
 
 // SelectPage 根据条件分页查询
-func (r *UDMAuthUser) SelectPage(query map[string]any) (int64, []model.UDMAuthUser) {
-	tx := datasource.DB("").Model(&model.UDMAuthUser{})
+func (r *UDMAuthUser) SelectPage(query map[string]string) (int64, []model.UDMAuthUser) {
+	tx := db.DB("").Model(&model.UDMAuthUser{})
 	// 查询条件拼接
 	if v, ok := query["imsi"]; ok && v != "" {
 		tx = tx.Where("imsi like concat(concat('%',?), '%')", v)
@@ -48,13 +47,13 @@ func (r *UDMAuthUser) SelectPage(query map[string]any) (int64, []model.UDMAuthUs
 	}
 
 	// 分页
-	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
+	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
 
 	// 排序
 	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v.(string)
-		if o, ok := query["sortOrder"]; ok && o != nil && v != "" {
+		sortSql := v
+		if o, ok := query["sortOrder"]; ok && o != "" {
 			if o == "desc" {
 				sortSql += " desc "
 			} else {
@@ -74,7 +73,7 @@ func (r *UDMAuthUser) SelectPage(query map[string]any) (int64, []model.UDMAuthUs
 
 // SelectList 根据实体查询
 func (r *UDMAuthUser) SelectList(u model.UDMAuthUser) []model.UDMAuthUser {
-	tx := datasource.DB("").Model(&model.UDMAuthUser{})
+	tx := db.DB("").Model(&model.UDMAuthUser{})
 	// 查询条件拼接
 	if u.IMSI != "" {
 		tx = tx.Where("imsi = ?", u.IMSI)
@@ -93,7 +92,7 @@ func (r *UDMAuthUser) SelectList(u model.UDMAuthUser) []model.UDMAuthUser {
 
 // SelectByIMSIAndNeID 通过imsi和ne_id查询
 func (r *UDMAuthUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMAuthUser {
-	tx := datasource.DB("").Model(&model.UDMAuthUser{})
+	tx := db.DB("").Model(&model.UDMAuthUser{})
 	item := model.UDMAuthUser{}
 	// 查询条件拼接
 	tx = tx.Where("imsi = ? and ne_id = ?", imsi, neId)
@@ -106,7 +105,7 @@ func (r *UDMAuthUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMAuthUser {
 
 // Insert 批量添加
 func (r *UDMAuthUser) Inserts(uArr []model.UDMAuthUser) int64 {
-	tx := datasource.DB("").CreateInBatches(uArr, 3000)
+	tx := db.DB("").CreateInBatches(uArr, 3000)
 	if err := tx.Error; err != nil {
 		logger.Errorf("CreateInBatches err => %v", err)
 	}
@@ -115,7 +114,7 @@ func (r *UDMAuthUser) Inserts(uArr []model.UDMAuthUser) int64 {
 
 // Delete 删除实体
 func (r *UDMAuthUser) Delete(imsi, neId string) int64 {
-	tx := datasource.DefaultDB().Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMAuthUser{})
+	tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMAuthUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("Delete err => %v", err)
 	}
@@ -124,7 +123,7 @@ func (r *UDMAuthUser) Delete(imsi, neId string) int64 {
 
 // DeletePrefixByIMSI 删除前缀匹配的实体
 func (r *UDMAuthUser) DeletePrefixByIMSI(neId, imsi string) int64 {
-	tx := datasource.DefaultDB().Where("imsi like concat(?, '%') and ne_id = ?", imsi, neId).Delete(&model.UDMAuthUser{})
+	tx := db.DB("").Where("imsi like concat(?, '%') and ne_id = ?", imsi, neId).Delete(&model.UDMAuthUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("DeletePrefixByIMSI err => %v", err)
 	}

src/modules/network_data/repository/udm_extend.go

@@ -1,20 +1,20 @@
 package repository
 
 import (
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
 
-// 实例化数据层 UDMUserInfo 结构体
-var NewUDMUserInfo = &UDMUserInfo{}
+// 实例化数据层 UDMExtend 结构体
+var NewUDMExtend = &UDMExtend{}
 
-// UDMUserInfo UDM鉴权信息表 数据层处理
-type UDMUserInfo struct{}
+// UDMExtend UDM鉴权信息表 数据层处理
+type UDMExtend struct{}
 
 // SelectByPage 分页查询集合
-func (r UDMUserInfo) SelectByPage(query map[string]string) ([]model.UDMUserInfo, int64) {
-	tx := datasource.DB("").Model(&model.UDMUserInfo{})
+func (r UDMExtend) SelectByPage(query map[string]string) ([]model.UDMExtend, int64) {
+	tx := db.DB("").Model(&model.UDMExtend{})
 	// 查询条件拼接
 	if v, ok := query["imsi"]; ok && v != "" {
 		tx = tx.Where("imsi like concat(concat('%', ?), '%')", v)
@@ -25,7 +25,7 @@ func (r UDMUserInfo) SelectByPage(query map[string]string) ([]model.UDMUserInfo,
 
 	// 查询结果
 	var total int64 = 0
-	rows := []model.UDMUserInfo{}
+	rows := []model.UDMExtend{}
 
 	// 查询数量为0直接返回
 	if err := tx.Count(&total).Error; err != nil || total <= 0 {
@@ -42,7 +42,7 @@ func (r UDMUserInfo) SelectByPage(query map[string]string) ([]model.UDMUserInfo,
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(query["pageNum"], query["pageSize"])
+	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -53,8 +53,8 @@ func (r UDMUserInfo) SelectByPage(query map[string]string) ([]model.UDMUserInfo,
 }
 
 // SelectList 根据实体查询
-func (r *UDMUserInfo) SelectList(u model.UDMUserInfo) []model.UDMUserInfo {
-	tx := datasource.DB("").Model(&model.UDMUserInfo{})
+func (r *UDMExtend) SelectList(u model.UDMExtend) []model.UDMExtend {
+	tx := db.DB("").Model(&model.UDMExtend{})
 	// 构建查询条件
 	if u.IMSI != "" {
 		tx = tx.Where("imsi = ?", u.IMSI)
@@ -64,7 +64,7 @@ func (r *UDMUserInfo) SelectList(u model.UDMUserInfo) []model.UDMUserInfo {
 	}
 	tx = tx.Order("imsi asc")
 	// 查询数据
-	rows := []model.UDMUserInfo{}
+	rows := []model.UDMExtend{}
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows
@@ -73,8 +73,8 @@ func (r *UDMUserInfo) SelectList(u model.UDMUserInfo) []model.UDMUserInfo {
 }
 
 // SelectByIMSIAndNeID 通过imsi和ne_id查询 neId为%时模糊imsi查询
-func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo {
-	tx := datasource.DB("").Model(&model.UDMUserInfo{})
+func (r *UDMExtend) SelectByIMSIAndNeID(imsi, neId string) model.UDMExtend {
+	tx := db.DB("").Model(&model.UDMExtend{})
 	// 构建查询条件
 	if neId == "%" {
 		tx = tx.Where("imsi like concat(?, '%')", imsi)
@@ -82,19 +82,19 @@ func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo {
 		tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId)
 	}
 	// 查询数据
-	rows := []model.UDMUserInfo{}
+	rows := []model.UDMExtend{}
 	if err := tx.Limit(1).Find(&rows).Error; err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 	}
 	if len(rows) > 0 {
 		return rows[0]
 	}
-	return model.UDMUserInfo{}
+	return model.UDMExtend{}
 }
 
 // Insert 批量添加
-func (r *UDMUserInfo) Inserts(uArr []model.UDMUserInfo) int64 {
-	tx := datasource.DefaultDB().CreateInBatches(uArr, 3000)
+func (r *UDMExtend) Inserts(uArr []model.UDMExtend) int64 {
+	tx := db.DB("").CreateInBatches(uArr, 3000)
 	if err := tx.Error; err != nil {
 		logger.Errorf("CreateInBatches err => %v", err)
 	}
@@ -102,14 +102,14 @@ func (r *UDMUserInfo) Inserts(uArr []model.UDMUserInfo) int64 {
 }
 
 // Delete 删除实体 neId为%时模糊imsi前缀
-func (r *UDMUserInfo) Delete(imsi, neId string) int64 {
-	tx := datasource.DefaultDB()
+func (r *UDMExtend) Delete(imsi, neId string) int64 {
+	tx := db.DB("")
 	if neId == "%" {
 		tx = tx.Where("imsi like concat(?, '%')", imsi)
 	} else {
 		tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId)
 	}
-	tx = tx.Delete(&model.UDMUserInfo{})
+	tx = tx.Delete(&model.UDMExtend{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("Delete err => %v", err)
 	}

src/modules/network_data/repository/udm_sub.go

@@ -1,9 +1,8 @@
 package repository
 
 import (
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/repo"
 	"be.ems/src/modules/network_data/model"
 )
 
@@ -17,7 +16,7 @@ type UDMSubUser struct{}
 func (r *UDMSubUser) ClearAndInsert(neId string, u []model.UDMSubUser) int64 {
 	// 不指定neID时，用 TRUNCATE 清空表快
 	// _, err := datasource.ExecDB("", "TRUNCATE TABLE u_sub_user", nil)
-	result := datasource.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMSubUser{})
+	result := db.DB("").Where("ne_id = ?", neId).Unscoped().Delete(&model.UDMSubUser{})
 	if result.Error != nil {
 		logger.Errorf("Delete err => %v", result.Error)
 	}
@@ -25,8 +24,8 @@ func (r *UDMSubUser) ClearAndInsert(neId string, u []model.UDMSubUser) int64 {
 }
 
 // SelectPage 根据条件分页查询字典类型
-func (r *UDMSubUser) SelectPage(query map[string]any) (int64, []model.UDMSubUser) {
-	tx := datasource.DB("").Model(&model.UDMSubUser{})
+func (r *UDMSubUser) SelectPage(query map[string]string) (int64, []model.UDMSubUser) {
+	tx := db.DB("").Model(&model.UDMSubUser{})
 	// 查询条件拼接
 	if v, ok := query["imsi"]; ok && v != "" {
 		tx = tx.Where("imsi like concat(concat('%', ?), '%')", v)
@@ -51,13 +50,13 @@ func (r *UDMSubUser) SelectPage(query map[string]any) (int64, []model.UDMSubUser
 	}
 
 	// 分页
-	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
+	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
 
 	// 排序
 	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v.(string)
-		if o, ok := query["sortOrder"]; ok && o != nil && v != "" {
+		sortSql := v
+		if o, ok := query["sortOrder"]; ok && o != "" {
 			if o == "desc" {
 				sortSql += " desc "
 			} else {
@@ -77,7 +76,7 @@ func (r *UDMSubUser) SelectPage(query map[string]any) (int64, []model.UDMSubUser
 
 // SelectList 根据实体查询
 func (r *UDMSubUser) SelectList(u model.UDMSubUser) []model.UDMSubUser {
-	tx := datasource.DB("").Model(&model.UDMSubUser{})
+	tx := db.DB("").Model(&model.UDMSubUser{})
 	// 查询条件拼接
 	if u.IMSI != "" {
 		tx = tx.Where("imsi = ?", u.IMSI)
@@ -96,7 +95,7 @@ func (r *UDMSubUser) SelectList(u model.UDMSubUser) []model.UDMSubUser {
 
 // SelectByIMSIAndNeID 通过imsi和ne_id查询
 func (r *UDMSubUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMSubUser {
-	tx := datasource.DB("").Model(&model.UDMSubUser{})
+	tx := db.DB("").Model(&model.UDMSubUser{})
 	item := model.UDMSubUser{}
 	// 查询条件拼接
 	tx = tx.Where("imsi = ? and ne_id = ?", imsi, neId)
@@ -109,7 +108,7 @@ func (r *UDMSubUser) SelectByIMSIAndNeID(imsi, neId string) model.UDMSubUser {
 
 // Insert 批量添加
 func (r *UDMSubUser) Inserts(uArr []model.UDMSubUser) int64 {
-	tx := datasource.DB("").CreateInBatches(uArr, 2000)
+	tx := db.DB("").CreateInBatches(uArr, 2000)
 	if err := tx.Error; err != nil {
 		logger.Errorf("CreateInBatches err => %v", err)
 	}
@@ -118,7 +117,7 @@ func (r *UDMSubUser) Inserts(uArr []model.UDMSubUser) int64 {
 
 // Delete 删除实体
 func (r *UDMSubUser) Delete(imsi, neId string) int64 {
-	tx := datasource.DefaultDB().Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMSubUser{})
+	tx := db.DB("").Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMSubUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("Delete err => %v", err)
 	}
@@ -127,7 +126,7 @@ func (r *UDMSubUser) Delete(imsi, neId string) int64 {
 
 // DeletePrefixByIMSI 删除前缀匹配的实体
 func (r *UDMSubUser) DeletePrefixByIMSI(imsiPrefix, neId string) int64 {
-	tx := datasource.DefaultDB().Where("imsi like concat(?, '%') and ne_id = ?", imsiPrefix, neId).Delete(&model.UDMSubUser{})
+	tx := db.DB("").Where("imsi like concat(?, '%') and ne_id = ?", imsiPrefix, neId).Delete(&model.UDMSubUser{})
 	if err := tx.Error; err != nil {
 		logger.Errorf("DeletePrefixByIMSI err => %v", err)
 	}

src/modules/network_data/repository/ue_event_amf.go

@@ -3,7 +3,7 @@ package repository
 import (
 	"strings"
 
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
@@ -15,35 +15,27 @@ var NewUEEventAMF = &UEEventAMF{}
 type UEEventAMF struct{}
 
 // SelectByPage 分页查询集合
-func (r UEEventAMF) SelectByPage(querys model.UEEventAMFQuery) ([]model.UEEventAMF, int64) {
-	tx := datasource.DB("").Model(&model.UEEventAMF{})
+func (r UEEventAMF) SelectByPage(query model.UEEventAMFQuery) ([]model.UEEventAMF, int64) {
+	tx := db.DB("").Model(&model.UEEventAMF{})
 	// 查询条件拼接
-	if querys.NeType != "" {
-		tx = tx.Where("ne_type = ?", querys.NeType)
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if querys.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
 	}
-	if querys.StartTime != "" {
-		startTime := querys.StartTime
-		if len(startTime) == 13 {
-			startTime = startTime[:10]
-		}
-		tx = tx.Where("timestamp >= ?", startTime)
+	if query.BeginTime != 0 {
+		tx = tx.Where("timestamp >= ?", query.BeginTime)
 	}
-	if querys.EndTime != "" {
-		endTime := querys.EndTime
-		if len(endTime) == 13 {
-			endTime = endTime[:10]
-		}
-		tx = tx.Where("timestamp <= ?", endTime)
+	if query.EndTime != 0 {
+		tx = tx.Where("timestamp <= ?", query.EndTime)
 	}
-	if querys.EventType != "" {
-		eventTypes := strings.Split(querys.EventType, ",")
+	if query.EventType != "" {
+		eventTypes := strings.Split(query.EventType, ",")
 		tx = tx.Where("event_type in ?", eventTypes)
 	}
-	if querys.IMSI != "" {
-		tx = tx.Where("JSON_EXTRACT(event_json, '$.imsi') = ?", querys.IMSI)
+	if query.IMSI != "" {
+		tx = tx.Where("JSON_EXTRACT(event_json, '$.imsi') = ?", query.IMSI)
 	}
 
 	// 查询结果
@@ -56,16 +48,16 @@ func (r UEEventAMF) SelectByPage(querys model.UEEventAMFQuery) ([]model.UEEventA
 	}
 
 	// 排序
-	if querys.SortField != "" {
-		sortField := querys.SortField
-		if querys.SortOrder == "desc" {
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
 			sortField = sortField + " desc"
 		}
 		tx = tx.Order(sortField)
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -76,12 +68,12 @@ func (r UEEventAMF) SelectByPage(querys model.UEEventAMFQuery) ([]model.UEEventA
 }
 
 // SelectByIds 通过ID查询
-func (r UEEventAMF) SelectByIds(ids []string) []model.UEEventAMF {
+func (r UEEventAMF) SelectByIds(ids []int64) []model.UEEventAMF {
 	rows := []model.UEEventAMF{}
 	if len(ids) <= 0 {
 		return rows
 	}
-	tx := datasource.DB("").Model(&model.UEEventAMF{})
+	tx := db.DB("").Model(&model.UEEventAMF{})
 	// 构建查询条件
 	tx = tx.Where("id in ?", ids)
 	// 查询数据
@@ -93,11 +85,11 @@ func (r UEEventAMF) SelectByIds(ids []string) []model.UEEventAMF {
 }
 
 // DeleteByIds 批量删除信息
-func (r UEEventAMF) DeleteByIds(ids []string) int64 {
+func (r UEEventAMF) DeleteByIds(ids []int64) int64 {
 	if len(ids) <= 0 {
 		return 0
 	}
-	tx := datasource.DB("").Where("id in ?", ids)
+	tx := db.DB("").Where("id in ?", ids)
 	if err := tx.Delete(&model.UEEventAMF{}).Error; err != nil {
 		logger.Errorf("delete err => %v", err.Error())
 		return 0

src/modules/network_data/repository/ue_event_mme.go

@@ -3,7 +3,7 @@ package repository
 import (
 	"strings"
 
-	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
 	"be.ems/src/modules/network_data/model"
 )
@@ -15,35 +15,27 @@ var NewUEEventMME = &UEEventMME{}
 type UEEventMME struct{}
 
 // SelectByPage 分页查询集合
-func (r UEEventMME) SelectByPage(querys model.UEEventMMEQuery) ([]model.UEEventMME, int64) {
-	tx := datasource.DB("").Model(&model.UEEventMME{})
+func (r UEEventMME) SelectByPage(query model.UEEventMMEQuery) ([]model.UEEventMME, int64) {
+	tx := db.DB("").Model(&model.UEEventMME{})
 	// 查询条件拼接
-	if querys.NeType != "" {
-		tx = tx.Where("ne_type = ?", querys.NeType)
+	if query.NeType != "" {
+		tx = tx.Where("ne_type = ?", query.NeType)
 	}
-	if querys.RmUID != "" {
-		tx = tx.Where("rm_uid = ?", querys.RmUID)
+	if query.RmUID != "" {
+		tx = tx.Where("rm_uid = ?", query.RmUID)
 	}
-	if querys.StartTime != "" {
-		startTime := querys.StartTime
-		if len(startTime) == 13 {
-			startTime = startTime[:10]
-		}
-		tx = tx.Where("timestamp >= ?", startTime)
+	if query.BeginTime != 0 {
+		tx = tx.Where("timestamp >= ?", query.BeginTime)
 	}
-	if querys.EndTime != "" {
-		endTime := querys.EndTime
-		if len(endTime) == 13 {
-			endTime = endTime[:10]
-		}
-		tx = tx.Where("timestamp <= ?", endTime)
+	if query.EndTime != 0 {
+		tx = tx.Where("timestamp <= ?", query.EndTime)
 	}
-	if querys.EventType != "" {
-		eventTypes := strings.Split(querys.EventType, ",")
+	if query.EventType != "" {
+		eventTypes := strings.Split(query.EventType, ",")
 		tx = tx.Where("event_type in ?", eventTypes)
 	}
-	if querys.IMSI != "" {
-		tx = tx.Where("JSON_EXTRACT(event_json, '$.imsi') = ?", querys.IMSI)
+	if query.IMSI != "" {
+		tx = tx.Where("JSON_EXTRACT(event_json, '$.imsi') = ?", query.IMSI)
 	}
 
 	// 查询结果
@@ -56,16 +48,16 @@ func (r UEEventMME) SelectByPage(querys model.UEEventMMEQuery) ([]model.UEEventM
 	}
 
 	// 排序
-	if querys.SortField != "" {
-		sortField := querys.SortField
-		if querys.SortOrder == "desc" {
+	if query.SortField != "" {
+		sortField := query.SortField
+		if query.SortOrder == "desc" {
 			sortField = sortField + " desc"
 		}
 		tx = tx.Order(sortField)
 	}
 
 	// 查询数据分页
-	pageNum, pageSize := datasource.PageNumSize(querys.PageNum, querys.PageSize)
+	pageNum, pageSize := db.PageNumSize(query.PageNum, query.PageSize)
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
 	err := tx.Find(&rows).Error
 	if err != nil {
@@ -76,12 +68,12 @@ func (r UEEventMME) SelectByPage(querys model.UEEventMMEQuery) ([]model.UEEventM
 }
 
 // SelectByIds 通过ID查询
-func (r UEEventMME) SelectByIds(ids []string) []model.UEEventMME {
+func (r UEEventMME) SelectByIds(ids []int64) []model.UEEventMME {
 	rows := []model.UEEventMME{}
 	if len(ids) <= 0 {
 		return rows
 	}
-	tx := datasource.DB("").Model(&model.UEEventMME{})
+	tx := db.DB("").Model(&model.UEEventMME{})
 	// 构建查询条件
 	tx = tx.Where("id in ?", ids)
 	// 查询数据
@@ -93,11 +85,11 @@ func (r UEEventMME) SelectByIds(ids []string) []model.UEEventMME {
 }
 
 // DeleteByIds 批量删除信息
-func (r UEEventMME) DeleteByIds(ids []string) int64 {
+func (r UEEventMME) DeleteByIds(ids []int64) int64 {
 	if len(ids) <= 0 {
 		return 0
 	}
-	tx := datasource.DB("").Where("id in ?", ids)
+	tx := db.DB("").Where("id in ?", ids)
 	if err := tx.Delete(&model.UEEventMME{}).Error; err != nil {
 		logger.Errorf("delete err => %v", err.Error())
 		return 0

src/modules/network_data/service/alarm.go

@@ -0,0 +1,59 @@
+package service
+
+import (
+	"fmt"
+
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
+
+// 实例化数据层 Alarm 结构体
+var NewAlarm = &Alarm{
+	alarmRepository: repository.NewAlarm,
+}
+
+// Alarm 告警 服务层处理
+type Alarm struct {
+	alarmRepository *repository.Alarm // 告警数据信息
+}
+
+// FindByPage 根据条件分页查询
+func (r Alarm) FindByPage(query model.AlarmQuery) ([]model.Alarm, int64) {
+	return r.alarmRepository.SelectByPage(query)
+}
+
+// Find 查询
+func (r Alarm) Find(param model.Alarm) []model.Alarm {
+	return r.alarmRepository.Select(param)
+}
+
+// Insert 新增信息
+func (s Alarm) Insert(param model.Alarm) int64 {
+	return s.alarmRepository.Insert(param)
+}
+
+// Update 修改信息
+func (s Alarm) Update(param model.Alarm) int64 {
+	return s.alarmRepository.Update(param)
+}
+
+// DeleteByIds 批量删除信息
+func (r Alarm) DeleteByIds(ids []int64) (int64, error) {
+	// 检查是否存在
+	data := r.alarmRepository.SelectByIds(ids)
+	if len(data) <= 0 {
+		return 0, fmt.Errorf("no data")
+	}
+
+	if len(data) == len(ids) {
+		rows := r.alarmRepository.DeleteByIds(ids)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
+}
+
+// FindAlarmSeqLast 查询网元告警最后一条序号
+func (s Alarm) FindAlarmSeqLast(neType, neId string) int64 {
+	return s.alarmRepository.SelectAlarmSeqLast(neType, neId)
+}

src/modules/network_data/service/alarm_event.go

@@ -0,0 +1,59 @@
+package service
+
+import (
+	"fmt"
+
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
+
+// 实例化数据层 AlarmEvent 结构体
+var NewAlarmEvent = &AlarmEvent{
+	AlarmEventRepository: repository.NewAlarmEvent,
+}
+
+// AlarmEvent 告警 服务层处理
+type AlarmEvent struct {
+	AlarmEventRepository *repository.AlarmEvent // 告警数据信息
+}
+
+// FindByPage 根据条件分页查询
+func (r AlarmEvent) FindByPage(query model.AlarmEventQuery) ([]model.AlarmEvent, int64) {
+	return r.AlarmEventRepository.SelectByPage(query)
+}
+
+// Find 查询
+func (r AlarmEvent) Find(param model.AlarmEvent) []model.AlarmEvent {
+	return r.AlarmEventRepository.Select(param)
+}
+
+// Insert 新增信息
+func (s AlarmEvent) Insert(param model.AlarmEvent) int64 {
+	return s.AlarmEventRepository.Insert(param)
+}
+
+// Update 修改信息
+func (s AlarmEvent) Update(param model.AlarmEvent) int64 {
+	return s.AlarmEventRepository.Update(param)
+}
+
+// DeleteByIds 批量删除信息
+func (r AlarmEvent) DeleteByIds(ids []int64) (int64, error) {
+	// 检查是否存在
+	data := r.AlarmEventRepository.SelectByIds(ids)
+	if len(data) <= 0 {
+		return 0, fmt.Errorf("no data")
+	}
+
+	if len(data) == len(ids) {
+		rows := r.AlarmEventRepository.DeleteByIds(ids)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
+}
+
+// FindAlarmEventSeqLast 查询网元告警最后一条序号
+func (s AlarmEvent) FindAlarmEventSeqLast(neType, neId string) int64 {
+	return s.AlarmEventRepository.SelectAlarmEventSeqLast(neType, neId)
+}

src/modules/network_data/service/alarm_forward_log.go

@@ -0,0 +1,73 @@
+package service
+
+import (
+	"fmt"
+	"strconv"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/file"
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
+
+// 实例化数据层 AlarmForwardLog 结构体
+var NewAlarmForwardLog = &AlarmForwardLog{
+	alarmForwardLogRepository: repository.NewAlarmForwardLog,
+}
+
+// AlarmForwardLog 基站状态记录表 服务层处理
+type AlarmForwardLog struct {
+	alarmForwardLogRepository *repository.AlarmForwardLog // 基站状态记录信息
+}
+
+// FindByPage 根据条件分页查询
+func (r AlarmForwardLog) FindByPage(query model.AlarmForwardLogQuery) ([]model.AlarmForwardLog, int64) {
+	return r.alarmForwardLogRepository.SelectByPage(query)
+}
+
+// Insert 插入数据
+func (r AlarmForwardLog) Insert(item model.AlarmForwardLog) int64 {
+	return r.alarmForwardLogRepository.Insert(item)
+}
+
+// DeleteByIds 批量删除信息
+func (r AlarmForwardLog) DeleteByIds(ids []int64) (int64, error) {
+	// 检查是否存在
+	arr := r.alarmForwardLogRepository.SelectByIds(ids)
+	if len(arr) <= 0 {
+		return 0, fmt.Errorf("not data")
+	}
+
+	if len(arr) == len(ids) {
+		rows := r.alarmForwardLogRepository.DeleteByIds(ids)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
+}
+
+// ExportXlsx 导出数据到 xlsx 文件
+func (r AlarmForwardLog) ExportXlsx(rows []model.AlarmForwardLog, fileName, language string) (string, error) {
+	// 第一行表头标题
+	headerCells := map[string]string{
+		"A1": i18n.TKey(language, "AlarmForwardLog.export.id"),
+		"B1": i18n.TKey(language, "AlarmForwardLog.export.alarmCode"),
+		"C1": i18n.TKey(language, "AlarmForwardLog.export.alarmSeq"),
+		"D1": i18n.TKey(language, "AlarmForwardLog.export.eventTime"),
+	}
+
+	// 从第二行开始的数据
+	dataCells := make([]map[string]any, 0)
+	for i, row := range rows {
+		idx := strconv.Itoa(i + 2)
+		dataCells = append(dataCells, map[string]any{
+			"A" + idx: row.ID,
+			"B" + idx: row.AlarmCode,
+			"C" + idx: row.AlarmSeq,
+			"D" + idx: row.EventTime,
+		})
+	}
+
+	// 导出数据表格
+	return file.WriteSheet(headerCells, dataCells, fileName, "Sheet1")
+}

src/modules/network_data/service/alarm_log.go

@@ -0,0 +1,73 @@
+package service
+
+import (
+	"fmt"
+	"strconv"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/file"
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
+
+// 实例化数据层 AlarmLog 结构体
+var NewAlarmLog = &AlarmLog{
+	alarmLogRepository: repository.NewAlarmLog,
+}
+
+// AlarmLog 基站状态记录表 服务层处理
+type AlarmLog struct {
+	alarmLogRepository *repository.AlarmLog // 基站状态记录信息
+}
+
+// FindByPage 根据条件分页查询
+func (r AlarmLog) FindByPage(query model.AlarmLogQuery) ([]model.AlarmLog, int64) {
+	return r.alarmLogRepository.SelectByPage(query)
+}
+
+// Insert 插入数据
+func (r AlarmLog) Insert(item model.AlarmLog) int64 {
+	return r.alarmLogRepository.Insert(item)
+}
+
+// DeleteByIds 批量删除信息
+func (r AlarmLog) DeleteByIds(ids []int64) (int64, error) {
+	// 检查是否存在
+	arr := r.alarmLogRepository.SelectByIds(ids)
+	if len(arr) <= 0 {
+		return 0, fmt.Errorf("not data")
+	}
+
+	if len(arr) == len(ids) {
+		rows := r.alarmLogRepository.DeleteByIds(ids)
+		return rows, nil
+	}
+	// 删除信息失败！
+	return 0, fmt.Errorf("delete fail")
+}
+
+// ExportXlsx 导出数据到 xlsx 文件
+func (r AlarmLog) ExportXlsx(rows []model.AlarmLog, fileName, language string) (string, error) {
+	// 第一行表头标题
+	headerCells := map[string]string{
+		"A1": i18n.TKey(language, "alarmLog.export.id"),
+		"B1": i18n.TKey(language, "alarmLog.export.alarmCode"),
+		"C1": i18n.TKey(language, "alarmLog.export.alarmSeq"),
+		"D1": i18n.TKey(language, "alarmLog.export.eventTime"),
+	}
+
+	// 从第二行开始的数据
+	dataCells := make([]map[string]any, 0)
+	for i, row := range rows {
+		idx := strconv.Itoa(i + 2)
+		dataCells = append(dataCells, map[string]any{
+			"A" + idx: row.ID,
+			"B" + idx: row.AlarmCode,
+			"C" + idx: row.AlarmSeq,
+			"D" + idx: row.EventTime,
+		})
+	}
+
+	// 导出数据表格
+	return file.WriteSheet(headerCells, dataCells, fileName, "Sheet1")
+}

src/modules/network_data/service/all_alarm.go

@@ -1,39 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化数据层 Alarm 结构体
-var NewAlarm = &Alarm{
-	alarmRepository: repository.NewAlarm,
-}
-
-// Alarm 告警 服务层处理
-type Alarm struct {
-	alarmRepository *repository.Alarm // 告警数据信息
-}
-
-// SelectPage 根据条件分页查询
-func (r *Alarm) SelectPage(querys model.AlarmQuery) ([]model.Alarm, int64) {
-	return r.alarmRepository.SelectByPage(querys)
-}
-
-// DeleteByIds 批量删除信息
-func (r *Alarm) DeleteByIds(ids []string) (int64, error) {
-	// 检查是否存在
-	data := r.alarmRepository.SelectByIds(ids)
-	if len(data) <= 0 {
-		return 0, fmt.Errorf("no data")
-	}
-
-	if len(data) == len(ids) {
-		rows := r.alarmRepository.DeleteByIds(ids)
-		return rows, nil
-	}
-	// 删除信息失败！
-	return 0, fmt.Errorf("delete fail")
-}

src/modules/network_data/service/all_perf_kpi.go

@@ -1,79 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"be.ems/src/framework/constants/cachekey"
-	"be.ems/src/framework/redis"
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化数据层 PerfKPI 结构体
-var NewPerfKPI = &PerfKPI{
-	perfKPIRepository: repository.NewPerfKPI,
-}
-
-// PerfKPI 性能统计 服务层处理
-type PerfKPI struct {
-	perfKPIRepository *repository.PerfKPI // 性能统计数据信息
-}
-
-// SelectGoldKPI 通过网元指标数据信息
-func (r *PerfKPI) SelectGoldKPI(query model.GoldKPIQuery) []map[string]any {
-	// 获取数据指标id
-	var kpiIds []string
-	kpiTitles := r.perfKPIRepository.SelectGoldKPITitle(query.NeType)
-	for _, kpiId := range kpiTitles {
-		kpiIds = append(kpiIds, kpiId.KPIID)
-	}
-
-	data := r.perfKPIRepository.SelectGoldKPI(query, kpiIds)
-	if data == nil {
-		return []map[string]any{}
-	}
-	return data
-}
-
-// SelectGoldKPITitle 网元对应的指标名称
-func (r *PerfKPI) SelectGoldKPITitle(neType string) []model.GoldKPITitle {
-	return r.perfKPIRepository.SelectGoldKPITitle(neType)
-}
-
-// SelectUPFTotalFlow 查询UPF总流量 N3上行 N6下行
-func (r *PerfKPI) SelectUPFTotalFlow(neType, rmUID string, day int) map[string]any {
-	now := time.Now()
-	// 获取当前日期
-	endDate := fmt.Sprint(now.UnixMilli())
-	// 将当前日期前几天数
-	startDate := fmt.Sprint(now.AddDate(0, 0, -day).Truncate(24 * time.Hour).UnixMilli())
-
-	var info map[string]any
-
-	// 读取缓存数据 小于2分钟重新缓存
-	key := fmt.Sprintf("%sUPF:totalFlow:%s_%d", cachekey.NE_DATA_KEY, rmUID, day)
-	infoStr, _ := redis.Get("", key)
-	if infoStr != "" {
-		json.Unmarshal([]byte(infoStr), &info)
-		expireSecond, _ := redis.GetExpire("", key)
-		if expireSecond > 120 {
-			return info
-		}
-	}
-	// down * 8 / 1000 / 1000 单位M
-	info = r.perfKPIRepository.SelectUPFTotalFlow(neType, rmUID, startDate, endDate)
-	if v, ok := info["up"]; ok && v == nil {
-		info["up"] = 0
-	}
-	if v, ok := info["down"]; ok && v == nil {
-		info["down"] = 0
-	}
-
-	// 保存到缓存
-	infoJSON, _ := json.Marshal(info)
-	redis.SetByExpire("", key, string(infoJSON), time.Duration(10)*time.Minute)
-
-	return info
-}

src/modules/network_data/service/cdr_event_ims.go

@@ -25,21 +25,21 @@ type CDREventIMS struct {
 	cdrEventIMSRepository *repository.CDREventIMS // CDR会话事件数据信息
 }
 
-// SelectPage 根据条件分页查询
-func (r *CDREventIMS) SelectPage(querys model.CDREventIMSQuery) ([]model.CDREventIMS, int64) {
-	return r.cdrEventIMSRepository.SelectByPage(querys)
+// FindByPage 根据条件分页查询
+func (r *CDREventIMS) FindByPage(query model.CDREventIMSQuery) ([]model.CDREventIMS, int64) {
+	return r.cdrEventIMSRepository.SelectByPage(query)
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventIMS) DeleteByIds(cdrIds []string) (int64, error) {
+func (r *CDREventIMS) DeleteByIds(ids []int64) (int64, error) {
 	// 检查是否存在
-	ids := r.cdrEventIMSRepository.SelectByIds(cdrIds)
-	if len(ids) <= 0 {
+	rows := r.cdrEventIMSRepository.SelectByIds(ids)
+	if len(rows) <= 0 {
 		return 0, fmt.Errorf("not data")
 	}
 
-	if len(ids) == len(cdrIds) {
-		rows := r.cdrEventIMSRepository.DeleteByIds(cdrIds)
+	if len(rows) == len(ids) {
+		rows := r.cdrEventIMSRepository.DeleteByIds(ids)
 		return rows, nil
 	}
 	// 删除信息失败！
@@ -61,16 +61,16 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 		"I1": "Hangup Time",
 	}
 	// 读取字典数据 CDR SIP响应代码类别类型
-	dictCDRSipCode := sysService.NewSysDictData.SelectDictDataByType("cdr_sip_code")
+	dictCDRSipCode := sysService.NewSysDictData.FindByType("cdr_sip_code")
 	// 读取字典数据 CDR 呼叫类型
-	dictCDRCallType := sysService.NewSysDictData.SelectDictDataByType("cdr_call_type")
+	dictCDRCallType := sysService.NewSysDictData.FindByType("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)
+		var cdrJSON map[string]any
+		err := json.Unmarshal([]byte(row.CdrJson), &cdrJSON)
 		if err != nil {
 			logger.Warnf("CDRExport Error parsing JSON: %s", err.Error())
 			continue
@@ -86,8 +86,8 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 		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)
+				if callType == v.DataValue {
+					callTypeLable = i18n.TKey(language, v.DataLabel)
 					break
 				}
 			}
@@ -112,8 +112,8 @@ func (r CDREventIMS) ExportXlsx(rows []model.CDREventIMS, fileName, language str
 		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)
+				if cause == v.DataValue {
+					callResult = i18n.TKey(language, v.DataLabel)
 					break
 				}
 			}

src/modules/network_data/service/cdr_event_sgwc.go

@@ -23,21 +23,21 @@ type CDREventSGWC struct {
 	cdrEventRepository *repository.CDREventSGWC // CDR会话事件数据信息
 }
 
-// SelectPage 根据条件分页查询
-func (r *CDREventSGWC) SelectPage(querys model.CDREventSGWCQuery) ([]model.CDREventSGWC, int64) {
-	return r.cdrEventRepository.SelectByPage(querys)
+// FindByPage 根据条件分页查询
+func (r *CDREventSGWC) FindByPage(query model.CDREventSGWCQuery) ([]model.CDREventSGWC, int64) {
+	return r.cdrEventRepository.SelectByPage(query)
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSGWC) DeleteByIds(cdrIds []string) (int64, error) {
+func (r *CDREventSGWC) DeleteByIds(ids []int64) (int64, error) {
 	// 检查是否存在
-	ids := r.cdrEventRepository.SelectByIds(cdrIds)
-	if len(ids) <= 0 {
+	rows := r.cdrEventRepository.SelectByIds(ids)
+	if len(rows) <= 0 {
 		return 0, fmt.Errorf("not data")
 	}
 
-	if len(ids) == len(cdrIds) {
-		rows := r.cdrEventRepository.DeleteByIds(cdrIds)
+	if len(rows) == len(ids) {
+		rows := r.cdrEventRepository.DeleteByIds(ids)
 		return rows, nil
 	}
 	// 删除信息失败！
@@ -69,6 +69,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 		"S1": "Record Cause For Rec Closing",
 		"T1": "Record Sequence Number",
 		"U1": "Local Record Sequence Number",
+		"V1": "Record Type",
+		"W1": "Record Opening Time",
 	}
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
@@ -76,7 +78,7 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 		idx := strconv.Itoa(i + 2)
 		// 解析 JSON 字符串为 map
 		var cdrJSON map[string]interface{}
-		err := json.Unmarshal([]byte(row.CDRJSONStr), &cdrJSON)
+		err := json.Unmarshal([]byte(row.CdrJson), &cdrJSON)
 		if err != nil {
 			logger.Warnf("CDRExport Error parsing JSON: %s", err.Error())
 			continue
@@ -101,11 +103,22 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 		if v, ok := cdrJSON["pGWAddressUsed"]; ok && v != nil {
 			pGWAddressUsed = fmt.Sprint(v)
 		}
+		if v, ok := cdrJSON["GGSNAddress"]; ok && v != nil {
+			pGWAddressUsed = fmt.Sprint(v)
+		}
 		// sGWAddress
 		sGWAddress := ""
 		if v, ok := cdrJSON["sGWAddress"]; ok && v != nil {
 			sGWAddress = fmt.Sprint(v)
 		}
+		if v, ok := cdrJSON["SGSNAddress"]; ok && v != nil {
+			sGWAddress = fmt.Sprint(v)
+		}
+		// recordType
+		recordType := ""
+		if v, ok := cdrJSON["recordType"]; ok && v != nil {
+			recordType = fmt.Sprint(v)
+		}
 		// rATType
 		rATType := ""
 		if v, ok := cdrJSON["rATType"]; ok && v != nil {
@@ -189,7 +202,7 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 		dataCells = append(dataCells, map[string]any{
 			"A" + idx: row.ID,
 			"B" + idx: row.NeName,
-			"C" + idx: row.RmUID,
+			"C" + idx: row.RmUid,
 			"D" + idx: chargingID,
 			"E" + idx: servedIMSI,
 			"F" + idx: servedMSISDN,
@@ -208,6 +221,8 @@ func (r CDREventSGWC) ExportXlsx(rows []model.CDREventSGWC, fileName string) (st
 			"S" + idx: causeForRecClosing,
 			"T" + idx: recordSequenceNumber,
 			"U" + idx: localRecordSequenceNumber,
+			"V" + idx: recordType,
+			"W" + idx: invocationTimestamp,
 		})
 	}
 

src/modules/network_data/service/cdr_event_smf.go

@@ -22,21 +22,21 @@ type CDREventSMF struct {
 	cdrEventRepository *repository.CDREventSMF // CDR会话事件数据信息
 }
 
-// SelectPage 根据条件分页查询
-func (r *CDREventSMF) SelectPage(querys model.CDREventSMFQuery) ([]model.CDREventSMF, int64) {
+// FindByPage 根据条件分页查询
+func (r *CDREventSMF) FindByPage(querys model.CDREventSMFQuery) ([]model.CDREventSMF, int64) {
 	return r.cdrEventRepository.SelectByPage(querys)
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSMF) DeleteByIds(cdrIds []string) (int64, error) {
+func (r *CDREventSMF) DeleteByIds(ids []int64) (int64, error) {
 	// 检查是否存在
-	ids := r.cdrEventRepository.SelectByIds(cdrIds)
-	if len(ids) <= 0 {
+	rows := r.cdrEventRepository.SelectByIds(ids)
+	if len(rows) <= 0 {
 		return 0, fmt.Errorf("not data")
 	}
 
-	if len(ids) == len(cdrIds) {
-		rows := r.cdrEventRepository.DeleteByIds(cdrIds)
+	if len(rows) == len(ids) {
+		rows := r.cdrEventRepository.DeleteByIds(ids)
 		return rows, nil
 	}
 	// 删除信息失败！
@@ -77,7 +77,7 @@ func (r CDREventSMF) ExportXlsx(rows []model.CDREventSMF, fileName string) (stri
 		idx := strconv.Itoa(i + 2)
 		// 解析 JSON 字符串为 map
 		var cdrJSON map[string]interface{}
-		err := json.Unmarshal([]byte(row.CDRJSONStr), &cdrJSON)
+		err := json.Unmarshal([]byte(row.CdrJson), &cdrJSON)
 		if err != nil {
 			logger.Warnf("CDRExport Error parsing JSON: %s", err.Error())
 			continue
@@ -204,7 +204,7 @@ func (r CDREventSMF) ExportXlsx(rows []model.CDREventSMF, fileName string) (stri
 			"A" + idx: row.ID,
 			"B" + idx: chargingID,
 			"C" + idx: row.NeName,
-			"D" + idx: row.RmUID,
+			"D" + idx: row.RmUid,
 			"E" + idx: subscriptionIDData,
 			"F" + idx: subscriptionIDType,
 			"G" + idx: dataVolumeUplink,

src/modules/network_data/service/cdr_event_smsc.go

@@ -25,21 +25,21 @@ type CDREventSMSC struct {
 	cdrEventRepository *repository.CDREventSMSC // CDR会话事件数据信息
 }
 
-// SelectPage 根据条件分页查询
-func (r *CDREventSMSC) SelectPage(querys model.CDREventSMSCQuery) ([]model.CDREventSMSC, int64) {
-	return r.cdrEventRepository.SelectByPage(querys)
+// FindByPage 根据条件分页查询
+func (r *CDREventSMSC) FindByPage(query model.CDREventSMSCQuery) ([]model.CDREventSMSC, int64) {
+	return r.cdrEventRepository.SelectByPage(query)
 }
 
 // DeleteByIds 批量删除信息
-func (r *CDREventSMSC) DeleteByIds(cdrIds []string) (int64, error) {
+func (r *CDREventSMSC) DeleteByIds(ids []int64) (int64, error) {
 	// 检查是否存在
-	ids := r.cdrEventRepository.SelectByIds(cdrIds)
-	if len(ids) <= 0 {
+	rows := r.cdrEventRepository.SelectByIds(ids)
+	if len(rows) <= 0 {
 		return 0, fmt.Errorf("not data")
 	}
 
-	if len(ids) == len(cdrIds) {
-		rows := r.cdrEventRepository.DeleteByIds(cdrIds)
+	if len(rows) == len(ids) {
+		rows := r.cdrEventRepository.DeleteByIds(ids)
 		return rows, nil
 	}
 	// 删除信息失败！
@@ -59,14 +59,14 @@ func (r CDREventSMSC) ExportXlsx(rows []model.CDREventSMSC, fileName, language s
 		"G1": "Time",
 	}
 	// 读取字典数据 CDR 原因码
-	dictCDRCauseCode := sysService.NewSysDictData.SelectDictDataByType("cdr_cause_code")
+	dictCDRCauseCode := sysService.NewSysDictData.FindByType("cdr_cause_code")
 	// 从第二行开始的数据
 	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)
+		err := json.Unmarshal([]byte(row.CdrJson), &cdrJSON)
 		if err != nil {
 			logger.Warnf("CDRExport Error parsing JSON: %s", err.Error())
 			continue
@@ -103,8 +103,8 @@ func (r CDREventSMSC) ExportXlsx(rows []model.CDREventSMSC, fileName, language s
 		if v, ok := cdrJSON["cause"]; ok && v != nil && callResult == "Fail" {
 			cause := fmt.Sprint(v)
 			for _, v := range dictCDRCauseCode {
-				if cause == v.DictValue {
-					callResult = fmt.Sprintf("%s, %s", callResult, i18n.TKey(language, v.DictLabel))
+				if cause == v.DataValue {
+					callResult = fmt.Sprintf("%s, %s", callResult, i18n.TKey(language, v.DataLabel))
 					break
 				}
 			}

src/modules/network_data/service/kpi_c_report.go

@@ -0,0 +1,138 @@
+package service
+
+import (
+	"encoding/json"
+	"fmt"
+	"sort"
+
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
+
+// 实例化数据层 KpiCReport 结构体
+var NewKpiCReport = &KpiCReport{
+	kpiCReportRepository: repository.NewKpiCReport,
+}
+
+// KpiCReport 自定义性能统计 服务层处理
+type KpiCReport struct {
+	kpiCReportRepository *repository.KpiCReport // 自定义KPI数据信息
+}
+
+// FindKPI 通过网元指标数据信息
+func (s KpiCReport) FindData(query model.KPIQuery) []map[string]any {
+	// 原始数据
+	rows := s.kpiCReportRepository.SelectKPI(query)
+	if len(rows) <= 0 {
+		return []map[string]any{}
+	}
+
+	kpiIdsHas := false
+	kpiIds := []string{}
+	// 处理数据
+	arr := []map[string]any{}
+	for _, row := range rows {
+		// 解析 JSON 字符串为 map
+		var kpiValues []map[string]any
+		err := json.Unmarshal([]byte(row.KpiValues), &kpiValues)
+		if err != nil {
+			continue
+		}
+
+		item := map[string]any{
+			"neType":     row.NeType,
+			"neName":     row.NeName,
+			"rmUID":      row.RmUid,
+			"startIndex": row.Index,
+			"timeGroup":  row.CreatedAt,
+		}
+
+		// 遍历 kpiValues 数组
+		for _, v := range kpiValues {
+			kpiId := "-"
+			if k, ok := v["kpiId"]; ok {
+				kpiId = fmt.Sprint(k)
+			}
+			item[kpiId] = v["value"]
+		}
+
+		arr = append(arr, item)
+
+		// 添加指标ID
+		if !kpiIdsHas {
+			for _, v := range kpiValues {
+				kpiId := "-"
+				if k, ok := v["kpiId"]; ok {
+					kpiId = fmt.Sprint(k)
+				}
+				kpiIds = append(kpiIds, kpiId)
+			}
+			kpiIdsHas = true
+		}
+	}
+
+	// 时间密度分钟 数值单位秒 5分钟的传入300秒
+	timeInterval := query.Interval
+	// 创建一个map来存储按时间段合并后的数据
+	timeGroup := make(map[int64][]map[string]any)
+	// 遍历每个数据项
+	for _, v := range arr {
+		itemTime := parse.Number(v["timeGroup"])
+		// 计算时间戳的x分钟时间段（使用秒并除以x分钟）
+		timeMinute := itemTime / 1000 / timeInterval * timeInterval
+		// 合并到对应的时间段
+		timeGroup[timeMinute] = append(timeGroup[timeMinute], v)
+	}
+	// 时间组合输出
+	data := []map[string]any{}
+	for _, records := range timeGroup {
+		if len(records) <= 0 {
+			continue
+		}
+		// 转换为具体时间显示（根据需要可以格式化显示）
+		// timeStr := time.Unix(k, 0).Format("2006-01-02 15:04:05")
+		// fmt.Printf("Time Group: %s records: %d\n", timeStr, len(records))
+		startItem := records[len(records)-1] // 取最后一条数据也是最开始startIndex
+		if len(records) >= 2 {               // 最后一条数据不参与计算
+			for _, record := range records[:len(records)-1] {
+				// fmt.Printf("  - startIndex: %v, Value: %v\n", record["startIndex"], record["timeGroup"])
+				// 遍历kpiIds数组对lastRecord赋值
+				for _, kpiId := range kpiIds {
+					if v, ok := record[kpiId]; ok {
+						// 特殊字段，只取一次收到的非0值
+						if kpiId == "AMF.01" || kpiId == "UDM.01" || kpiId == "UDM.02" || kpiId == "UDM.03" || kpiId == "SMF.01" {
+							// startItem[kpiId] = parse.Number(v)
+							continue // startIndex的值不累加不取最后
+						} else {
+							value := parse.Number(startItem[kpiId])
+							startItem[kpiId] = value + parse.Number(v)
+						}
+					}
+				}
+			}
+		}
+		data = append(data, startItem)
+	}
+
+	// 按时间排序
+	sort.SliceStable(data, func(i, j int) bool {
+		vi := parse.Number(data[i]["timeGroup"])
+		vj := parse.Number(data[j]["timeGroup"])
+		if query.SortOrder == "asc" {
+			return vi < vj // asc
+		}
+		return vi > vj // desc
+	})
+	return data
+}
+
+// Insert 新增信息
+func (s KpiCReport) Insert(param model.KpiCReport) int64 {
+	return s.kpiCReportRepository.Insert(param)
+}
+
+// FindKPITitle 网元对应的指标名称
+func (r KpiCReport) FindTitle(neType string) []model.KpiCTitle {
+	return r.kpiCReportRepository.SelectKPITitle(neType)
+}

src/modules/network_data/service/kpi_report.go

@@ -0,0 +1,194 @@
+package service
+
+import (
+	"encoding/json"
+	"fmt"
+	"sort"
+	"time"
+
+	"be.ems/src/framework/constants"
+	"be.ems/src/framework/database/redis"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
+
+// 实例化数据层 KpiReport 结构体
+var NewKpiReport = &KpiReport{
+	kpiReportRepository: repository.NewKpiReport,
+}
+
+// KpiReport 指标统计 服务层处理
+type KpiReport struct {
+	kpiReportRepository *repository.KpiReport // 指标数据信息
+}
+
+// FindData 通过网元指标数据信息
+func (s KpiReport) FindData(query model.KPIQuery) []map[string]any {
+	// 原始数据
+	rows := s.kpiReportRepository.SelectKPI(query)
+	if len(rows) <= 0 {
+		return []map[string]any{}
+	}
+
+	kpiIdsHas := false
+	kpiIds := []string{}
+	// 处理数据
+	arr := []map[string]any{}
+	for _, row := range rows {
+		// 解析 JSON 字符串为 map
+		var kpiValues []map[string]any
+		err := json.Unmarshal([]byte(row.KpiValues), &kpiValues)
+		if err != nil {
+			continue
+		}
+
+		item := map[string]any{
+			"neType":     row.NeType,
+			"neName":     row.NeName,
+			"rmUID":      row.RmUid,
+			"startIndex": row.Index,
+			"timeGroup":  row.CreatedAt,
+		}
+
+		// 遍历 kpiValues 数组
+		for _, v := range kpiValues {
+			kpiId := "-"
+			if k, ok := v["kpiId"]; ok {
+				kpiId = fmt.Sprint(k)
+			}
+			item[kpiId] = v["value"]
+		}
+
+		arr = append(arr, item)
+
+		// 添加指标ID
+		if !kpiIdsHas {
+			for _, v := range kpiValues {
+				kpiId := "-"
+				if k, ok := v["kpiId"]; ok {
+					kpiId = fmt.Sprint(k)
+				}
+				kpiIds = append(kpiIds, kpiId)
+			}
+			kpiIdsHas = true
+		}
+	}
+
+	// 时间密度分钟 数值单位秒 5分钟的传入300秒
+	timeInterval := query.Interval
+	// 创建一个map来存储按时间段合并后的数据
+	timeGroup := make(map[int64][]map[string]any)
+	// 遍历每个数据项
+	for _, v := range arr {
+		itemTime := parse.Number(v["timeGroup"])
+		// 计算时间戳的x分钟时间段（使用秒并除以x分钟）
+		timeMinute := itemTime / 1000 / timeInterval * timeInterval
+		// 合并到对应的时间段
+		timeGroup[timeMinute] = append(timeGroup[timeMinute], v)
+	}
+	// 时间组合输出
+	data := []map[string]any{}
+	for _, records := range timeGroup {
+		if len(records) <= 0 {
+			continue
+		}
+		// 转换为具体时间显示（根据需要可以格式化显示）
+		// timeStr := time.Unix(k, 0).Format("2006-01-02 15:04:05")
+		// fmt.Printf("Time Group: %s records: %d\n", timeStr, len(records))
+		startItem := records[len(records)-1] // 取最后一条数据也是最开始startIndex
+		if len(records) >= 2 {               // 最后一条数据不参与计算
+			for _, record := range records[:len(records)-1] {
+				// fmt.Printf("  - startIndex: %v, Value: %v\n", record["startIndex"], record["timeGroup"])
+				// 遍历kpiIds数组对lastRecord赋值
+				for _, kpiId := range kpiIds {
+					if v, ok := record[kpiId]; ok {
+						// 特殊字段，只取一次收到的非0值
+						if kpiId == "AMF.01" || kpiId == "UDM.01" || kpiId == "UDM.02" || kpiId == "UDM.03" || kpiId == "SMF.01" {
+							// startItem[kpiId] = parse.Number(v)
+							continue // startIndex的值不累加不取最后
+						} else {
+							value := parse.Number(startItem[kpiId])
+							startItem[kpiId] = value + parse.Number(v)
+						}
+					}
+				}
+			}
+		}
+		data = append(data, startItem)
+	}
+
+	// 按时间排序
+	sort.SliceStable(data, func(i, j int) bool {
+		vi := parse.Number(data[i]["timeGroup"])
+		vj := parse.Number(data[j]["timeGroup"])
+		if query.SortOrder == "asc" {
+			return vi < vj // asc
+		}
+		return vi > vj // desc
+	})
+	return data
+}
+
+// Insert 新增信息
+func (s KpiReport) Insert(param model.KpiReport) int64 {
+	return s.kpiReportRepository.Insert(param)
+}
+
+// FindTitle 网元对应的指标名称
+func (r KpiReport) FindTitle(neType string) []model.KpiTitle {
+	return r.kpiReportRepository.SelectKPITitle(neType)
+}
+
+// FindUPFTotalFlow 查询UPF总流量 N3上行 N6下行
+func (r KpiReport) FindUPFTotalFlow(rmUID string, day int) map[string]int64 {
+	now := time.Now()
+	// 获取当前日期
+	endTime := now.UnixMilli()
+	// 将当前日期前几天数
+	beginTime := now.AddDate(0, 0, -day).Truncate(24 * time.Hour).UnixMilli()
+
+	data := map[string]int64{
+		"up":   0,
+		"down": 0,
+	}
+
+	// 读取缓存数据 小于2分钟重新缓存
+	key := fmt.Sprintf("%s:UPF_FLOW:%s_%d", constants.CACHE_NE_DATA, rmUID, day)
+	if infoStr, err := redis.Get("", key); err == nil && infoStr != "" {
+		json.Unmarshal([]byte(infoStr), &data)
+		if expireSecond, _ := redis.GetExpire("", key); expireSecond > 120 {
+			return data
+		}
+	}
+
+	// down * 8 / 1000 / 1000 单位M
+	rows := r.kpiReportRepository.SelectUPF(rmUID, beginTime, endTime)
+	for _, row := range rows {
+		// 解析 JSON 字符串为 map
+		var kpiValues []map[string]any
+		err := json.Unmarshal([]byte(row.KpiValues), &kpiValues)
+		if err != nil {
+			continue
+		}
+
+		// 遍历 kpiValues 数组
+		for _, v := range kpiValues {
+			if k, ok := v["kpiId"]; ok {
+				if k == "UPF.03" {
+					data["up"] = data["up"] + parse.Number(v["value"])
+				}
+				if k == "UPF.06" {
+					data["down"] = data["down"] + parse.Number(v["value"])
+				}
+			}
+		}
+	}
+
+	// 保存到缓存
+	if infoJSON, err := json.Marshal(data); err == nil {
+		redis.SetByExpire("", key, string(infoJSON), time.Duration(10)*time.Minute)
+	}
+
+	return data
+}

src/modules/network_data/service/nb_state.go

@@ -20,8 +20,8 @@ type NBState struct {
 	nbStateRepository *repository.NBState // 基站状态记录信息
 }
 
-// SelectPage 根据条件分页查询
-func (r NBState) SelectPage(query model.NBStateQuery) ([]model.NBState, int64) {
+// FindByPage 根据条件分页查询
+func (r NBState) FindByPage(query model.NBStateQuery) ([]model.NBState, int64) {
 	return r.nbStateRepository.SelectByPage(query)
 }
 

src/modules/network_data/service/udm_auth.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/modules/network_data/model"
 	"be.ems/src/modules/network_data/repository"
 	neService "be.ems/src/modules/network_element/service"
@@ -98,13 +98,13 @@ func (r *UDMAuthUser) ParseInfo(imsi, neId string, data map[string]string) model
 	return u
 }
 
-// SelectPage 分页查询数据库
-func (r *UDMAuthUser) SelectPage(query map[string]any) (int64, []model.UDMAuthUser) {
+// FindByPage 分页查询数据库
+func (r *UDMAuthUser) FindByPage(query map[string]string) (int64, []model.UDMAuthUser) {
 	return r.udmAuthRepository.SelectPage(query)
 }
 
-// SelectList 查询数据库
-func (r *UDMAuthUser) SelectList(u model.UDMAuthUser) []model.UDMAuthUser {
+// Find 查询数据库
+func (r *UDMAuthUser) Find(u model.UDMAuthUser) []model.UDMAuthUser {
 	return r.udmAuthRepository.SelectList(u)
 }
 

src/modules/network_data/service/udm_extend.go

@@ -0,0 +1,33 @@
+package service
+
+import (
+	"be.ems/src/modules/network_data/model"
+	"be.ems/src/modules/network_data/repository"
+)
+
+// 实例化服务层 UDMExtend 结构体
+var NewUDMExtend = &UDMExtend{
+	UDMExtendRepository: repository.NewUDMExtend,
+}
+
+// UDM用户IMSI拓展信息 服务层处理
+type UDMExtend struct {
+	// UDM用户IMSI信息数据信息
+	UDMExtendRepository *repository.UDMExtend
+}
+
+// FindByIMSIAndNeID 通过IMSI和网元标识查询信息 neId为%时模糊imsi查询
+func (r UDMExtend) FindByIMSIAndNeID(imsi, neId string) model.UDMExtend {
+	return r.UDMExtendRepository.SelectByIMSIAndNeID(imsi, neId)
+}
+
+// Save 新增或修改信息
+func (r UDMExtend) Save(u model.UDMExtend) bool {
+	r.UDMExtendRepository.Delete(u.IMSI, u.NeId)
+	return r.UDMExtendRepository.Inserts([]model.UDMExtend{u}) > 0
+}
+
+// Delete 删除信息 neId为%时模糊imsi查询
+func (r UDMExtend) Delete(imsi, neId string) int64 {
+	return r.UDMExtendRepository.Delete(imsi, neId)
+}

src/modules/network_data/service/udm_sub.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/modules/network_data/model"
 	"be.ems/src/modules/network_data/repository"
 	neService "be.ems/src/modules/network_element/service"
@@ -13,14 +13,14 @@ import (
 
 // 实例化服务层 UDMSubUser 结构体
 var NewUDMSubUser = &UDMSubUser{
-	udmSubRepository:      repository.NewUDMSub,
-	udmUserInfoRepository: repository.NewUDMUserInfo,
+	udmSubRepository:    repository.NewUDMSub,
+	UDMExtendRepository: repository.NewUDMExtend,
 }
 
 // UDM签约信息 服务层处理
 type UDMSubUser struct {
-	udmSubRepository      *repository.UDMSubUser  // UDM签约信息数据信息
-	udmUserInfoRepository *repository.UDMUserInfo // UDM用户IMSI信息数据信息
+	udmSubRepository    *repository.UDMSubUser // UDM签约信息数据信息
+	UDMExtendRepository *repository.UDMExtend  // UDM用户IMSI信息数据信息
 }
 
 // dataByRedis UDM签约用户 db:0 中 udm-sd:*
@@ -172,20 +172,20 @@ func (r *UDMSubUser) ParseInfo(imsi, neId string, data map[string]string) model.
 	}
 
 	// 补充用户拓展信息
-	info := r.udmUserInfoRepository.SelectByIMSIAndNeID(imsi, neId)
+	info := r.UDMExtendRepository.SelectByIMSIAndNeID(imsi, neId)
 	if info.IMSI == imsi {
 		u.Remark = info.Remark
 	}
 	return u
 }
 
-// SelectPage 分页查询数据库
-func (r *UDMSubUser) SelectPage(query map[string]any) (int64, []model.UDMSubUser) {
+// FindByPage 分页查询数据库
+func (r *UDMSubUser) FindByPage(query map[string]string) (int64, []model.UDMSubUser) {
 	return r.udmSubRepository.SelectPage(query)
 }
 
-// SelectList 查询数据库
-func (r *UDMSubUser) SelectList(u model.UDMSubUser) []model.UDMSubUser {
+// Find 查询数据库
+func (r *UDMSubUser) Find(u model.UDMSubUser) []model.UDMSubUser {
 	return r.udmSubRepository.SelectList(u)
 }
 
@@ -197,8 +197,8 @@ func (r *UDMSubUser) Insert(neId string, u model.UDMSubUser) int64 {
 		r.udmSubRepository.Delete(u.IMSI, neId)
 		// 新增到拓展信息
 		if u.Remark != "" {
-			r.udmUserInfoRepository.Delete(u.IMSI, "%")
-			r.udmUserInfoRepository.Inserts([]model.UDMUserInfo{{
+			r.UDMExtendRepository.Delete(u.IMSI, "%")
+			r.UDMExtendRepository.Inserts([]model.UDMExtend{{
 				IMSI:   u.IMSI,
 				MSISDN: u.MSISDN,
 				NeId:   u.NeId,
@@ -252,7 +252,7 @@ func (r *UDMSubUser) InsertData(neId, dataType string, data any) int64 {
 // Delete 删除单个不重新加载
 func (r *UDMSubUser) Delete(neId, imsi string) int64 {
 	// 删除拓展信息
-	r.udmUserInfoRepository.Delete(imsi, neId)
+	r.UDMExtendRepository.Delete(imsi, neId)
 	return r.udmSubRepository.Delete(imsi, neId)
 }
 
@@ -267,7 +267,7 @@ func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) {
 		// 删除原数据
 		r.udmSubRepository.Delete(keyIMSI, neId)
 		if remark == "-(Deleted)-" {
-			r.udmUserInfoRepository.Delete(keyIMSI, "%")
+			r.UDMExtendRepository.Delete(keyIMSI, "%")
 		}
 		// 加载数据，删除标记为-(Deleted)-加载为空不插入
 		arr := r.dataByRedis(keyIMSI, neId)
@@ -277,17 +277,17 @@ func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) {
 		r.udmSubRepository.Inserts(arr)
 		// 拓展信息
 		if remark != "" {
-			uarr := make([]model.UDMUserInfo, 0, len(arr))
+			uarr := make([]model.UDMExtend, 0, len(arr))
 			for _, v := range arr {
-				uarr = append(uarr, model.UDMUserInfo{
+				uarr = append(uarr, model.UDMExtend{
 					IMSI:   v.IMSI,
 					MSISDN: v.MSISDN,
 					NeId:   v.NeId,
 					Remark: remark,
 				})
 			}
-			r.udmUserInfoRepository.Delete(keyIMSI, neId)
-			r.udmUserInfoRepository.Inserts(uarr)
+			r.UDMExtendRepository.Delete(keyIMSI, neId)
+			r.UDMExtendRepository.Inserts(uarr)
 		}
 	}
 }

src/modules/network_data/service/udm_user_info.go

@@ -1,33 +0,0 @@
-package service
-
-import (
-	"be.ems/src/modules/network_data/model"
-	"be.ems/src/modules/network_data/repository"
-)
-
-// 实例化服务层 UDMUserInfo 结构体
-var NewUDMUserInfo = &UDMUserInfo{
-	udmUserInfoRepository: repository.NewUDMUserInfo,
-}
-
-// UDM用户IMSI拓展信息 服务层处理
-type UDMUserInfo struct {
-	// UDM用户IMSI信息数据信息
-	udmUserInfoRepository *repository.UDMUserInfo
-}
-
-// SelectByIMSIAndNeID 通过IMSI和网元标识查询信息 neId为%时模糊imsi查询
-func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo {
-	return r.udmUserInfoRepository.SelectByIMSIAndNeID(imsi, neId)
-}
-
-// Save 新增或修改信息
-func (r *UDMUserInfo) Save(u model.UDMUserInfo) bool {
-	r.udmUserInfoRepository.Delete(u.IMSI, u.NeId)
-	return r.udmUserInfoRepository.Inserts([]model.UDMUserInfo{u}) > 0
-}
-
-// Delete 删除信息 neId为%时模糊imsi查询
-func (r *UDMUserInfo) Delete(imsi, neId string) int64 {
-	return r.udmUserInfoRepository.Delete(imsi, neId)
-}

src/modules/network_data/service/ue_event_amf.go

@@ -23,21 +23,21 @@ type UEEventAMF struct {
 	ueEventRepository *repository.UEEventAMF // UE会话事件数据信息
 }
 
-// SelectPage 根据条件分页查询
-func (r *UEEventAMF) SelectPage(querys model.UEEventAMFQuery) ([]model.UEEventAMF, int64) {
+// FindByPage 根据条件分页查询
+func (r *UEEventAMF) FindByPage(querys model.UEEventAMFQuery) ([]model.UEEventAMF, int64) {
 	return r.ueEventRepository.SelectByPage(querys)
 }
 
 // DeleteByIds 批量删除信息
-func (r *UEEventAMF) DeleteByIds(ueIds []string) (int64, error) {
+func (r *UEEventAMF) DeleteByIds(ids []int64) (int64, error) {
 	// 检查是否存在
-	ids := r.ueEventRepository.SelectByIds(ueIds)
-	if len(ids) <= 0 {
+	rows := r.ueEventRepository.SelectByIds(ids)
+	if len(rows) <= 0 {
 		return 0, fmt.Errorf("no data")
 	}
 
-	if len(ids) == len(ueIds) {
-		rows := r.ueEventRepository.DeleteByIds(ueIds)
+	if len(rows) == len(ids) {
+		rows := r.ueEventRepository.DeleteByIds(ids)
 		return rows, nil
 	}
 	// 删除信息失败！
@@ -55,11 +55,11 @@ func (r UEEventAMF) ExportXlsx(rows []model.UEEventAMF, fileName, language strin
 		"E1": "Time",
 	}
 	// 读取字典数据 UE 事件类型
-	dictUEEventType := sysService.NewSysDictData.SelectDictDataByType("ue_event_type")
+	dictUEEventType := sysService.NewSysDictData.FindByType("ue_event_type")
 	// 读取字典数据 UE 事件认证代码类型
-	dictUEAauthCode := sysService.NewSysDictData.SelectDictDataByType("ue_auth_code")
+	dictUEAauthCode := sysService.NewSysDictData.FindByType("ue_auth_code")
 	// 读取字典数据 UE 事件CM状态
-	dictUEEventCmState := sysService.NewSysDictData.SelectDictDataByType("ue_event_cm_state")
+	dictUEEventCmState := sysService.NewSysDictData.FindByType("ue_event_cm_state")
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
 	for i, row := range rows {
@@ -80,8 +80,8 @@ func (r UEEventAMF) ExportXlsx(rows []model.UEEventAMF, fileName, language strin
 		// 取类型
 		eventType := ""
 		for _, v := range dictUEEventType {
-			if row.EventType == v.DictValue {
-				eventType = i18n.TKey(language, v.DictLabel)
+			if row.EventType == v.DataValue {
+				eventType = i18n.TKey(language, v.DataLabel)
 				break
 			}
 		}
@@ -96,8 +96,8 @@ func (r UEEventAMF) ExportXlsx(rows []model.UEEventAMF, fileName, language strin
 			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)
+					if eventResult == v.DataValue {
+						eventResult = i18n.TKey(language, v.DataLabel)
 						break
 					}
 				}
@@ -116,8 +116,8 @@ func (r UEEventAMF) ExportXlsx(rows []model.UEEventAMF, fileName, language strin
 			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)
+					if eventResult == v.DataValue {
+						eventResult = i18n.TKey(language, v.DataLabel)
 						break
 					}
 				}

src/modules/network_data/service/ue_event_mme.go

@@ -25,21 +25,21 @@ type UEEventMME struct {
 	ueEventRepository *repository.UEEventMME // UE会话事件数据信息
 }
 
-// SelectPage 根据条件分页查询
-func (r *UEEventMME) SelectPage(querys model.UEEventMMEQuery) ([]model.UEEventMME, int64) {
+// FindByPage 根据条件分页查询
+func (r *UEEventMME) FindByPage(querys model.UEEventMMEQuery) ([]model.UEEventMME, int64) {
 	return r.ueEventRepository.SelectByPage(querys)
 }
 
 // DeleteByIds 批量删除信息
-func (r *UEEventMME) DeleteByIds(ueIds []string) (int64, error) {
+func (r *UEEventMME) DeleteByIds(ids []int64) (int64, error) {
 	// 检查是否存在
-	ids := r.ueEventRepository.SelectByIds(ueIds)
-	if len(ids) <= 0 {
+	rows := r.ueEventRepository.SelectByIds(ids)
+	if len(rows) <= 0 {
 		return 0, fmt.Errorf("no data")
 	}
 
-	if len(ids) == len(ueIds) {
-		rows := r.ueEventRepository.DeleteByIds(ueIds)
+	if len(rows) == len(ids) {
+		rows := r.ueEventRepository.DeleteByIds(ids)
 		return rows, nil
 	}
 	// 删除信息失败！
@@ -57,11 +57,11 @@ func (r UEEventMME) ExportXlsx(rows []model.UEEventMME, fileName, language strin
 		"E1": "Time",
 	}
 	// 读取字典数据 UE 事件类型
-	dictUEEventType := sysService.NewSysDictData.SelectDictDataByType("ue_event_type")
+	dictUEEventType := sysService.NewSysDictData.FindByType("ue_event_type")
 	// 读取字典数据 UE 事件认证代码类型
-	dictUEAauthCode := sysService.NewSysDictData.SelectDictDataByType("ue_auth_code")
+	dictUEAauthCode := sysService.NewSysDictData.FindByType("ue_auth_code")
 	// 读取字典数据 UE 事件CM状态
-	dictUEEventCmState := sysService.NewSysDictData.SelectDictDataByType("ue_event_cm_state")
+	dictUEEventCmState := sysService.NewSysDictData.FindByType("ue_event_cm_state")
 	// 从第二行开始的数据
 	dataCells := make([]map[string]any, 0)
 	for i, row := range rows {
@@ -82,8 +82,8 @@ func (r UEEventMME) ExportXlsx(rows []model.UEEventMME, fileName, language strin
 		// 取类型
 		eventType := row.EventType
 		for _, v := range dictUEEventType {
-			if row.EventType == v.DictValue {
-				eventType = i18n.TKey(language, v.DictLabel)
+			if row.EventType == v.DataValue {
+				eventType = i18n.TKey(language, v.DataLabel)
 				break
 			}
 		}
@@ -93,16 +93,16 @@ func (r UEEventMME) ExportXlsx(rows []model.UEEventMME, fileName, language strin
 			eventResult = v.(string)
 			if row.EventType == "auth-result" {
 				for _, v := range dictUEAauthCode {
-					if eventResult == v.DictValue {
-						eventResult = i18n.TKey(language, v.DictLabel)
+					if eventResult == v.DataValue {
+						eventResult = i18n.TKey(language, v.DataLabel)
 						break
 					}
 				}
 			}
 			if row.EventType == "cm-state" {
 				for _, v := range dictUEEventCmState {
-					if eventResult == v.DictValue {
-						eventResult = i18n.TKey(language, v.DictLabel)
+					if eventResult == v.DataValue {
+						eventResult = i18n.TKey(language, v.DataLabel)
 						break
 					}
 				}