任务2.5

internal/app/controller/user/user_controller.go

@@ -6,38 +6,24 @@ import (
 	"git.huangwc.com/pig/pig-farm-controller/internal/app/controller"
 	"git.huangwc.com/pig/pig-farm-controller/internal/app/dto"
 	"git.huangwc.com/pig/pig-farm-controller/internal/app/service"
-	domain_notify "git.huangwc.com/pig/pig-farm-controller/internal/domain/notify"
-	"git.huangwc.com/pig/pig-farm-controller/internal/domain/token"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
-	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
-	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
 	"github.com/labstack/echo/v4"
-	"gorm.io/gorm"
 )
 
 // Controller 用户控制器
 type Controller struct {
-	userRepo       repository.UserRepository
-	monitorService service.MonitorService
-	tokenService   token.Service
-	notifyService  domain_notify.Service
-	logger         *logs.Logger
+	userService service.UserService
+	logger      *logs.Logger
 }
 
 // NewController 创建用户控制器实例
 func NewController(
-	userRepo repository.UserRepository,
-	monitorService service.MonitorService,
+	userService service.UserService,
 	logger *logs.Logger,
-	tokenService token.Service,
-	notifyService domain_notify.Service,
 ) *Controller {
 	return &Controller{
-		userRepo:       userRepo,
-		monitorService: monitorService,
-		tokenService:   tokenService,
-		notifyService:  notifyService,
-		logger:         logger,
+		userService: userService,
+		logger:      logger,
 	}
 }
 
@@ -59,28 +45,13 @@ func (c *Controller) CreateUser(ctx echo.Context) error {
 		return controller.SendErrorResponse(ctx, controller.CodeBadRequest, err.Error())
 	}
 
-	user := &models.User{
-		Username: req.Username,
-		Password: req.Password, // 密码会在 BeforeSave 钩子中哈希
+	resp, err := c.userService.CreateUser(&req)
+	if err != nil {
+		c.logger.Errorf("创建用户: 服务层调用失败: %v", err)
+		return controller.SendErrorResponse(ctx, controller.CodeInternalError, err.Error())
 	}
 
-	if err := c.userRepo.Create(user); err != nil {
-		c.logger.Errorf("创建用户: 创建用户失败: %v", err)
-
-		// 尝试查询用户，以判断是否是用户名重复导致的错误
-		_, findErr := c.userRepo.FindByUsername(req.Username)
-		if findErr == nil { // 如果能找到用户，说明是用户名重复
-			return controller.SendErrorResponse(ctx, controller.CodeConflict, "用户名已存在")
-		}
-
-		// 其他创建失败的情况
-		return controller.SendErrorResponse(ctx, controller.CodeInternalError, "创建用户失败")
-	}
-
-	return controller.SendResponse(ctx, controller.CodeCreated, "用户创建成功", dto.CreateUserResponse{
-		Username: user.Username,
-		ID:       user.ID,
-	})
+	return controller.SendResponse(ctx, controller.CodeCreated, "用户创建成功", resp)
 }
 
 // Login godoc
@@ -99,32 +70,13 @@ func (c *Controller) Login(ctx echo.Context) error {
 		return controller.SendErrorResponse(ctx, controller.CodeBadRequest, err.Error())
 	}
 
-	// 使用新的方法，通过唯一标识符（用户名、邮箱等）查找用户
-	user, err := c.userRepo.FindUserForLogin(req.Identifier)
+	resp, err := c.userService.Login(&req)
 	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return controller.SendErrorResponse(ctx, controller.CodeUnauthorized, "登录凭证不正确")
-		}
-		c.logger.Errorf("登录: 查询用户失败: %v", err)
-		return controller.SendErrorResponse(ctx, controller.CodeInternalError, "登录失败")
+		c.logger.Errorf("登录: 服务层调用失败: %v", err)
+		return controller.SendErrorResponse(ctx, controller.CodeUnauthorized, err.Error())
 	}
 
-	if !user.CheckPassword(req.Password) {
-		return controller.SendErrorResponse(ctx, controller.CodeUnauthorized, "登录凭证不正确")
-	}
-
-	// 登录成功，生成 JWT token
-	tokenString, err := c.tokenService.GenerateToken(user.ID)
-	if err != nil {
-		c.logger.Errorf("登录: 生成令牌失败: %v", err)
-		return controller.SendErrorResponse(ctx, controller.CodeInternalError, "登录失败，无法生成认证信息")
-	}
-
-	return controller.SendResponse(ctx, controller.CodeSuccess, "登录成功", dto.LoginResponse{
-		Username: user.Username,
-		ID:       user.ID,
-		Token:    tokenString,
-	})
+	return controller.SendResponse(ctx, controller.CodeSuccess, "登录成功", resp)
 }
 
 // SendTestNotification godoc
@@ -155,8 +107,8 @@ func (c *Controller) SendTestNotification(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "请求体格式错误或缺少 'type' 字段: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	// 3. 调用领域服务
-	err = c.notifyService.SendTestMessage(uint(userID), req.Type)
+	// 3. 调用服务层
+	err = c.userService.SendTestNotification(uint(userID), &req)
 	if err != nil {
 		c.logger.Errorf("%s: 服务层调用失败: %v", actionType, err)
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "发送测试消息失败: "+err.Error(), actionType, "服务层调用失败", map[string]interface{}{"userID": userID, "type": req.Type})