增加新布局

server/models/menu.go

@@ -6,7 +6,7 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 )
 
-// Menu 菜单模型（增强版）
+// Menu 菜单模型
 type Menu struct {
 	Id            int       `orm:"auto"`
 	Name          string    `orm:"size(100)"`
@@ -30,38 +30,29 @@ func (m *Menu) TableName() string {
 }
 
 // GetAllMenus 获取所有菜单
-func GetAllMenus() ([]*Menu, error) {
+func GetAllMenus() ([]map[string]interface{}, error) {
 	o := orm.NewOrm()
 	var menus []*Menu
-	_, err := o.QueryTable("yz_menus").OrderBy("Order").All(&menus)
-	return menus, err
-}
-
-// GetTopLevelMenus
-func GetTopLevelMenus() ([]*Menu, error) {
-	o := orm.NewOrm()
-	var menus []*Menu
-	_, err := o.QueryTable("yz_menus").Filter("parent_id", 0).OrderBy("Order").All(&menus)
-	return menus, err
-}
-
-// GetActiveMenus 获取启用的菜单（状态为1）
-func GetActiveMenus() ([]*Menu, error) {
-	o := orm.NewOrm()
-	var menus []*Menu
-	_, err := o.QueryTable("yz_menus").Filter("status", 1).OrderBy("Order").All(&menus)
-	return menus, err
-}
-
-// GetMenusByParentId
-func GetMenusByParentId(parentId int) ([]*Menu, error) {
-	o := orm.NewOrm()
-	var menus []*Menu
-	_, err := o.QueryTable("yz_menus").Filter("parent_id", parentId).OrderBy("Order").All(&menus)
+	_, err := o.QueryTable("yz_menus").Filter("Status", 1).All(&menus)
 	if err != nil {
 		return nil, err
 	}
-	return menus, nil
+	result := make([]map[string]interface{}, 0, len(menus))
+	for _, m := range menus {
+		item := map[string]interface{}{
+			"id":            m.Id,
+			"name":          m.Name,
+			"path":          m.Path,
+			"parentId":      m.ParentId,
+			"icon":          m.Icon,
+			"order":         m.Order,
+			"componentPath": m.ComponentPath,
+			"isExternal":    m.IsExternal,
+			"externalUrl":   m.ExternalUrl,
+		}
+		result = append(result, item)
+	}
+	return result, nil
 }
 
 // AddMenu 添加新菜单
@@ -84,14 +75,3 @@ func DeleteMenu(id int) error {
 	_, err := o.Delete(&Menu{Id: id})
 	return err
 }
-
-// GetMenuById 根据ID获取单个菜单
-func GetMenuById(id int) (*Menu, error) {
-	o := orm.NewOrm()
-	var menu Menu
-	err := o.QueryTable("yz_menus").Filter("id", id).One(&menu)
-	if err != nil {
-		return nil, err
-	}
-	return &menu, nil
-}