refactor🎨: 改造升级用户管理模块

This commit is contained in:
zhangwenjian committed 2021-06-03 09:27:34 +08:00
1 parent 602ff26988
commit c05cb63bc7
4 files changed
+218 -55

No files matched your search

+42 -7
View File
@@ -9,7 +9,7 @@ import (
type SysUserSearch struct {
dto.Pagination `search:"-"`
UserId int `form:"UserId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"`
UserId int `form:"userId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"`
Username string `form:"username" search:"type:contains;column:username;table:sys_user" comment:"用户名"`
NickName string `form:"nickName" search:"type:contains;column:nick_name;table:sys_user" comment:"昵称"`
Phone string `form:"phone" search:"type:contains;column:phone;table:sys_user" comment:"手机号"`
@@ -29,24 +29,59 @@ type SysUserOrder struct {
CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAtOrder"`
}
func (m *SysUserSearch) GetNeedSearch() interface{} {
return *m
}
type ResetSysUserPwdReq struct {
UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID
Password string `json:"password" comment:"密码" binding:"required"`
common.ControlBy
}
func (s *ResetSysUserPwdReq) GetId() interface{} {
return s.UserId
}
func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) {
if s.UserId != 0 {
model.UserId = s.UserId
}
model.Password = s.Password
}
type UpdateSysUserStatusReq struct {
UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID
Status string `json:"status" comment:"状态" binding:"required"`
common.ControlBy
}
func (s *UpdateSysUserStatusReq) GetId() interface{} {
return s.UserId
}
func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) {
if s.UserId != 0 {
model.UserId = s.UserId
}
model.Status = s.Status
}
type SysUserControl struct {
UserId int `json:"userId" comment:"用户ID"` // 用户ID
Username string `json:"username" comment:"用户名"`
Username string `json:"username" comment:"用户名" binding:"required"`
Password string `json:"password" comment:"密码"`
NickName string `json:"nickName" comment:"昵称"`
Phone string `json:"phone" comment:"手机号"`
NickName string `json:"nickName" comment:"昵称" binding:"required"`
Phone string `json:"phone" comment:"手机号" binding:"required"`
RoleId int `json:"roleId" comment:"角色ID"`
Avatar string `json:"avatar" comment:"头像"`
Sex string `json:"sex" comment:"性别"`
Email string `json:"email" comment:"邮箱"`
DeptId int `json:"deptId" comment:"部门"`
Email string `json:"email" comment:"邮箱" binding:"required,email"`
DeptId int `json:"deptId" comment:"部门" binding:"required"`
PostId int `json:"postId" comment:"岗位"`
Remark string `json:"remark" comment:"备注"`
Status string `json:"status" comment:"状态"`
Status string `json:"status" comment:"状态" binding:"required" default:"1"`
common.ControlBy
}
+63 -5
View File
@@ -23,13 +23,12 @@ func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission
var err error
var data models.SysUser
err = e.Orm.Model(&data).
err = e.Orm.Debug().Preload("Dept").
Scopes(
cDto.MakeCondition(c.GetNeedSearch()),
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p),
).
Preload("Dept").
Find(list).Limit(-1).Offset(-1).
Count(count).Error
if err != nil {
@@ -43,7 +42,7 @@ func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission
func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
var data models.SysUser
err := e.Orm.Model(&data).
err := e.Orm.Model(&data).Debug().
Scopes(
actions.Permission(data.TableName(), p),
).
@@ -64,6 +63,17 @@ func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, mode
func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error {
var err error
var data models.SysUser
var i int64
err = e.Orm.Model(&data).Where("username = ?", c.Username).Count(&i).Error
if err != nil {
e.Log.Errorf("db error: %s", err)
return err
}
if i > 0 {
err := errors.New("用户名已存在!")
e.Log.Errorf("db error: %s", err)
return err
}
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
@@ -97,6 +107,53 @@ func (e *SysUser) UpdateSysUser(c *dto.SysUserControl, p *actions.DataPermission
return nil
}
// UpdateSysUserStatus 更新用户状态
func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
var err error
var model models.SysUser
db := e.Orm.Scopes(
actions.Permission(model.TableName(), p),
).First(&model, c.GetId())
if err = db.Error; err != nil {
e.Log.Errorf("Service UpdateSysUser error: %s", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
c.Generate(&model)
err = e.Orm.Save(&model).Error
if err != nil {
e.Log.Errorf("Service UpdateSysUser error: %s", err)
return err
}
return nil
}
// ResetSysUserPwd 重置用户密码
func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission) error {
var err error
var model models.SysUser
db := e.Orm.Scopes(
actions.Permission(model.TableName(), p),
).First(&model, c.GetId())
if err = db.Error; err != nil {
e.Log.Errorf("At Service ResetSysUserPwd error: %s", err)
return err
}
if db.RowsAffected == 0 {
return errors.New("无权更新该数据")
}
c.Generate(&model)
err = e.Orm.Save(&model).Error
if err != nil {
e.Log.Errorf("At Service ResetSysUserPwd error: %s", err)
return err
}
return nil
}
// RemoveSysUser 删除SysUser
func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) error {
var err error
@@ -107,7 +164,7 @@ func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) e
actions.Permission(data.TableName(), p),
).Delete(&data, c.GetId())
if err = db.Error; err != nil {
e.Log.Errorf("Delete error: %s", err)
e.Log.Errorf("Error found in RemoveSysUser : %s", err)
return err
}
if db.RowsAffected == 0 {
@@ -128,7 +185,8 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
err = e.Orm.Model(c).
Scopes(
actions.Permission(c.TableName(), p),
).Where(id).Select("UserId", "Password", "Salt").First(c).Error
).Select("UserId", "Password", "Salt").
First(c, id).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return errors.New("无权更新该数据")