williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：优化项目信息

Browse Source
This commit is contained in:
henry
2022-03-05 15:31:22 +08:00
parent dcb5948e91
commit 4dc8deaadb
27 changed files with 401 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
app/api/admin/controller/user/instance.go
View File

@ -66,7 +66,7 @@ type InstanceForm struct {
RoleIDs []uint64
}
func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error {
func (c *InstanceForm) sync(tx *gorm.DB, first bool, userTenantID, tenantID uint64) error {
var err error
mSysUserDepartment := model.NewSysUserDepartment()
@ -74,26 +74,26 @@ func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error
permission := service.NewPermission(
service.WithAuthTenant(fmt.Sprintf("%d", tenantID)),
service.WithAuthUser(fmt.Sprintf("%d", uid)),
service.WithAuthUser(fmt.Sprintf("%d", userTenantID)),
)
if !first {
if err = model2.DeleteWhere(mSysUserDepartment.SysUserDepartment, []*model2.ModelWhere{
model2.NewWhere("uid", uid)}, tx); err != nil {
model2.NewWhere("user_tenant_id", userTenantID)}, tx); err != nil {
return err
}
if err = model2.DeleteWhere(mSysUserRole.SysUserRole, []*model2.ModelWhere{
model2.NewWhere("uid", uid)}, tx); err != nil {
model2.NewWhere("user_tenant_id", userTenantID)}, tx); err != nil {
return err
}
go utils.TryCatch(func() {
if _, err = permission.DeleteRolesForUser(false); err != nil {
logger.ErrorF("Casbin 删除用户【%d】权限错误：%v", uid, err)
logger.ErrorF("Casbin 删除用户【%d】权限错误：%v", userTenantID, err)
}
})
}
if c.DepartmentID > 0 {
mSysUserDepartment.UID = uid
mSysUserDepartment.UserTenantID = userTenantID
mSysUserDepartment.DepartmentID = c.DepartmentID
if err = model2.Create(mSysUserDepartment.SysUserDepartment, tx); err != nil {
@ -107,8 +107,8 @@ func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error
for _, v := range c.RoleIDs {
roles = append(roles, &model2.SysUserRole{
UID: uid,
RoleID: v,
UserTenantID: userTenantID,
RoleID: v,
})
rolesIDs = append(rolesIDs, fmt.Sprintf("%d", v))
}
@ -119,7 +119,7 @@ func (c *InstanceForm) sync(tx *gorm.DB, first bool, uid, tenantID uint64) error
service.WithAuthRoles(rolesIDs)(permission)
if _, err = permission.AddRoleForUser(); err != nil {
logger.ErrorF("Casbin 给予用户【%d】权限错误：%v", uid, err)
logger.ErrorF("Casbin 给予用户【%d】权限错误：%v", userTenantID, err)
}
})
}
@ -143,7 +143,7 @@ func (c *Instance) Info() (*InstanceUserInfo, error) {
// Index 列表信息
func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, page, pageSize int) (*controller.ReturnPages, error) {
where := []*model2.ModelWhere{model2.NewWhere("u.tenant_id", c.TenantID)}
where := []*model2.ModelWhere{model2.NewWhere("u_t.tenant_id", c.TenantID)}
if name != "" {
where = append(where, model2.NewWhereLike("u.name", name))
@ -157,11 +157,11 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
if status > 0 {
where = append(where, model2.NewWhere("u.status", status))
}
mSysUser := model.NewSysUser()
var count int64
out, err := mSysUser.Users(page, pageSize, &count, where...)
mSysUserTenant := model.NewSysUserTenant()
out, err := mSysUserTenant.Users(page, pageSize, &count, where...)
if err != nil {
return nil, err
@ -176,7 +176,6 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
UID: v.UUIDString(), Avatar: v.Avatar, Name: v.Name, Email: v.Email, Mobile: v.Mobile,
},
Account: v.Account, Gender: v.Gender.Gender, IsAdmin: v.IsAdmin, Status: v.Status, CreatedAt: v.CreatedAt,
//Role: make([]*InstanceRoleInfo, 0),
RoleIDs: make([]string, 0),
Remark: v.Remark,
}
@ -195,10 +194,6 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
obj.ID = utils.StringToUnit64(v)
roleIDs = append(roleIDs, obj.GetEncodeID())
}
//roles := &InstanceRoleInfo{
// IDs: roleIDs,
//Names: strings.Split(v.RoleNames, "&&"),
//}
data.RoleIDs = roleIDs
}
list = append(list, data)
@ -206,25 +201,49 @@ func (c *Instance) Index(name, mobile string, departmentIDs []uint64, status, pa
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Basic 基本信息
func (c *Instance) Basic(mobile string, tenantID uint64) (*model2.SysUser, error) {
mSysUser := model.NewSysUser()
_, err := mSysUser.GetByAccountOrMobile(mobile, tenantID)
if err != nil {
return nil, err
}
if mSysUser.ID <= 0 {
return nil, nil
}
return mSysUser.SysUser, nil
}
// Add 添加用户
func (c *Instance) Add(params *InstanceForm) error {
if !utils.ValidateMobile(params.Mobile) {
return errors.New("操作错误，手机号码格式错误")
}
mSysUser := model.NewSysUser()
// 查询登录账户或手机号码是否注册
var count int64
mSysUserTenant := model.NewSysUserTenant()
err := model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile),
model2.NewWhere("tenant_id", c.TenantID))
// 查询登录账户或手机号码是否注册
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "name"}, model2.NewWhere("mobile", params.Mobile))
if err != nil {
return err
} else if count > 0 {
return errors.New("操作错误，当前手机号码已注册")
} else if isExist {
// 判断当前人员是否已经注册了租户身份
var count int64
if err = model2.Count(mSysUserTenant.SysUserTenant, &count, model2.NewWhere("uid", mSysUser.UUID)); err != nil {
return err
} else if count > 0 {
return errors.New("操作错误，当前手机号码已注册")
}
mSysUserTenant.TenantID = c.TenantID
mSysUserTenant.UID = mSysUser.UUID
return model2.Create(mSysUserTenant.SysUserTenant)
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
mSysUser.TenantID = c.TenantID
mSysUser.Account = params.Account
mSysUser.Name = params.Name
mSysUser.Mobile = params.Mobile
@ -237,8 +256,13 @@ func (c *Instance) Add(params *InstanceForm) error {
if err = model2.Create(mSysUser.SysUser, tx); err != nil {
return err
}
mSysUserTenant.TenantID = c.TenantID
mSysUserTenant.UID = mSysUser.UUID
if err = params.sync(tx, true, mSysUser.UUID, c.TenantID); err != nil {
if err = model2.Create(mSysUserTenant.SysUserTenant, tx); err != nil {
return err
}
if err = params.sync(tx, true, mSysUserTenant.ID, c.TenantID); err != nil {
return err
}
return nil
@ -247,26 +271,30 @@ func (c *Instance) Add(params *InstanceForm) error {
// Edit 修改用户信息
func (c *Instance) Edit(params *InstanceForm) error {
mSysUser := model.NewSysUser()
mSysUser.ID = params.ID
mSysUserTenant := model.NewSysUserTenant()
mSysUserTenant.ID = params.ID
isExist, err := model2.First(mSysUser.SysUser)
isExist, err := model2.First(mSysUserTenant.SysUserTenant)
if err != nil {
return nil
} else if !isExist {
return errors.New("操作错误，用户信息不存在或已被删除")
} else if c.TenantID > 0 && mSysUser.TenantID != c.TenantID {
} else if c.TenantID > 0 && mSysUserTenant.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
mSysUser := model.NewSysUser()
if _, err = model2.FirstWhere(mSysUser.SysUser, model2.NewWhere("uuid", mSysUserTenant.UID)); err != nil {
return err
}
if mSysUser.Mobile != params.Mobile {
if !utils.ValidateMobile(params.Mobile) {
return errors.New("操作错误，手机号码格式错误")
}
var count int64
if err = model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile),
model2.NewWhere("tenant_id", c.TenantID)); err != nil {
if err = model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile)); err != nil {
return nil
} else if count > 0 {
return errors.New("操作错误，当前手机号码已注册")
@ -282,7 +310,7 @@ func (c *Instance) Edit(params *InstanceForm) error {
if err = model2.Updates(mSysUser.SysUser, mSysUser.SysUser, tx); err != nil {
return err
}
if err = params.sync(tx, false, mSysUser.UUID, mSysUser.TenantID); err != nil {
if err = params.sync(tx, false, mSysUserTenant.ID, c.TenantID); err != nil {
return err
}
return nil
@ -290,21 +318,23 @@ func (c *Instance) Edit(params *InstanceForm) error {
}
func (c *Instance) Password(id uint64, password, repeatPwd string) error {
//if password != repeatPwd {
// return errors.New("操作错误，两次密码输入不一致")
//}
mSysUser := model.NewSysUser()
mSysUser.ID = id
mSysUserTenant := model.NewSysUserTenant()
mSysUserTenant.ID = id
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"})
isExist, err := model2.First(mSysUserTenant.SysUserTenant)
if err != nil {
return nil
} else if !isExist {
return errors.New("操作错误，用户信息不存在或已被删除")
} else if c.TenantID > 0 && mSysUser.TenantID != c.TenantID {
} else if c.TenantID > 0 && mSysUserTenant.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
mSysUser := model.NewSysUser()
if _, err = model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"}, model2.NewWhere("uuid", mSysUserTenant.UID)); err != nil {
return err
}
mSysUser.Password = password
mSysUser.Pass()
@ -337,21 +367,33 @@ func (c *Person) PasswordEdit(oldPassword, password, repeatPwd string) error {
}
func (c *Instance) Delete(id uint64) error {
mSysUser := model.NewSysUser()
mSysUser.ID = id
mSysUserTenant := model.NewSysUserTenant()
mSysUserTenant.ID = id
isExist, err := model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"})
isExist, err := model2.First(mSysUserTenant.SysUserTenant)
if err != nil {
return nil
} else if !isExist {
return errors.New("操作错误，用户信息不存在或已被删除")
} else if c.TenantID > 0 && mSysUser.TenantID != c.TenantID {
} else if c.TenantID > 0 && mSysUserTenant.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
} else if mSysUser.IsAdminUser() {
return errors.New("操作错误，超管用户不允许删除")
}
if err = model2.Delete(mSysUser.SysUser); err != nil {
mSysUser := model.NewSysUser()
if _, err = model2.FirstField(mSysUser.SysUser, []string{"id", "uuid", "is_admin"}, model2.NewWhere("uuid", mSysUserTenant.UID)); err != nil {
return err
}
err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
//if err = model2.Delete(mSysUser.SysUser, tx); err != nil {
// return err
//}
if err = model2.Delete(mSysUserTenant.SysUserTenant, tx); err != nil {
return err
}
return nil
})
if err != nil {
return err
}
service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccountAdmin, utils.UintToString(mSysUser.UUID))