优化

internal/server/handler/menu.go

@@ -1,8 +1,6 @@
 package handler
 
 import (
-	"strconv"
-
 	"kra/internal/server/httpx"
 	"kra/internal/service"
 	"kra/internal/service/dto"
@@ -34,8 +32,28 @@ func (h *Menu) Tree(c *gin.Context) {
 
 func (h *Menu) Create(c *gin.Context) {
 	var req dto.MenuRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.Path == "" {
+		httpx.Fail(c, "Path值不能为空")
+		return
+	}
+	if req.Name == "" {
+		httpx.Fail(c, "Name值不能为空")
+		return
+	}
+	if req.Component == "" {
+		httpx.Fail(c, "Component值不能为空")
+		return
+	}
+	if req.Sort < 0 {
+		httpx.Fail(c, "Sort长度或值不在合法范围,ge=0")
+		return
+	}
+	if req.Meta.Title == "" {
+		httpx.Fail(c, "Title值不能为空")
 		return
 	}
 	if err := h.service.Create(c.Request.Context(), &req); err != nil {
@@ -47,8 +65,28 @@ func (h *Menu) Create(c *gin.Context) {
 
 func (h *Menu) Update(c *gin.Context) {
 	var req dto.MenuRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.Path == "" {
+		httpx.Fail(c, "Path值不能为空")
+		return
+	}
+	if req.Name == "" {
+		httpx.Fail(c, "Name值不能为空")
+		return
+	}
+	if req.Component == "" {
+		httpx.Fail(c, "Component值不能为空")
+		return
+	}
+	if req.Sort < 0 {
+		httpx.Fail(c, "Sort长度或值不在合法范围,ge=0")
+		return
+	}
+	if req.Meta.Title == "" {
+		httpx.Fail(c, "Title值不能为空")
 		return
 	}
 	if err := h.service.Update(c.Request.Context(), &req); err != nil {
@@ -60,8 +98,12 @@ func (h *Menu) Update(c *gin.Context) {
 
 func (h *Menu) Delete(c *gin.Context) {
 	var req dto.DeleteMenuRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.ID == 0 {
+		httpx.Fail(c, "ID值不能为空")
 		return
 	}
 	if err := h.service.Delete(c.Request.Context(), req.ID); err != nil {
@@ -73,8 +115,12 @@ func (h *Menu) Delete(c *gin.Context) {
 
 func (h *Menu) Find(c *gin.Context) {
 	var req dto.GetMenuRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.ID == 0 {
+		httpx.Fail(c, "ID值不能为空")
 		return
 	}
 	item, err := h.service.Find(c.Request.Context(), req.ID)
@@ -87,8 +133,12 @@ func (h *Menu) Find(c *gin.Context) {
 
 func (h *Menu) SetAuthorityMenus(c *gin.Context) {
 	var req dto.SetAuthorityMenusRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.AuthorityID == 0 {
+		httpx.Fail(c, "AuthorityId值不能为空")
 		return
 	}
 	if err := h.service.SetAuthorityMenus(c.Request.Context(), &req); err != nil {
@@ -100,8 +150,12 @@ func (h *Menu) SetAuthorityMenus(c *gin.Context) {
 
 func (h *Menu) AuthorityMenus(c *gin.Context) {
 	var req dto.GetAuthorityMenusRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.AuthorityID == 0 {
+		httpx.Fail(c, "AuthorityId值不能为空")
 		return
 	}
 	menus, err := h.service.AuthorityMenus(c.Request.Context(), req.AuthorityID)
@@ -113,18 +167,26 @@ func (h *Menu) AuthorityMenus(c *gin.Context) {
 }
 
 func (h *Menu) RoleIDs(c *gin.Context) {
-	id, _ := strconv.ParseUint(c.Query("menuId"), 10, 64)
-	ids, err := h.service.RoleIDs(c.Request.Context(), uint(id))
+	var req dto.SetMenuRolesRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.MenuID == 0 {
+		httpx.Fail(c, "菜单ID不能为空")
+		return
+	}
+	ids, err := h.service.RoleIDs(c.Request.Context(), req.MenuID)
 	if err != nil {
-		httpx.Fail(c, "获取失败")
+		httpx.Fail(c, "获取失败"+err.Error())
 		return
 	}
 	if ids == nil {
 		ids = []uint{}
 	}
-	defaultIDs, err := h.service.DefaultRouterRoleIDs(c.Request.Context(), uint(id))
+	defaultIDs, err := h.service.DefaultRouterRoleIDs(c.Request.Context(), req.MenuID)
 	if err != nil {
-		httpx.Fail(c, "获取失败")
+		httpx.Fail(c, "获取失败"+err.Error())
 		return
 	}
 	if defaultIDs == nil {
@@ -135,12 +197,16 @@ func (h *Menu) RoleIDs(c *gin.Context) {
 
 func (h *Menu) SetRoles(c *gin.Context) {
 	var req dto.SetMenuRolesRequest
-	if c.ShouldBindJSON(&req) != nil {
-		httpx.Fail(c, "参数错误")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		httpx.Fail(c, err.Error())
+		return
+	}
+	if req.MenuID == 0 {
+		httpx.Fail(c, "菜单ID不能为空")
 		return
 	}
 	if err := h.service.SetRoles(c.Request.Context(), &req); err != nil {
-		httpx.Fail(c, "设置失败")
+		httpx.Fail(c, "设置失败"+err.Error())
 		return
 	}
 	httpx.Write(c, httpx.CodeSuccess, gin.H{}, "设置成功")