feat：完善项目
This commit is contained in:
henry
173
app/controller/role/instance.go
Normal file
173
app/controller/role/instance.go
Normal file
@ -0,0 +1,173 @@
|
||||
package role
|
||||
|
||||
import (
|
||||
model2 "ArmedPolice/app/common/model"
|
||||
"ArmedPolice/app/controller"
|
||||
"ArmedPolice/app/model"
|
||||
"ArmedPolice/app/service"
|
||||
"ArmedPolice/serve/logger"
|
||||
"ArmedPolice/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{List: 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}}
|
||||
}
|
||||
}
|
||||
81
app/controller/role/user.go
Normal file
81
app/controller/role/user.go
Normal file
@ -0,0 +1,81 @@
|
||||
package role
|
||||
|
||||
import (
|
||||
model2 "TenantServe/app/common/model"
|
||||
"TenantServe/serve/logger"
|
||||
|
||||
"TenantServe/app/controller"
|
||||
"TenantServe/app/model"
|
||||
"TenantServe/app/service"
|
||||
"TenantServe/serve/orm"
|
||||
"TenantServe/utils"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type User struct{ *controller.Platform }
|
||||
|
||||
type UserHandle func(session *service.Session) *User
|
||||
|
||||
// List 列表信息
|
||||
func (c *User) List(uid uint64) ([]*model.SysRoleUserInfo, error) {
|
||||
mSysRole := model.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 := model.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}}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user