feat：完善信息

2021-10-15 15:06:02 +08:00
parent af8691e943
commit ae9fb8ea0f
86 changed files with 215 additions and 216 deletions
--- a/app/api/manage/controller/role/auth.go
+++ b/app/api/manage/controller/role/auth.go
@ -0,0 +1,88 @@
+package role
+
+import (
+	"SciencesServer/app/api/manage/controller"
+	auth2 "SciencesServer/app/api/manage/controller/auth"
+	model3 "SciencesServer/app/api/manage/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/logger"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+
+	"gorm.io/gorm"
+)
+
+type Auth struct{ *controller.Platform }
+
+type AuthHandle func(session *service.Session) *Auth
+
+// List 角色权限列表
+func (c *Auth) List(roleID uint64) ([]*auth2.TreeChecked, error) {
+	mSysAuth := model3.NewSysAuth()
+
+	out, err := mSysAuth.RoleAuth(c.TenantID, roleID)
+
+	if err != nil {
+		return nil, err
+	}
+	return auth2.TreeCheckedFunc(out, 0), nil
+}
+
+// Bind 角色权限绑定
+func (c *Auth) Bind(roleID uint64, authIDs []uint64) error {
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		mSysRoleAuth := model3.NewSysRoleAuth()
+
+		err := model2.DeleteWhere(mSysRoleAuth.SysRoleAuth, []*model2.ModelWhere{model2.NewWhere("role_id", roleID)}, tx)
+
+		if err != nil {
+			return err
+		}
+		// 查询权限信息
+		mSysAuth := model3.NewSysAuth()
+
+		auths := make([]*model2.SysAuth, 0)
+
+		if err = model2.Find(mSysAuth.SysAuth, &auths, &model2.ModelWhereOrder{Where: model2.NewWhereIn("id", authIDs)}); err != nil {
+			return err
+		}
+		authRequests := make([]*service.AuthRequest, 0)
+
+		roles := make([]*model2.SysRoleAuth, 0)
+
+		for _, v := range auths {
+			roles = append(roles, &model2.SysRoleAuth{
+				ModelTenant: model2.ModelTenant{TenantID: c.TenantID}, RoleID: roleID, AuthID: v.ID,
+			})
+			if v.Auth == "" {
+				continue
+			}
+			authRequests = append(authRequests, &service.AuthRequest{Url: v.Auth, Method: "*"})
+		}
+		if err = model2.Creates(mSysRoleAuth.SysRoleAuth, roles, tx); err != nil {
+			return err
+		}
+		go utils.TryCatch(func() {
+			permission := service.NewPermission([]string{utils.UintToString(roleID)}, authRequests...)(c.TenantKey, "")
+			// 删除角色权限
+			if _, err = permission.RemoveRolePolicy(); err != nil {
+				logger.ErrorF("删除角色【%d】规则信息错误：%v", roleID, err)
+				return
+			}
+			if len(authRequests) > 0 {
+				if _, err = permission.AddPolicies(); err != nil {
+					logger.ErrorF("创建角色【%d】规则信息错误：%v", roleID, err)
+					return
+				}
+			}
+		})
+		return nil
+	})
+}
+
+func NewAuth() AuthHandle {
+	return func(session *service.Session) *Auth {
+		return &Auth{Platform: &controller.Platform{Session: session}}
+	}
+}
--- a/app/api/manage/controller/role/instance.go
+++ b/app/api/manage/controller/role/instance.go
@ -0,0 +1,174 @@
+package role
+
+import (
+	"SciencesServer/app/api/manage/controller"
+	"SciencesServer/app/api/manage/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/logger"
+	"SciencesServer/utils"
+	"errors"
+	"time"
+)
+
+type Instance struct{ *controller.Platform }
+
+type InstanceHandle func(session *service.Session) *Instance
+
+type (
+	// InstanceInfo 角色信息
+	InstanceInfo struct {
+		*model2.SysRole
+		StatusTitle string `json:"status_title"`
+	}
+	// InstanceBasicInfo 角色基本信息
+	InstanceBasicInfo struct {
+		ID   uint64 `json:"id"`
+		Name string `json:"name"`
+	}
+)
+
+// List 列表信息
+func (c *Instance) List(name string, status, page, pageSize int) (*controller.ReturnPages, error) {
+	mSysRole := model.NewSysRole()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+			Order: model2.NewOrder("sort", model2.OrderModeToDesc),
+		},
+		&model2.ModelWhereOrder{
+			Order: model2.NewOrder("id", model2.OrderModeToDesc),
+		},
+	}
+	if name != "" {
+		where = append(where, &model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+		})
+	}
+	if status > 0 {
+		where = append(where, &model2.ModelWhereOrder{
+			Where: model2.NewWhere("status", status),
+		})
+	}
+	var count int64
+
+	out := make([]*model2.SysRole, 0)
+
+	if err := model2.Pages(mSysRole.SysRole, &out, page, pageSize, &count, where...); err != nil {
+		return nil, err
+	}
+	list := make([]*InstanceInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &InstanceInfo{SysRole: v, StatusTitle: v.StatusTitle()})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+
+}
+
+// Select 筛选信息
+func (c *Instance) Select() ([]*InstanceBasicInfo, error) {
+	mSysRole := model.NewSysRole()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+			Order: model2.NewOrder("sort", model2.OrderModeToDesc),
+		},
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("status", model2.SysRoleStatusForNormal),
+			Order: model2.NewOrder("id", model2.OrderModeToDesc),
+		},
+	}
+	out := make([]*InstanceBasicInfo, 0)
+
+	if err := model2.Scan(mSysRole.SysRole, &out, where...); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Data 数据操作
+func (c *Instance) Data(id uint64, name, remark string, sort int) error {
+	mSysRole := model.NewSysRole()
+
+	if id <= 0 {
+		mSysRole.TenantID = c.TenantID
+		mSysRole.Name = name
+		mSysRole.Remark = remark
+		mSysRole.Sort = sort
+		mSysRole.Status = model2.SysRoleStatusForNormal
+
+		if err := model2.Create(mSysRole.SysRole); err != nil {
+			return err
+		}
+		return nil
+	}
+	mSysRole.ID = id
+
+	if err := model2.Updates(mSysRole.SysRole, map[string]interface{}{
+		"name": name, "remark": remark, "sort": sort,
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Status 状态操作
+func (c *Instance) Status(id uint64, status int) error {
+	mSysRole := model.NewSysRole()
+	mSysRole.ID = id
+
+	isExist, err := model2.FirstWhere(mSysRole.SysRole)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("角色不存在")
+	}
+	if c.TenantID > 0 && c.TenantID != mSysRole.TenantID {
+		return errors.New("不可操作其他租户角色")
+	}
+	if err = model2.Updates(mSysRole.SysRole, map[string]interface{}{
+		"status": status, "updated_at": time.Now(),
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Delete 删除操作
+func (c *Instance) Delete(id uint64) error {
+	mSysRole := model.NewSysRole()
+	mSysRole.ID = id
+
+	isExist, err := model2.FirstWhere(mSysRole.SysRole)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("角色不存在")
+	}
+	if c.TenantID > 0 && c.TenantID != mSysRole.TenantID {
+		return errors.New("不可删除其他租户角色")
+	}
+	if err = model2.Delete(mSysRole.SysRole); err != nil {
+		return err
+	}
+	go utils.TryCatch(func() {
+		permission := service.NewPermission([]string{utils.UintToString(id)})(c.TenantKey, "")
+		// 删除角色权限
+		if _, err = permission.RemoveRolePolicy(); err != nil {
+			logger.ErrorF("删除租户【%s】下角色【%d】权限信息错误：%v", c.TenantKey, id, err)
+			return
+		}
+	})
+	return nil
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *service.Session) *Instance {
+		return &Instance{Platform: &controller.Platform{Session: session}}
+	}
+}
--- a/app/api/manage/controller/role/menu.go
+++ b/app/api/manage/controller/role/menu.go
@ -0,0 +1,74 @@
+package role
+
+import (
+	"SciencesServer/app/api/manage/controller"
+	menu2 "SciencesServer/app/api/manage/controller/menu"
+	model3 "SciencesServer/app/api/manage/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/orm"
+	"errors"
+
+	"gorm.io/gorm"
+)
+
+type Menu struct{ *controller.Platform }
+
+type MenuHandle func(session *service.Session) *Menu
+
+// List 菜单列表
+func (c *Menu) List(roleID uint64) ([]*menu2.TreeChecked, error) {
+	mSysMenu := model3.NewSysMenu()
+	return menu2.MenuForRole(mSysMenu, c.TenantID, roleID)
+}
+
+// Bind 绑定菜单
+func (c *Menu) Bind(roleID uint64, menuIDs []uint64) error {
+	if len(menuIDs) > 0 {
+		var count int64
+
+		mSysMenu := model3.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 := model3.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 {
+	return func(session *service.Session) *Menu {
+		return &Menu{Platform: &controller.Platform{Session: session}}
+	}
+}
--- a/app/api/manage/controller/role/user.go
+++ b/app/api/manage/controller/role/user.go
@ -0,0 +1,81 @@
+package role
+
+import (
+	"SciencesServer/app/api/manage/controller"
+	model3 "SciencesServer/app/api/manage/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/serve/logger"
+
+	"SciencesServer/app/service"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+
+	"gorm.io/gorm"
+)
+
+type User struct{ *controller.Platform }
+
+type UserHandle func(session *service.Session) *User
+
+// List 列表信息
+func (c *User) List(uid uint64) ([]*model3.SysRoleUserInfo, error) {
+	mSysRole := model3.NewSysRole()
+
+	out, err := mSysRole.UserRole(uid)
+
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Bind 绑定角色
+func (c *User) Bind(uid uint64, roleIDs []uint64) error {
+	mSysUserRole := model3.NewSysUserRole()
+
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		err := model2.DeleteWhere(mSysUserRole.SysUserRole, []*model2.ModelWhere{model2.NewWhere("uid", uid)}, tx)
+
+		if err != nil {
+			return err
+		}
+		roles := make([]*model2.SysUserRole, 0)
+		obj := make([]string, 0)
+
+		mark := make(map[uint64]uint64, 0)
+
+		for _, v := range roleIDs {
+			if _, has := mark[v]; has {
+				continue
+			}
+			obj = append(obj, utils.UintToString(v))
+
+			roles = append(roles, &model2.SysUserRole{
+				UID: uid, RoleID: v,
+			})
+			mark[v] = v
+		}
+		if err = model2.Creates(mSysUserRole.SysUserRole, roles, tx); err != nil {
+			return err
+		}
+		go utils.TryCatch(func() {
+			permission := service.NewPermission(obj)(c.TenantKey, utils.UintToString(uid))
+
+			if _, err = permission.DeleteRolesForUser(false); err != nil {
+				logger.ErrorF("删除用户【%d】角色权限错误：%v", uid, err)
+				return
+			}
+			if _, err = permission.AddRoleForUser(); err != nil {
+				logger.ErrorF("添加用户【%d】角色权限错误：%v", uid, err)
+				return
+			}
+		})
+		return nil
+	})
+}
+
+func NewUser() UserHandle {
+	return func(session *service.Session) *User {
+		return &User{Platform: &controller.Platform{Session: session}}
+	}
+}