feat：完善项目

app/controller/role/instance.go

@@ -2,7 +2,6 @@ package role
 
 import (
 	model2 "ArmedPolice/app/common/model"
-	"ArmedPolice/app/controller/basic"
 	"ArmedPolice/app/model"
 	"ArmedPolice/app/service"
 )
@@ -11,29 +10,76 @@ type Instance struct{ *service.Session }
 
 type InstanceHandle func(session *service.Session) *Instance
 
-func (c *Instance) List() (*basic.PageDataResponse, error) {
+type (
+	// InstanceInfo 基本信息
+	InstanceInfo struct {
+		ID       string          `json:"id"`
+		Name     string          `json:"name"`
+		Children []*InstanceInfo `json:"children"`
+	}
+	// InstanceParams 参数信息
+	InstanceParams struct {
+		ID, ParentID uint64
+		Name, Remark string
+		Sort         int
+	}
+)
+
+func (c *Instance) tree(src []*model2.SysRole, parentID uint64) []*InstanceInfo {
+	out := make([]*InstanceInfo, 0)
+
+	for _, v := range src {
+		if v.ParentID == parentID {
+			out = append(out, &InstanceInfo{
+				ID:       v.GetEncodeID(),
+				Name:     v.Name,
+				Children: c.tree(src, v.ID),
+			})
+		}
+	}
+	return out
+}
+
+// List 列表信息
+func (c *Instance) List() ([]*InstanceInfo, error) {
 	mSysRole := model.NewSysRole()
 
-	where := make([]*model2.ModelWhereOrder, 0)
-
-	//if  {
-	//
-	//}
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Order: model2.NewOrder("sort", model2.OrderModeToDesc),
+		},
+	}
 	out := make([]*model2.SysRole, 0)
 
 	if err := model2.Find(mSysRole.SysRole, &out, where...); err != nil {
 		return nil, err
 	}
-
-	return &basic.PageDataResponse{Data: nil, Count: 0}, nil
+	return c.tree(out, 0), nil
 }
 
-func (c *Instance) Form() error {
-	return nil
+// Form 数据处理
+func (c *Instance) Form(params *InstanceParams) error {
+	mSysRole := model.NewSysRole()
+
+	if params.ID > 0 {
+		mSysRole.ID = params.ID
+
+		return model2.Updates(mSysRole.SysRole, map[string]interface{}{
+			"parent_id": params.ParentID, "name": params.Name, "remark": params.Remark, "sort": params.Sort,
+		})
+	}
+	mSysRole.ParentID = params.ParentID
+	mSysRole.Name = params.Name
+	mSysRole.Remark = params.Remark
+	mSysRole.Sort = params.Sort
+	return model2.Create(mSysRole.SysRole)
 }
 
-func (c *Instance) Delete() error {
-	return nil
+// Delete 删除操作
+func (c *Instance) Delete(id uint64) error {
+	mSysRole := model.NewSysRole()
+	mSysRole.ID = id
+	return model2.Delete(mSysRole.SysRole)
 }
 
 func NewInstance() InstanceHandle {

app/controller/role/menu.go

@@ -1,24 +1,73 @@
 package role
 
 import (
-	"ArmedPolice/app/controller/basic"
+	model2 "ArmedPolice/app/common/model"
+	"ArmedPolice/app/controller/menu"
+	"ArmedPolice/app/model"
 	"ArmedPolice/app/service"
+	"ArmedPolice/serve/orm"
+	"errors"
+	"gorm.io/gorm"
 )
 
 type Menu struct{ *service.Session }
 
 type MenuHandle func(session *service.Session) *Menu
 
-func (c *Menu) List() (*basic.PageDataResponse, error) {
-	return &basic.PageDataResponse{Data: nil, Count: 0}, nil
+// List 菜单列表
+func (c *Menu) List(roleID uint64) ([]*menu.InstanceIdentityInfo, error) {
+	mSysMenu := model.NewSysMenu()
+	out, err := mSysMenu.RoleMenu(roleID)
+
+	if err != nil {
+		return nil, err
+	}
+	return menu.TreeIdentity(out, 0), nil
 }
 
-func (c *Menu) Form() error {
-	return nil
-}
+// Bind 绑定菜单
+func (c *Menu) Bind(roleID uint64, menuIDs []uint64) error {
+	if len(menuIDs) > 0 {
+		var count int64
 
-func (c *Menu) Delete() error {
-	return nil
+		mSysMenu := model.NewSysMenu()
+
+		if err := model2.Count(mSysMenu.SysMenu, &count, model2.NewWhereIn("id", menuIDs),
+			model2.NewWhere("auth", model2.SysMenuAuthForSystem)); err != nil {
+			return err
+		} else if count > 0 {
+			return errors.New("不可设置超管菜单")
+		}
+	}
+	mSysRoleMenu := model.NewSysRoleMenu()
+
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		err := model2.DeleteWhere(mSysRoleMenu.SysRoleMenu, []*model2.ModelWhere{model2.NewWhere("role_id", roleID)}, tx)
+
+		if err != nil {
+			return err
+		}
+		if len(menuIDs) <= 0 {
+			return nil
+		}
+		menus := make([]*model2.SysRoleMenu, 0)
+
+		mark := make(map[uint64]uint64, 0)
+
+		for _, v := range menuIDs {
+			if _, has := mark[v]; has {
+				continue
+			}
+			menus = append(menus, &model2.SysRoleMenu{
+				ModelTenant: model2.ModelTenant{TenantID: c.TenantID}, RoleID: roleID, MenuID: v,
+			})
+			mark[v] = v
+		}
+		if err = model2.Creates(mSysRoleMenu.SysRoleMenu, menus, tx); err != nil {
+			return err
+		}
+		return nil
+	})
 }
 
 func NewMenu() MenuHandle {