Merge branch 'dev'

2026-09-21 18:20:50 +00:00 · 2021-06-13 23:07:37 +08:00
parent 974d5b2889 b837489af0
commit 372248c819
219 changed files with 9367 additions and 8029 deletions
@@ -2,16 +2,16 @@ package service

 import (
 	"errors"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"

 	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"

-	"go-admin/app/admin/models/system"
 	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
-	common "go-admin/common/models"
-	"go-admin/common/service"
 )

 type SysUser struct {
@@ -19,17 +19,16 @@ type SysUser struct {
 }

 // GetSysUserPage 获取SysUser列表
-func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]system.SysUser, count *int64) error {
+func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
 	var err error
-	var data system.SysUser
+	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 {
@@ -40,22 +39,20 @@ func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *
 }

 // GetSysUser 获取SysUser对象
-func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *system.SysUser) error {
-	var err error
-	var data system.SysUser
+func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
+	var data models.SysUser

-	db := e.Orm.Model(&data).
+	err := e.Orm.Model(&data).Debug().
 		Scopes(
 			actions.Permission(data.TableName(), p),
 		).
-		First(model, d.GetId())
-	err = db.Error
+		First(model, d.GetId()).Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		err = errors.New("查看对象不存在或无权查看")
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
-	if db.Error != nil {
+	if err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
@@ -63,12 +60,22 @@ func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *s
 }

 // InsertSysUser 创建SysUser对象
-func (e *SysUser) InsertSysUser(model common.ActiveRecord) error {
+func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error {
 	var err error
-	var data system.SysUser
-
-	err = e.Orm.Model(&data).
-		Create(model).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 {
 		e.Log.Errorf("db error: %s", err)
 		return err
@@ -77,41 +84,91 @@ func (e *SysUser) InsertSysUser(model common.ActiveRecord) error {
 }

 // UpdateSysUser 修改SysUser对象
-func (e *SysUser) UpdateSysUser(c common.ActiveRecord, p *actions.DataPermission) error {
+func (e *SysUser) UpdateSysUser(c *dto.SysUserControl, p *actions.DataPermission) error {
 	var err error
-
-	db := e.Orm.Model(c).
-		Scopes(
-			actions.Permission(c.TableName(), p),
-		).Where("user_id = ?", c.GetId()).Updates(c)
-	if db.Error != nil {
-		e.Log.Errorf("db error: %s", err)
+	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
+}
+
+// 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(d cDto.Control, c common.ActiveRecord, p *actions.DataPermission) error {
+func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) error {
 	var err error
-	var data system.SysUser
+	var data models.SysUser

 	db := e.Orm.Model(&data).
 		Scopes(
 			actions.Permission(data.TableName(), p),
-		).Delete(c, d.GetId())
-	if db.Error != nil {
-		err = db.Error
-		e.Log.Errorf("Delete error: %s", err)
+		).Delete(&data, c.GetId())
+	if err = db.Error; err != nil {
+		e.Log.Errorf("Error found in  RemoveSysUser : %s", err)
 		return err
 	}
 	if db.RowsAffected == 0 {
-		err = errors.New("无权删除该数据")
-		return err
+		return errors.New("无权删除该数据")
 	}
 	return nil
 }
@@ -123,12 +180,13 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
 	if newPassword == "" {
 		return nil
 	}
-	c := &system.SysUser{}
+	c := &models.SysUser{}

 	err = e.Orm.Model(c).
 		Scopes(
 			actions.Permission(c.TableName(), p),
-		).Where("user_id = ?", 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("无权更新该数据")
@@ -161,8 +219,8 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
 	return nil
 }

-func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]system.SysRole, posts *[]system.SysPost) error {
-	err := e.Orm.Preload("Dept").First(user, "user_id = ?", id).Error
+func (e *SysUser) GetSysUserProfile(c *dto.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
+	err := e.Orm.Preload("Dept").First(user, c.GetId()).Error
 	if err != nil {
 		return err
 	}