team api

team/dao/user.go

@@ -2,6 +2,8 @@ package dao
 
 import (
 	"errors"
+	"fmt"
+	"opencatd-open/team/consts"
 	"opencatd-open/team/model"
 	"time"
 
@@ -19,6 +21,7 @@ type UserRepository interface {
 	Update(user *model.User) error
 	Delete(id int64) error
 	List(offset, limit int) ([]model.User, error)
+	ListWithFilters(offset, limit int, filters map[string]interface{}) ([]model.User, int64, error)
 	Enable(id int64) error
 	Disable(id int64) error
 	BatchEnable(ids []int64) error
@@ -34,70 +37,107 @@ func NewUserDAO(db *gorm.DB) *UserDAO {
 	return &UserDAO{db: db}
 }
 
-// CreateUser 创建用户
+// 创建用户
 func (dao *UserDAO) Create(user *model.User) error {
 	if user == nil {
 		return errors.New("user is nil")
 	}
-	return dao.db.Create(user).Error
+
+	return dao.db.Transaction(func(tx *gorm.DB) error {
+		// 创建用户
+		if err := tx.Create(user).Error; err != nil {
+			return fmt.Errorf("failed to create user: %w", err)
+		}
+
+		return nil
+	})
 }
 
-// GetUserByID 根据ID获取用户
+// 根据ID获取用户
 func (dao *UserDAO) GetByID(id int64) (*model.User, error) {
 	var user model.User
-	err := dao.db.First(&user, id).Error
+	// err := dao.db.First(&user, id).Error
+	err := dao.db.Preload("Tokens").First(&user, id).Error
 	if err != nil {
 		return nil, err
 	}
 	return &user, nil
 }
 
-// GetUserByUsername 根据用户名获取用户
+// 根据用户名获取用户
 func (dao *UserDAO) GetByUsername(username string) (*model.User, error) {
 	var user model.User
-	err := dao.db.Where("user_name = ?", username).First(&user).Error
+	// err := dao.db.Where("user_name = ?", username).First(&user).Error
+	err := dao.db.Preload("Tokens").Where("user_name = ?", username).First(&user).Error
 	if err != nil {
 		return nil, err
 	}
 	return &user, nil
 }
 
-// UpdateUser 更新用户信息
+// 更新用户信息
 func (dao *UserDAO) Update(user *model.User) error {
 	if user == nil {
 		return errors.New("user is nil")
 	}
-	user.UpdatedAt = time.Now()
+	user.UpdatedAt = time.Now().Unix()
 	return dao.db.Save(user).Error
 }
 
-// DeleteUser 删除用户
+// 删除用户
 func (dao *UserDAO) Delete(id int64) error {
 	return dao.db.Delete(&model.User{}, id).Error
 	// return dao.db.Model(&model.User{}).Where("id = ?", id).Update("status", 2).Error
 }
 
-// ListUsers 获取用户列表
+// 获取用户列表
 func (dao *UserDAO) List(offset, limit int) ([]model.User, error) {
 	var users []model.User
-	err := dao.db.Offset(offset).Limit(limit).Find(&users).Error
+	err := dao.db.Preload("Tokens").Offset(offset).Limit(limit).Find(&users).Error
 	if err != nil {
 		return nil, err
 	}
 	return users, nil
 }
 
-// EnableUser 启用User
+// 获取用户列表，带过滤条件
+func (dao *UserDAO) ListWithFilters(offset, limit int, filters map[string]interface{}) ([]model.User, int64, error) {
+	var users []model.User
+	var total int64
+
+	// 构建查询
+	query := dao.db.Model(&model.User{})
+
+	// 添加过滤条件
+	for key, value := range filters {
+		query = query.Where(key+" = ?", value)
+	}
+
+	// 查询总数
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	// 分页查询
+	err := query.Offset(offset).Limit(limit).Find(&users).Error
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return users, total, nil
+}
+
+// 启用User
 func (dao *UserDAO) Enable(id int64) error {
-	return dao.db.Model(&model.User{}).Where("id = ?", id).Update("status", 0).Error
+	return dao.db.Model(&model.User{}).Where("id = ?", id).Update("status", consts.StatusEnabled).Error
 }
 
-// DisableUser 禁用User
+// 禁用User
 func (dao *UserDAO) Disable(id int64) error {
-	return dao.db.Model(&model.User{}).Where("id = ?", id).Update("status", 1).Error
+	return dao.db.Model(&model.User{}).Where("id = ?", id).Update("status", consts.StatusDisabled).Error
 }
 
-// BatchEnableUsers 批量启用User
+// 批量启用User
 func (dao *UserDAO) BatchEnable(ids []int64) error {
 	if len(ids) == 0 {
 		return errors.New("ids is empty")
@@ -105,7 +145,7 @@ func (dao *UserDAO) BatchEnable(ids []int64) error {
 	return dao.db.Model(&model.User{}).Where("id IN ?", ids).Update("status", 0).Error
 }
 
-// BatchDisableUsers 批量禁用User
+// 批量禁用User
 func (dao *UserDAO) BatchDisable(ids []int64) error {
 	if len(ids) == 0 {
 		return errors.New("ids is empty")
@@ -113,7 +153,7 @@ func (dao *UserDAO) BatchDisable(ids []int64) error {
 	return dao.db.Model(&model.User{}).Where("id IN ?", ids).Update("status", 1).Error
 }
 
-// BatchDeleteUser 批量删除用户
+// 批量删除用户
 func (dao *UserDAO) BatchDelete(ids []int64) error {
 	if len(ids) == 0 {
 		return errors.New("ids is empty")