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

src/modules/network_element/controller/ne_version.go

@@ -1,12 +1,15 @@
 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/framework/utils/parse"
 	neService "be.ems/src/modules/network_element/service"
+
 	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 NeVersionController 结构体
@@ -25,31 +28,30 @@ type NeVersionController struct {
 //
 // GET /list
 func (s *NeVersionController) List(c *gin.Context) {
-	querys := ctx.QueryMap(c)
-	data := s.neVersionService.SelectPage(querys, true)
-
-	c.JSON(200, result.Ok(data))
+	query := reqctx.QueryMap(c)
+	rows, total := s.neVersionService.FindByPage(query, true)
+	c.JSON(200, resp.OkData(map[string]any{"total": total, "rows": rows}))
 }
 
 // 网元版本信息
 //
-// GET /:versionId
+// GET /:id
 func (s *NeVersionController) Info(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	versionId := c.Param("versionId")
-	if versionId == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	language := reqctx.AcceptLanguage(c)
+	id := parse.Number(c.Param("id"))
+	if id <= 0 {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
 
-	neVersion := s.neVersionService.SelectById(versionId)
-	if neVersion.ID != versionId {
+	neVersion := s.neVersionService.FindById(id)
+	if neVersion.ID != id {
 		// 没有可访问网元版本数据！
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neVersion.noData")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neVersion.noData")))
 		return
 	}
 
-	c.JSON(200, result.OkData(neVersion))
+	c.JSON(200, resp.OkData(neVersion))
 }
 
 // 网元版本操作
@@ -66,30 +68,31 @@ func (s *NeVersionController) Info(c *gin.Context) {
 //	@Description	Network element version operation
 //	@Router			/ne/version/operate [post]
 func (s *NeVersionController) Operate(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
+	language := reqctx.AcceptLanguage(c)
 	var body struct {
 		Action   string            `json:"action" binding:"required,oneof=install upgrade rollback"` // 操作行为
 		NeType   string            `json:"neType" gorm:"ne_type" binding:"required"`                 // 网元类型
 		NeId     string            `json:"neId" gorm:"ne_id" binding:"required"`                     // 网元ID
 		Preinput map[string]string `json:"preinput" `                                                // 预先输入参数
 	}
-	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
 	}
 
-	neVersion := s.neVersionService.SelectByNeTypeAndNeID(body.NeType, body.NeId)
+	neVersion := s.neVersionService.FindByNeTypeAndNeID(body.NeType, body.NeId)
 	if neVersion.NeId != body.NeId {
 		// 没有可访问网元版本数据！
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neVersion.noData")))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, "neVersion.noData")))
 		return
 	}
 
 	// 进行相关命令操作
 	output, err := s.neVersionService.Operate(body.Action, neVersion, body.Preinput)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
 		return
 	}
-	c.JSON(200, result.OkData(output))
+	c.JSON(200, resp.OkData(output))
 }