服务层重构与优化：补全所有ServiceImpl实现类，修复RestTemplate注入，完善DTO与配置，保证编译与启动通过

2025-07-24 14:15:31 +08:00
parent 873b8e55da
commit cf4d73ceff
95 changed files with 5889 additions and 2282 deletions
@@ -1,11 +1,11 @@
 package com.emotionmuseum.auth.controller;

 import com.emotionmuseum.common.result.Result;
-import com.emotionmuseum.auth.dto.LoginRequest;
-import com.emotionmuseum.auth.dto.RegisterRequest;
+import com.emotionmuseum.auth.request.LoginRequest;
+import com.emotionmuseum.auth.request.RegisterRequest;
 import com.emotionmuseum.auth.service.AuthService;
-import com.emotionmuseum.auth.vo.LoginResponse;
-import com.emotionmuseum.auth.vo.UserInfoResponse;
+import com.emotionmuseum.auth.response.LoginResponse;
+import com.emotionmuseum.auth.response.UserInfoResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -1,9 +1,9 @@
 package com.emotionmuseum.auth.controller;

 import com.emotionmuseum.common.result.Result;
-import com.emotionmuseum.auth.dto.CaptchaResponse;
-import com.emotionmuseum.auth.dto.SliderCaptchaResponse;
-import com.emotionmuseum.auth.dto.SliderCaptchaVerifyRequest;
+import com.emotionmuseum.auth.response.CaptchaResponse;
+import com.emotionmuseum.auth.response.SliderCaptchaResponse;
+import com.emotionmuseum.auth.request.SliderCaptchaVerifyRequest;
 import com.emotionmuseum.auth.service.CaptchaService;
 import com.emotionmuseum.auth.service.SliderCaptchaService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -0,0 +1,41 @@
+package com.emotionmuseum.auth.request;
+
+import com.emotionmuseum.common.request.BaseRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import jakarta.validation.constraints.NotBlank;
+
+/**
+ * 用户登录请求
+ *
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "用户登录请求")
+public class LoginRequest extends BaseRequest {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "账号（支持账号/邮箱/手机号）", example = "test_user")
+    @NotBlank(message = "账号不能为空")
+    private String account;
+
+    @Schema(description = "密码", example = "123456")
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+    @Schema(description = "验证码ID", example = "captcha_123")
+    @NotBlank(message = "验证码ID不能为空")
+    private String captchaId;
+
+    @Schema(description = "验证码", example = "1234")
+    @NotBlank(message = "验证码不能为空")
+    private String captcha;
+
+    @Schema(description = "记住我", example = "false")
+    private Boolean rememberMe = false;
+}
@@ -0,0 +1,41 @@
+package com.emotionmuseum.auth.request;
+
+import com.emotionmuseum.common.request.BaseRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import jakarta.validation.constraints.NotBlank;
+
+/**
+ * 第三方登录请求
+ * 
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "第三方登录请求")
+public class OAuthLoginRequest extends BaseRequest {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "第三方平台类型", example = "wechat")
+    @NotBlank(message = "平台类型不能为空")
+    private String platform;
+
+    @Schema(description = "授权码", example = "auth_code_123")
+    @NotBlank(message = "授权码不能为空")
+    private String code;
+
+    @Schema(description = "状态码", example = "state_123")
+    private String state;
+
+    @Schema(description = "验证码ID", example = "captcha_123")
+    @NotBlank(message = "验证码ID不能为空")
+    private String captchaId;
+
+    @Schema(description = "验证码", example = "1234")
+    @NotBlank(message = "验证码不能为空")
+    private String captcha;
+}
@@ -0,0 +1,83 @@
+package com.emotionmuseum.auth.request;
+
+import com.emotionmuseum.common.request.BaseRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import jakarta.validation.constraints.*;
+import java.time.LocalDate;
+
+/**
+ * 用户注册请求
+ *
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "用户注册请求")
+public class RegisterRequest extends BaseRequest {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "账号", example = "test_user")
+    @NotBlank(message = "账号不能为空")
+    @Size(min = 4, max = 20, message = "账号长度必须在4-20位之间")
+    @Pattern(regexp = "^[a-zA-Z0-9_]+$", message = "账号只能包含字母、数字和下划线")
+    private String account;
+
+    @Schema(description = "密码", example = "123456")
+    @NotBlank(message = "密码不能为空")
+    @Size(min = 6, max = 20, message = "密码长度必须在6-20位之间")
+    private String password;
+
+    @Schema(description = "确认密码", example = "123456")
+    @NotBlank(message = "确认密码不能为空")
+    private String confirmPassword;
+
+    @Schema(description = "验证码ID", example = "captcha_123")
+    @NotBlank(message = "验证码ID不能为空")
+    private String captchaId;
+
+    @Schema(description = "验证码", example = "1234")
+    @NotBlank(message = "验证码不能为空")
+    private String captcha;
+
+    @Schema(description = "用户名", example = "测试用户")
+    @NotBlank(message = "用户名不能为空")
+    @Size(min = 2, max = 20, message = "用户名长度必须在2-20位之间")
+    private String username;
+
+    @Schema(description = "邮箱", example = "test@example.com")
+    @NotBlank(message = "邮箱不能为空")
+    @Email(message = "邮箱格式不正确")
+    private String email;
+
+    @Schema(description = "手机号", example = "13800138000")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String phone;
+
+    @Schema(description = "昵称", example = "小测试")
+    @NotBlank(message = "昵称不能为空")
+    @Size(min = 1, max = 20, message = "昵称长度必须在1-20位之间")
+    private String nickname;
+
+    @Schema(description = "生日", example = "1990-01-01")
+    private LocalDate birthDate;
+
+    @Schema(description = "所在地", example = "北京市")
+    @Size(max = 50, message = "所在地长度不能超过50位")
+    private String location;
+
+    @Schema(description = "个人简介", example = "这是一个测试用户")
+    @Size(max = 200, message = "个人简介长度不能超过200位")
+    private String bio;
+
+    /**
+     * 验证密码一致性
+     */
+    public boolean isPasswordMatch() {
+        return password != null && password.equals(confirmPassword);
+    }
+}
@@ -0,0 +1,38 @@
+package com.emotionmuseum.auth.request;
+
+import com.emotionmuseum.common.request.BaseRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+/**
+ * 滑块验证码验证请求
+ * 
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "滑块验证码验证请求")
+public class SliderCaptchaVerifyRequest extends BaseRequest {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "验证码ID")
+    @NotBlank(message = "验证码ID不能为空")
+    private String captchaId;
+
+    @Schema(description = "滑块X坐标")
+    @NotNull(message = "滑块X坐标不能为空")
+    private Integer x;
+
+    @Schema(description = "滑块Y坐标")
+    @NotNull(message = "滑块Y坐标不能为空")
+    private Integer y;
+
+    @Schema(description = "滑动轨迹")
+    private String track;
+}
@@ -0,0 +1,36 @@
+package com.emotionmuseum.auth.response;
+
+import com.emotionmuseum.common.response.BaseResponse;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 验证码响应
+ * 
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "验证码响应")
+public class CaptchaResponse extends BaseResponse {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "验证码ID")
+    private String captchaId;
+
+    @Schema(description = "验证码图片Base64")
+    private String captchaImage;
+
+    @Schema(description = "验证码类型", example = "arithmetic")
+    private String captchaType;
+
+    @Schema(description = "过期时间（秒）", example = "300")
+    private Long expireTime;
+}
@@ -0,0 +1,77 @@
+package com.emotionmuseum.auth.response;
+
+import com.emotionmuseum.common.response.BaseResponse;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 登录响应
+ *
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "登录响应")
+public class LoginResponse extends BaseResponse {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "访问Token")
+    private String accessToken;
+
+    @Schema(description = "刷新Token")
+    private String refreshToken;
+
+    @Schema(description = "Token类型", example = "Bearer")
+    private String tokenType = "Bearer";
+
+    @Schema(description = "Token过期时间（秒）", example = "86400")
+    private Long expiresIn;
+
+    @Schema(description = "用户信息")
+    private UserInfoResponse userInfo;
+
+    @Schema(description = "登录时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime loginTime;
+
+    /**
+     * 用户信息响应
+     */
+    @Data
+    @Schema(description = "用户信息响应")
+    public static class UserInfoResponse {
+        @Schema(description = "用户ID")
+        private String userId;
+
+        @Schema(description = "账号")
+        private String account;
+
+        @Schema(description = "用户名")
+        private String username;
+
+        @Schema(description = "昵称")
+        private String nickname;
+
+        @Schema(description = "邮箱")
+        private String email;
+
+        @Schema(description = "手机号")
+        private String phone;
+
+        @Schema(description = "头像URL")
+        private String avatar;
+
+        @Schema(description = "用户状态")
+        private String status;
+
+        @Schema(description = "最后登录时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime lastLoginTime;
+    }
+}
@@ -0,0 +1,42 @@
+package com.emotionmuseum.auth.response;
+
+import com.emotionmuseum.common.response.BaseResponse;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 滑块验证码响应
+ * 
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "滑块验证码响应")
+public class SliderCaptchaResponse extends BaseResponse {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "验证码ID")
+    private String captchaId;
+
+    @Schema(description = "背景图片Base64")
+    private String backgroundImage;
+
+    @Schema(description = "滑块图片Base64")
+    private String sliderImage;
+
+    @Schema(description = "滑块X坐标")
+    private Integer sliderX;
+
+    @Schema(description = "滑块Y坐标")
+    private Integer sliderY;
+
+    @Schema(description = "过期时间（秒）")
+    private Long expireTime;
+}
@@ -0,0 +1,102 @@
+package com.emotionmuseum.auth.response;
+
+import com.emotionmuseum.common.response.BaseResponse;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 用户信息响应
+ *
+ * @author emotion-museum
+ * @since 2025-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "用户信息响应")
+public class UserInfoResponse extends BaseResponse {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "用户ID")
+    private String id;
+
+    @Schema(description = "账号")
+    private String account;
+
+    @Schema(description = "用户名")
+    private String username;
+
+    @Schema(description = "邮箱")
+    private String email;
+
+    @Schema(description = "手机号")
+    private String phone;
+
+    @Schema(description = "头像URL")
+    private String avatar;
+
+    @Schema(description = "昵称")
+    private String nickname;
+
+    @Schema(description = "生日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate birthDate;
+
+    @Schema(description = "所在地")
+    private String location;
+
+    @Schema(description = "个人简介")
+    private String bio;
+
+    @Schema(description = "会员等级")
+    private String memberLevel;
+
+    @Schema(description = "使用天数")
+    private Integer totalDays;
+
+    @Schema(description = "成长数据")
+    private GrowthStatsVO growthStats;
+
+    @Schema(description = "状态")
+    private Integer status;
+
+    @Schema(description = "是否已验证")
+    private Integer isVerified;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @Schema(description = "最后活跃时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime lastActiveTime;
+
+    /**
+     * 成长数据VO
+     */
+    @Data
+    @Schema(description = "成长数据")
+    public static class GrowthStatsVO {
+
+        @Schema(description = "自我感知")
+        private BigDecimal selfAwareness;
+
+        @Schema(description = "情绪韧性")
+        private BigDecimal emotionalResilience;
+
+        @Schema(description = "行动力")
+        private BigDecimal actionPower;
+
+        @Schema(description = "共情力")
+        private BigDecimal empathy;
+
+        @Schema(description = "生活热度")
+        private BigDecimal lifeEnthusiasm;
+    }
+}