v3_1

internal/erpserver/biz/v1/system/user.go

@@ -9,17 +9,20 @@ import (
 
 	"management/internal/db/model/dto"
 	db "management/internal/db/sqlc"
-	"management/internal/erpserver/model/req"
+	"management/internal/erpserver/model/form"
 	"management/internal/erpserver/model/view"
 	"management/internal/pkg/crypto"
 	"management/internal/pkg/know"
+	"management/internal/pkg/rand"
 	"management/internal/pkg/session"
+
+	"github.com/google/uuid"
 )
 
 // UserBiz 定义处理用户请求所需的方法.
 type UserBiz interface {
-	Create(ctx context.Context, req *db.CreateSysUserParams) (*db.SysUser, error)
-	Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.SysUser, error)
+	Create(ctx context.Context, req *form.User) error
+	Update(ctx context.Context, req *form.User) error
 	All(ctx context.Context) ([]*db.SysUser, error)
 	List(ctx context.Context, q dto.SearchDto) ([]*db.ListSysUserConditionRow, int64, error)
 	Get(ctx context.Context, id int32) (*db.SysUser, error)
@@ -31,7 +34,7 @@ type UserBiz interface {
 
 // UserExpansion 定义用户操作的扩展方法.
 type UserExpansion interface {
-	Login(ctx context.Context, req *req.Login) error
+	Login(ctx context.Context, req *form.Login) error
 }
 
 // userBiz 是 UserBiz 接口的实现.
@@ -50,12 +53,75 @@ func NewUser(store db.Store, session session.ISession) *userBiz {
 	}
 }
 
-func (b *userBiz) Create(ctx context.Context, req *db.CreateSysUserParams) (*db.SysUser, error) {
-	return b.store.CreateSysUser(ctx, req)
+func (b *userBiz) Create(ctx context.Context, req *form.User) error {
+	salt, err := rand.String(10)
+	if err != nil {
+		return err
+	}
+
+	hashedPassword, err := crypto.BcryptHashPassword(req.Password + salt)
+	if err != nil {
+		return err
+	}
+
+	initTime, err := time.ParseInLocation(time.DateTime, "0001-01-01 00:00:00", time.Local)
+	if err != nil {
+		return err
+	}
+
+	arg := &db.CreateSysUserParams{
+		Uuid:             uuid.Must(uuid.NewV7()),
+		Email:            req.Email,
+		Username:         req.Username,
+		HashedPassword:   hashedPassword,
+		Salt:             salt,
+		Avatar:           req.Avatar,
+		Gender:           req.Gender,
+		DepartmentID:     req.DepartmentID,
+		RoleID:           req.RoleID,
+		Status:           *req.Status,
+		ChangePasswordAt: initTime,
+		CreatedAt:        time.Now(),
+		UpdatedAt:        time.Now(),
+	}
+	_, err = b.store.CreateSysUser(ctx, arg)
+	if err != nil {
+		if db.IsUniqueViolation(err) {
+			return errors.New("用户已经存在")
+		}
+		return err
+	}
+	return nil
 }
 
-func (b *userBiz) Update(ctx context.Context, req *db.UpdateSysUserParams) (*db.SysUser, error) {
-	return b.store.UpdateSysUser(ctx, req)
+func (b *userBiz) Update(ctx context.Context, req *form.User) error {
+	user, err := b.store.GetSysUser(ctx, *req.ID)
+	if err != nil {
+		return err
+	}
+
+	arg := &db.UpdateSysUserParams{
+		ID:               user.ID,
+		Username:         req.Username,
+		HashedPassword:   user.HashedPassword,
+		Avatar:           req.Avatar,
+		Gender:           req.Gender,
+		DepartmentID:     req.DepartmentID,
+		RoleID:           req.RoleID,
+		Status:           *req.Status,
+		ChangePasswordAt: user.ChangePasswordAt,
+		UpdatedAt:        time.Now(),
+	}
+	if req.ChangePassword == "on" {
+		hashedPassword, err := crypto.BcryptHashPassword(req.Password + user.Salt)
+		if err != nil {
+			return err
+		}
+		arg.HashedPassword = hashedPassword
+		arg.ChangePasswordAt = time.Now()
+	}
+	_, err = b.store.UpdateSysUser(ctx, arg)
+	return err
 }
 
 func (b *userBiz) All(ctx context.Context) ([]*db.SysUser, error) {
@@ -112,7 +178,7 @@ func (b *userBiz) XmSelect(ctx context.Context) ([]*view.XmSelect, error) {
 	return res, nil
 }
 
-func (b *userBiz) Login(ctx context.Context, req *req.Login) error {
+func (b *userBiz) Login(ctx context.Context, req *form.Login) error {
 	log := &db.CreateSysUserLoginLogParams{
 		CreatedAt:  time.Now(),
 		Email:      req.Email,