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

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
 	}