refactor platform menus and entity statuses

backend/api/internal/logic/platform/platform/access.go

@@ -4,15 +4,14 @@ import (
 	"git.apinb.com/bsm-sdk/core/errcode"
 	"git.apinb.com/bsm-sdk/core/infra"
 	"git.apinb.com/bsm-sdk/core/middleware"
-	"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
-	"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
+	platformbase "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/platform"
 	"github.com/gin-gonic/gin"
 	"strings"
 )
 
 const platformMenusContextKey = "platform_authorized_menus"
 
-func platformMenuAllowsPath(menus []models.PlatformMenu, requestPath string) bool {
+func platformMenuAllowsPath(menus []platformbase.Menu, requestPath string) bool {
 	marker := "/platform/v1/"
 	index := strings.Index(requestPath, marker)
 	if index < 0 {
@@ -70,7 +69,7 @@ func RequirePlatformMenuAccess() gin.HandlerFunc {
 			ctx.Next()
 			return
 		}
-		menus, err := common.LoadPlatformMenus(claims.Role)
+		menus, err := platformbase.LoadPlatformMenus(claims.Role)
 		if err != nil || !platformMenuAllowsPath(menus, ctx.Request.URL.Path) {
 			infra.Response.Error(ctx, errcode.ErrPermissionDenied)
 			ctx.Abort()

backend/api/internal/logic/platform/platform/account.go

@@ -78,7 +78,7 @@ func CreatePlatformAccount(ctx *gin.Context) {
 		infra.Response.Error(ctx, err)
 		return
 	}
-	account := models.PlatformAccount{Entity: common.NewEntity("enabled"), Username: request.Username, DisplayName: request.DisplayName, Avatar: request.Avatar, PasswordHash: hash, PlatformRoleCode: request.PlatformRoleCode, Phone: request.Phone}
+	account := models.PlatformAccount{Entity: common.NewEntity(common.StatusEnable), Username: request.Username, DisplayName: request.DisplayName, Avatar: request.Avatar, PasswordHash: hash, PlatformRoleCode: request.PlatformRoleCode, Phone: request.Phone}
 	if err := impl.DBService.Create(&account).Error; err != nil {
 		infra.Response.Error(ctx, err)
 		return
@@ -138,5 +138,5 @@ func isAssignablePlatformRole(roleCode string) bool {
 		return false
 	}
 	var role models.PlatformRole
-	return impl.DBService.Where("role_code = ? AND status = ? AND is_system = ?", roleCode, "enabled", false).First(&role).Error == nil
+	return impl.DBService.Where("role_code = ? AND status = ? AND is_system = ?", roleCode, common.StatusEnable, false).First(&role).Error == nil
 }

backend/api/internal/logic/platform/platform/menu.go

@@ -4,125 +4,31 @@ import (
 	"git.apinb.com/bsm-sdk/core/errcode"
 	"git.apinb.com/bsm-sdk/core/infra"
 	"git.apinb.com/bsm-sdk/core/middleware"
-	"git.apinb.com/heqiapp/platforms/backend/api/internal/impl"
-	"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
-	"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
+	platformbase "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/platform"
 	"github.com/gin-gonic/gin"
 )
 
-type platformMenuRequest struct {
-	ParentIdentity string `json:"parent_identity"`
-	MenuCode       string `json:"menu_code" binding:"required,max=64"`
-	Name           string `json:"name" binding:"required,max=64"`
-	Icon           string `json:"icon" binding:"max=64"`
-	Path           string `json:"path" binding:"max=255"`
-	SortNo         int    `json:"sort_no"`
-}
-
-type platformMenuView struct {
-	Identity       string `json:"identity"`
-	ParentIdentity string `json:"parent_identity,omitempty"`
-	MenuCode       string `json:"menu_code"`
-	Name           string `json:"name"`
-	Icon           string `json:"icon"`
-	Path           string `json:"path"`
-	SortNo         int    `json:"sort_no"`
-	Status         string `json:"status"`
-}
-
-func platformMenuViews(list []models.PlatformMenu) []platformMenuView {
-	identities := make(map[uint64]string, len(list))
-	for _, item := range list {
-		identities[item.ID] = item.Identity
-	}
-	views := make([]platformMenuView, 0, len(list))
-	for _, item := range list {
-		views = append(views, platformMenuView{Identity: item.Identity, ParentIdentity: identities[item.ParentID], MenuCode: item.MenuCode, Name: item.Name, Icon: item.Icon, Path: item.Path, SortNo: item.SortNo, Status: item.Status})
-	}
-	return views
-}
-
+// GetPlatformMenu 返回一项静态菜单定义。
 func GetPlatformMenu(ctx *gin.Context) {
-	var menu models.PlatformMenu
-	if err := impl.DBService.Where("identity = ?", ctx.Param("identity")).First(&menu).Error; err != nil {
-		common.RespondRecordError(ctx, err)
+	menu, ok := platformbase.FindPlatformMenu(ctx.Param("identity"))
+	if !ok {
+		infra.Response.Error(ctx, errcode.ErrRecordNotFound)
 		return
 	}
-	list := []models.PlatformMenu{menu}
-	if menu.ParentID != 0 {
-		var parent models.PlatformMenu
-		if err := impl.DBService.Select("id", "identity").First(&parent, menu.ParentID).Error; err == nil {
-			list = append(list, parent)
-		}
-	}
-	views := platformMenuViews(list)
-	infra.Response.Success(ctx, views[0])
+	infra.Response.Success(ctx, menu)
 }
 
-func CreatePlatformMenu(ctx *gin.Context) {
-	if !common.RequirePlatformRoot(ctx) {
-		return
-	}
-	var request platformMenuRequest
-	if err := ctx.ShouldBindJSON(&request); err != nil {
-		infra.Response.Error(ctx, errcode.ErrInvalidArgument)
-		return
-	}
-	parentID, err := common.ResolveIdentityID(&models.PlatformMenu{}, request.ParentIdentity, false)
-	if err != nil {
-		infra.Response.Error(ctx, errcode.ErrInvalidArgument)
-		return
-	}
-	menu := models.PlatformMenu{Entity: common.NewEntity("enabled"), ParentID: parentID, MenuCode: request.MenuCode, Name: request.Name, Icon: request.Icon, Path: request.Path, SortNo: request.SortNo}
-	if err := impl.DBService.Create(&menu).Error; err != nil {
-		infra.Response.Error(ctx, err)
-		return
-	}
-	common.RespondCreatedResource(ctx, menu)
-}
-
-func UpdatePlatformMenu(ctx *gin.Context) {
-	if !common.RequirePlatformRoot(ctx) {
-		return
-	}
-	var request platformMenuRequest
-	if err := ctx.ShouldBindJSON(&request); err != nil {
-		infra.Response.Error(ctx, errcode.ErrInvalidArgument)
-		return
-	}
-	parentID, err := common.ResolveIdentityID(&models.PlatformMenu{}, request.ParentIdentity, false)
-	if err != nil {
-		infra.Response.Error(ctx, errcode.ErrInvalidArgument)
-		return
-	}
-	common.UpdateAllowedByIdentity(ctx, &models.PlatformMenu{}, gin.H{"parent_id": parentID, "name": request.Name, "icon": request.Icon, "path": request.Path, "sort_no": request.SortNo}, []string{"parent_id", "name", "icon", "path", "sort_no"})
-}
-
-func UpdatePlatformMenuStatus(ctx *gin.Context) {
-	if !common.RequirePlatformRoot(ctx) {
-		return
-	}
-	common.UpdateRecordStatus(ctx, &models.PlatformMenu{})
-}
-
-func ArchivePlatformMenu(ctx *gin.Context) {
-	if !common.RequirePlatformRoot(ctx) {
-		return
-	}
-	common.ArchiveRecord(ctx, &models.PlatformMenu{})
-}
-
-// ListPlatformMenu 返回菜单树构建所需的有序菜单列表。
+// ListPlatformMenu 返回当前角色获授权的静态菜单。
 func ListPlatformMenu(ctx *gin.Context) {
 	claims, err := middleware.ParseAuth(ctx)
 	if err != nil {
 		infra.Response.Error(ctx, err)
 		return
 	}
-	list, err := common.LoadPlatformMenus(claims.Role)
+	list, err := platformbase.LoadPlatformMenus(claims.Role)
 	if err != nil {
 		infra.Response.Error(ctx, err)
 		return
 	}
-	infra.Response.Success(ctx, gin.H{"total": len(list), "list": platformMenuViews(list)})
+	infra.Response.Success(ctx, gin.H{"total": len(list), "list": list})
 }

backend/api/internal/logic/platform/platform/role.go

@@ -25,7 +25,7 @@ func CreatePlatformRole(ctx *gin.Context) {
 		infra.Response.Error(ctx, errcode.ErrInvalidArgument)
 		return
 	}
-	request.Entity = common.NewEntity("enabled")
+	request.Entity = common.NewEntity(common.StatusEnable)
 	request.IsSystem = false
 	if request.DataScope == "" {
 		request.DataScope = "global"
@@ -68,7 +68,7 @@ func UpdatePlatformRoleStatus(ctx *gin.Context) {
 		return
 	}
 	var request struct {
-		Status string `json:"status" binding:"required,max=32"`
+		Status int `json:"status" binding:"required"`
 	}
 	if err := ctx.ShouldBindJSON(&request); err != nil {
 		infra.Response.Error(ctx, errcode.ErrInvalidArgument)
@@ -100,5 +100,5 @@ func ArchivePlatformRole(ctx *gin.Context) {
 		infra.Response.Error(ctx, errcode.ErrInvalidArgument)
 		return
 	}
-	common.UpdateAllowedByIdentity(ctx, &models.PlatformRole{}, gin.H{"status": "archived"}, []string{"status"})
+	common.UpdateAllowedByIdentity(ctx, &models.PlatformRole{}, gin.H{"status": common.StatusArchived}, []string{"status"})
 }

backend/api/internal/logic/platform/platform/role_menu.go

@@ -6,6 +6,7 @@ import (
 	"git.apinb.com/bsm-sdk/core/infra"
 	"git.apinb.com/heqiapp/platforms/backend/api/internal/impl"
 	"git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
+	platformbase "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/platform"
 	"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -35,20 +36,19 @@ func ReplacePlatformRoleMenus(ctx *gin.Context) {
 		if role.IsSystem {
 			return errSystemPlatformRole
 		}
-		var menus []models.PlatformMenu
-		if len(request.MenuIdentities) > 0 {
-			if err := transaction.Where("identity IN ?", request.MenuIdentities).Find(&menus).Error; err != nil {
-				return err
-			}
-			if len(menus) != len(request.MenuIdentities) {
+		menuCodes := make(map[string]struct{}, len(request.MenuIdentities))
+		for _, identity := range request.MenuIdentities {
+			menu, ok := platformbase.FindPlatformMenu(identity)
+			if !ok {
 				return gorm.ErrRecordNotFound
 			}
+			menuCodes[menu.MenuCode] = struct{}{}
 		}
 		if err := transaction.Where("platform_role_id = ?", role.ID).Delete(&models.PlatformRoleMenu{}).Error; err != nil {
 			return err
 		}
-		for _, menu := range menus {
-			relation := models.PlatformRoleMenu{PlatformRoleID: role.ID, PlatformMenuID: menu.ID}
+		for menuCode := range menuCodes {
+			relation := models.PlatformRoleMenu{PlatformRoleID: role.ID, MenuCode: menuCode}
 			if err := transaction.Create(&relation).Error; err != nil {
 				return err
 			}
@@ -79,14 +79,22 @@ func ListPlatformRoleMenuIdentities(ctx *gin.Context) {
 		common.RespondRecordError(ctx, err)
 		return
 	}
-	var identities []string
-	if err := impl.DBService.Model(&models.PlatformMenu{}).
-		Joins("JOIN platform_role_menu ON platform_role_menu.platform_menu_id = platform_menu.id").
-		Where("platform_role_menu.platform_role_id = ?", role.ID).
-		Order("platform_menu.sort_no asc, platform_menu.id asc").
-		Pluck("platform_menu.identity", &identities).Error; err != nil {
+	var codes []string
+	if err := impl.DBService.Model(&models.PlatformRoleMenu{}).
+		Where("platform_role_id = ?", role.ID).
+		Pluck("menu_code", &codes).Error; err != nil {
 		infra.Response.Error(ctx, err)
 		return
 	}
+	assigned := make(map[string]struct{}, len(codes))
+	for _, code := range codes {
+		assigned[code] = struct{}{}
+	}
+	identities := make([]string, 0, len(codes))
+	for _, menu := range platformbase.AllPlatformMenus() {
+		if _, ok := assigned[menu.MenuCode]; ok {
+			identities = append(identities, menu.Identity)
+		}
+	}
 	infra.Response.Success(ctx, gin.H{"menu_identities": identities})
 }