Merge remote-tracking branch 'origin/prod/release_1.0' into dev/dev-ltx

# Conflicts:
#	src/main/java/com/aida/lanecarford/controller/StyleController.java
#	src/main/java/com/aida/lanecarford/service/StyleService.java
#	src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java

docker-compose.yml

@@ -4,6 +4,9 @@ services:
     build: .
     volumes:
       # 日志目录映射
-      - ./log:/log
+      - ./log:/app/log
     ports:
       - '10095:8080'
+networks:
+  back_default:
+    driver: bridge

src/main/java/com/aida/lanecarford/common/constant/CommonConstants.java

@@ -10,5 +10,9 @@ public class CommonConstants {
 
     public static final int CONN_TIMEOUT = 30000;  // （milliseconds）
 
+    public static final String OUTFIT = "Outfit";
+    public static final String TRYON = "Try-on";
+    public static final String GENAI = "Gen-AI";
+
 
 }

src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java

@@ -21,7 +21,13 @@ public enum StatusEnum {
     FAILED(2),
 
     @Schema(description = "运行中")
-    RUNNING(3);
+    RUNNING(3),
+
+    @Schema(description = "重试中")
+    RETRYING(4),
+
+    @Schema(description = "生成即将结束")
+    ALMOST_DONE(5);
 
     private int code;
 

src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java

@@ -11,7 +11,11 @@ public enum StylistPathEnum {
 
     STYLIST_ONE("crystal", "lanecarford/stylist_guide/latest/crystal_en.md"),
 
-    STYLIST_TWO("mini", "lanecarford/stylist_guide/latest/mini_en.md");
+    STYLIST_TWO("mini", "lanecarford/stylist_guide/latest/mini_en.md"),
+
+    STYLIST_THREE("vera", "lanecarford/stylist_guide/latest/mini_en.md"),
+
+    STYLIST_FOUR("edi", "lanecarford/stylist_guide/latest/mini_en.md");
 
     private String name;
 

src/main/java/com/aida/lanecarford/controller/CustomerPhotoController.java

@@ -4,6 +4,7 @@ import com.aida.lanecarford.common.ApiResponse;
 import com.aida.lanecarford.dto.CustomerPhotoDto;
 import com.aida.lanecarford.entity.CustomerPhoto;
 import com.aida.lanecarford.service.CustomerPhotoService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +25,7 @@ public class CustomerPhotoController {
     private final CustomerPhotoService customerPhotoService;
 
     @PostMapping("/upload")
-    public ApiResponse<CustomerPhoto> upload(@ModelAttribute CustomerPhotoDto customerPhotoDto) {
+    public ApiResponse<CustomerPhoto> upload(@Valid @ModelAttribute CustomerPhotoDto customerPhotoDto) {
         CustomerPhoto customerPhoto = customerPhotoService.upload(customerPhotoDto);
         return ApiResponse.success(customerPhoto);
     }

src/main/java/com/aida/lanecarford/controller/LoginController.java

@@ -121,4 +121,12 @@ public class LoginController {
         return ApiResponse.success(loginService.parseGoogleAccessToken(accessToken));
     }
 
+    //修改用户信息
+    @Operation(summary = "修改用户信息",
+            description = "传username，email，password三个值，password要加密")
+    @PostMapping("/updateUserInfo")
+    public ApiResponse<String> updateUserInfo(@RequestBody User user) {
+        return ApiResponse.success(loginService.updateUserInfo(user));
+    }
+
 }

src/main/java/com/aida/lanecarford/controller/StyleController.java

@@ -78,6 +78,30 @@ public class StyleController {
         return ApiResponse.success(styleService.getOutfitResult(requestIDs));
     }
 
+    /**
+     * 设置喜欢的风格
+     */
+    @Operation(summary = "设置喜欢的outfit", description = "将指定风格设置为收藏")
+    @PostMapping("/set-favorite/{styleId}")
+    public ApiResponse<Void> setFavoriteStyle(
+            @Parameter(description = "风格ID", required = true)
+            @PathVariable Long styleId) {
+        styleService.setFavoriteStyle(styleId);
+        return ApiResponse.success();
+    }
+
+    /**
+     * 取消喜欢的风格
+     */
+    @Operation(summary = "取消喜欢的outfit", description = "取消指定风格的收藏")
+    @PostMapping("/cancel-favorite/{styleId}")
+    public ApiResponse<Void> cancelFavoriteStyle(
+            @Parameter(description = "风格ID", required = true)
+            @PathVariable Long styleId) {
+        styleService.cancelFavoriteStyle(styleId);
+        return ApiResponse.success();
+    }
+
     @Operation(
             summary = "回溯历史对话，重新生成搭配图",
             description = "根据当前的穿搭结果，回溯历史穿搭请求数据及历史对话，重新生成搭配"
@@ -85,8 +109,10 @@ public class StyleController {
     @GetMapping("/retrieveAndRegenerate")
     public ApiResponse<List<String>> retrieveAndRegenerate(
             @Parameter(description = "tryOn后的图片id", required = true, example = "1369")
-            @RequestParam Long tryOnEffectsId) {
-        return ApiResponse.success(styleService.retrieveAndRegenerate(tryOnEffectsId));
+            @RequestParam Long tryOnEffectsId,
+            @Parameter(description = "用户进店记录", required = true, example = "3")
+            @RequestParam Long checkInId ) {
+        return ApiResponse.success(styleService.retrieveAndRegenerate(tryOnEffectsId, checkInId));
     }
 
 }

src/main/java/com/aida/lanecarford/controller/TryOnEffectController.java

@@ -1,10 +1,15 @@
 package com.aida.lanecarford.controller;
 
 import com.aida.lanecarford.common.ApiResponse;
+import com.aida.lanecarford.common.PageResult;
+import com.aida.lanecarford.common.constant.CommonConstants;
+import com.aida.lanecarford.dto.HistoricalDTO;
 import com.aida.lanecarford.entity.Suggestion;
 import com.aida.lanecarford.entity.TryOnEffect;
 import com.aida.lanecarford.service.TryOnEffectService;
-import com.aida.lanecarford.vo.TryOnResultVo;
+import com.aida.lanecarford.vo.BaseVO;
+import com.aida.lanecarford.vo.OutfitHisVO;
+import com.aida.lanecarford.vo.TryOnResultVO;
 import io.netty.util.internal.StringUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -32,29 +37,25 @@ public class TryOnEffectController {
 
     @Operation(summary = "生成试穿效果", description = "根据服装，模特照片生成试穿效果，其中styleId是必选，当二次生成时，要带上相关参数，比如顾客照片")
     @PostMapping("/generate")
-    public ApiResponse<TryOnResultVo> generateTryOnEffect(
+    public ApiResponse<TryOnResultVO> generateTryOnEffect(
             @Parameter(description = "试穿效果请求参数", required = true)
             @Valid @RequestBody TryOnEffect tryOnEffectDto) {
-        TryOnResultVo tryOnResultVo = tryOnEffectService.generateTryOnEffect(tryOnEffectDto);
+        TryOnResultVO tryOnResultVo = tryOnEffectService.generateTryOnEffect(tryOnEffectDto);
         return ApiResponse.success(tryOnResultVo);
     }
 
-    @Operation(summary = "获取收藏的试穿效果", description = "对应library页面点击details后的显示，参数为进店记录id")
-    @GetMapping("/favorites/{visitRecordId}")
-    public ApiResponse<List<TryOnResultVo>> getFavoriteTryOnEffects(
-            @Parameter(description = "进店记录ID", required = true)
-            @PathVariable Long visitRecordId) {
-        List<TryOnResultVo> tryOnResultVos = tryOnEffectService.getFavoriteTryOnEffects(visitRecordId);
-        return ApiResponse.success(tryOnResultVos);
-    }
-
-    @GetMapping("/style/{styleId}")
-    @Operation(summary = "获取某套服装的所有生成结果", description = "对应customize your look页面点击finish后的显示")
-    public ApiResponse<List<TryOnResultVo>> getTryOnEffectsByStyleId(
-            @Parameter(description = "服装ID", required = true)
-            @PathVariable Long styleId) {
-        List<TryOnResultVo> tryOnResultVos = tryOnEffectService.getTryOnEffectsByStyleId(styleId);
-        return ApiResponse.success(tryOnResultVos);
+    @Operation(summary = "获取历史生成记录", description = "根据type，进店记录id，是否收藏来决定返回的数据，支持分页")
+    @GetMapping("/getHistoricals")
+    public ApiResponse<PageResult<? extends BaseVO>> getHistoricals(
+            @Parameter(description = "历史记录查询参数", required = true)
+            @ModelAttribute HistoricalDTO historicalDTO) {
+        if (CommonConstants.OUTFIT.equals(historicalDTO.getType())) {
+            PageResult<OutfitHisVO> outfitHisVOS = tryOnEffectService.getOutfitHistoricals(historicalDTO);
+            return ApiResponse.success(outfitHisVOS);
+        } else {
+            PageResult<TryOnResultVO> tryOnResultVos = tryOnEffectService.getTryOnHistoricals(historicalDTO);
+            return ApiResponse.success(tryOnResultVos);
+        }
     }
 
     /**
@@ -91,28 +92,28 @@ public class TryOnEffectController {
         return ApiResponse.success();
     }
 
-    /**
-     * 首页默认图换脸演示
-     */
-    @Operation(summary = "首页点击换脸", description = "传入上传顾客照片后得到的ID")
-    @PostMapping("/reFace")
-    public ApiResponse<String> reFace(@Nullable @RequestParam Long customerPhotoId,
-                                      @Nullable @RequestParam String prompt,
-                                      @Nullable @RequestParam String tryonUrl) {
-        if (customerPhotoId == null&& StringUtil.isNullOrEmpty(prompt)&& StringUtil.isNullOrEmpty(tryonUrl)){
-            return ApiResponse.error("system error:Parameter null");
-        }
-        String result = "";
-        if (StringUtil.isNullOrEmpty(prompt)){
-            //换脸
-            result = tryOnEffectService.reFace(customerPhotoId);
-        }else {
-            if (StringUtil.isNullOrEmpty(tryonUrl)){
-                return ApiResponse.error("system error:Parameter null");
-            }
-            //根据提示词修改图像
-            result = tryOnEffectService.generateUrl(prompt,tryonUrl);
-        }
-        return ApiResponse.success("操作成功",result);
-    }
+//    /**
+//     * 首页默认图换脸演示
+//     */
+//    @Operation(summary = "首页点击换脸", description = "传入上传顾客照片后得到的ID")
+//    @PostMapping("/reFace")
+//    public ApiResponse<String> reFace(@Nullable @RequestParam Long customerPhotoId,
+//                                      @Nullable @RequestParam String prompt,
+//                                      @Nullable @RequestParam String tryonUrl) {
+//        if (customerPhotoId == null&& StringUtil.isNullOrEmpty(prompt)&& StringUtil.isNullOrEmpty(tryonUrl)){
+//            return ApiResponse.error("system error:Parameter null");
+//        }
+//        String result = "";
+//        if (StringUtil.isNullOrEmpty(prompt)){
+//            //换脸
+//            result = tryOnEffectService.reFace(customerPhotoId);
+//        }else {
+//            if (StringUtil.isNullOrEmpty(tryonUrl)){
+//                return ApiResponse.error("system error:Parameter null");
+//            }
+//            //根据提示词修改图像
+//            result = tryOnEffectService.generateUrl(prompt,tryonUrl);
+//        }
+//        return ApiResponse.success("操作成功",result);
+//    }
 }

src/main/java/com/aida/lanecarford/dto/HistoricalDTO.java

@@ -0,0 +1,27 @@
+package com.aida.lanecarford.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class HistoricalDTO {
+
+    @Schema(description = "顾客ID", example = "1")
+    private Long customerId;
+
+    @Schema(description = "进店记录ID", example = "1")
+    private Long visitRecordId;
+
+    @Schema(description = "类型", example = "Outfit , Try-on , Gen-AI")
+    private String type;
+
+    @Schema(description = "是否是收藏", example = "true")
+    private Boolean isLibrary;
+
+    @Schema(description = "当前页码，从1开始", example = "1")
+    private Integer pageNum;
+
+    @Schema(description = "每页大小", example = "10")
+    private Integer pageSize;
+
+}

src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java

@@ -10,7 +10,7 @@ public class OutfitCallbackDTO {
 
     private String outfit_id;
 
-    // 取值范围：ok || failed || stop
+    // 取值范围：ok || failed || stop || retrying || retry_failed
     private String status;
 
     private String path;

src/main/java/com/aida/lanecarford/entity/Style.java

@@ -1,6 +1,7 @@
 package com.aida.lanecarford.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -76,4 +77,11 @@ public class Style extends BaseEntity {
     private String errorMessage;
 
     // 注意：createdTime、updatedTime 字段已在 BaseEntity 中定义
+
+    /**
+     * 是否喜欢(0-否,1-是)
+     */
+    @Schema(description = "是否喜欢(0-否,1-是)", example = "1", required = false)
+    @TableField("is_favorite")
+    private Integer isFavorite;
 }

src/main/java/com/aida/lanecarford/exception/GlobalExceptionHandler.java

@@ -88,6 +88,12 @@ public class GlobalExceptionHandler {
 
         logger.error("MinIO异常: {}", e.getMessage(), e);
         
+        // 如果是文件为空等参数错误，返回参数错误码
+        String message = e.getMessage();
+        if (message != null && (message.contains("文件不能为空") || message.contains("不能为空"))) {
+            return ApiResponse.error(ResultEnum.PARAMETER_ERROR.getCode(), "File cannot be empty");
+        }
+        
         return ApiResponse.error(ResultEnum.ERROR.getCode(), "File storage service error");
     }
 

src/main/java/com/aida/lanecarford/service/LoginService.java

@@ -36,4 +36,6 @@ public interface LoginService extends IService<User> {
     LoginVO parseGoogleCredential(String credential) throws ParseException, JOSEException, IOException;
 
     LoginVO parseGoogleAccessToken(String accessToken);
+
+    String updateUserInfo(User user);
 }

src/main/java/com/aida/lanecarford/service/StyleService.java

@@ -19,6 +19,18 @@ public interface StyleService extends IService<Style> {
 
     List<OutfitResultVO> getOutfitResult(List<String> requestIDs);
 
-    List<String> retrieveAndRegenerate(Long tryOnEffectsId);
+    /**
+     * 设置风格为收藏
+     * @param styleId 风格ID
+     */
+    void setFavoriteStyle(Long styleId);
+
+    /**
+     * 取消风格的收藏
+     * @param styleId 风格ID
+     */
+    void cancelFavoriteStyle(Long styleId);
+
+    List<String> retrieveAndRegenerate(Long tryOnEffectsId, Long checkInId);
 
 }

src/main/java/com/aida/lanecarford/service/TryOnEffectService.java

@@ -1,8 +1,11 @@
 package com.aida.lanecarford.service;
 
+import com.aida.lanecarford.common.PageResult;
+import com.aida.lanecarford.dto.HistoricalDTO;
 import com.aida.lanecarford.entity.Suggestion;
 import com.aida.lanecarford.entity.TryOnEffect;
-import com.aida.lanecarford.vo.TryOnResultVo;
+import com.aida.lanecarford.vo.OutfitHisVO;
+import com.aida.lanecarford.vo.TryOnResultVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import jakarta.validation.Valid;
 
@@ -16,9 +19,9 @@ import java.util.List;
  */
 public interface TryOnEffectService extends IService<TryOnEffect> {
 
-    TryOnResultVo generateTryOnEffect(@Valid TryOnEffect tryOnEffectDto);
+    TryOnResultVO generateTryOnEffect(@Valid TryOnEffect tryOnEffectDto);
 
-    List<TryOnResultVo> getFavoriteTryOnEffects(Long visitRecordId);
+    List<TryOnResultVO> getFavoriteTryOnEffects(Long visitRecordId);
 
     /**
      * 设置试穿效果为收藏
@@ -32,7 +35,7 @@ public interface TryOnEffectService extends IService<TryOnEffect> {
      */
     void cancelFavoriteTryOnEffect(Long tryOnId);
 
-    List<TryOnResultVo> getTryOnEffectsByStyleId(Long styleId);
+    List<TryOnResultVO> getTryOnEffectsByStyleId(Long styleId);
 
     /**
      * 添加意见建议
@@ -41,7 +44,11 @@ public interface TryOnEffectService extends IService<TryOnEffect> {
      */
     boolean addComment(Suggestion suggestion);
 
+    //已废弃
     String reFace(Long customerPhotoId);
-
     String generateUrl(String prompt, String tryonUrl);
+
+    PageResult<TryOnResultVO> getTryOnHistoricals(HistoricalDTO historicalDTO);
+
+    PageResult<OutfitHisVO> getOutfitHistoricals(HistoricalDTO historicalDTO);
 }

src/main/java/com/aida/lanecarford/service/impl/CustomerPhotoServiceImpl.java

@@ -1,9 +1,11 @@
 package com.aida.lanecarford.service.impl;
 
 import com.aida.lanecarford.common.constant.MinioFileConstants;
+import com.aida.lanecarford.common.response.ResultEnum;
 import com.aida.lanecarford.config.MinioConfig;
 import com.aida.lanecarford.dto.CustomerPhotoDto;
 import com.aida.lanecarford.entity.CustomerPhoto;
+import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.mapper.CustomerPhotoMapper;
 import com.aida.lanecarford.service.CustomerPhotoService;
 import com.aida.lanecarford.util.CopyUtil;
@@ -11,6 +13,7 @@ import com.aida.lanecarford.util.MinioUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 顾客照片服务实现类
@@ -26,9 +29,14 @@ public class CustomerPhotoServiceImpl extends ServiceImpl<CustomerPhotoMapper, C
 
     @Override
     public CustomerPhoto upload(CustomerPhotoDto customerPhotoDto) {
+        // 验证文件是否为空
+        MultipartFile file = customerPhotoDto.getFile();
+        if (file == null || file.isEmpty()) {
+            throw new BusinessException(ResultEnum.PARAMETER_ERROR, "File cannot be empty", "文件不能为空");
+        }
 
         String logicalUrl = minioUtil.uploadFile(
-                customerPhotoDto.getFile(), 
+                file, 
                 MinioFileConstants.FileType.CUSTOMER_PHOTO,
                 minioConfig.getBucketName()
         );

src/main/java/com/aida/lanecarford/service/impl/LoginServiceImpl.java

@@ -353,6 +353,66 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
         }
     }
 
+    @Override
+    public String updateUserInfo(User user) {
+        // 1. 获取当前登录用户ID
+        AuthPrincipalVO userHolder = UserContext.getUserHolder();
+        if (Objects.isNull(userHolder)) {
+            throw new BusinessException("User not logged in", "用户未登录", ResultEnum.ERROR.getCode());
+        }
+        
+        Long userId = userHolder.getId();
+        
+        // 2. 验证用户是否存在
+        User existingUser = getById(userId);
+        if (Objects.isNull(existingUser)) {
+            throw new BusinessException("User not found", "用户不存在", ResultEnum.ERROR.getCode());
+        }
+        
+        // 3. 构建更新条件，只更新有值的字段
+        UpdateWrapper<User> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(User::getId, userId);
+        
+        boolean hasUpdate = false;
+        
+        // 如果username有值，则更新
+        if (!StringUtil.isNullOrEmpty(user.getUsername())) {
+            updateWrapper.lambda().set(User::getUsername, user.getUsername());
+            hasUpdate = true;
+        }
+        
+        // 如果email有值，则更新
+        if (!StringUtil.isNullOrEmpty(user.getEmail())) {
+            updateWrapper.lambda().set(User::getEmail, user.getEmail());
+            hasUpdate = true;
+        }
+        
+        // 如果password有值，则更新
+        if (!StringUtil.isNullOrEmpty(user.getPassword())) {
+            updateWrapper.lambda().set(User::getPassword, user.getPassword());
+            hasUpdate = true;
+        }
+        
+        // 4. 如果没有需要更新的字段，返回提示信息
+        if (!hasUpdate) {
+            return "No fields to update";
+        }
+        
+        // 5. 执行更新
+        boolean updated = update(updateWrapper);
+        
+        if (updated) {
+            log.info("用户信息更新成功 userId={}, updatedFields=username:{}, email:{}, password:{}", 
+                    userId, 
+                    !StringUtil.isNullOrEmpty(user.getUsername()),
+                    !StringUtil.isNullOrEmpty(user.getEmail()),
+                    !StringUtil.isNullOrEmpty(user.getPassword()));
+            return "User information updated successfully";
+        } else {
+            throw new BusinessException("Failed to update user information", "更新用户信息失败", ResultEnum.ERROR.getCode());
+        }
+    }
+
     private static final String TOKEN_URL = "https://oauth2.googleapis.com/token";
 
     public GoogleUser getGoogleUserFromCode(String code) {

src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java

@@ -4,6 +4,7 @@ import com.aida.lanecarford.common.constant.CommonConstants;
 import com.aida.lanecarford.common.constant.RedisURIConstants;
 import com.aida.lanecarford.common.enums.StatusEnum;
 import com.aida.lanecarford.common.enums.StylistPathEnum;
+import com.aida.lanecarford.common.response.ResultEnum;
 import com.aida.lanecarford.dto.OutfitCallbackDTO;
 import com.aida.lanecarford.dto.RequestOutfitDTO;
 import com.aida.lanecarford.entity.OutfitRequest;
@@ -26,7 +27,6 @@ import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.netty.util.internal.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -61,6 +61,10 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         // 请求需要顾客id, 生成的数量，风格
 
         StylistPathEnum stylistPathEnum = StylistPathEnum.of(requestOutfitDTO.getStylist());
+        if (Objects.isNull(stylistPathEnum)) {
+            log.error("未知设计师： {}",requestOutfitDTO.getStylist() );
+            stylistPathEnum = StylistPathEnum.STYLIST_ONE;
+        }
         Map<String, Object> params = setRequestOutfitParams(requestOutfitDTO, stylistPathEnum);
 
         SessionRecord sessionRecord = saveOrUpdateSession(requestOutfitDTO.getSessionId(), requestOutfitDTO.getCheckInId(), null, null);
@@ -100,6 +104,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
             String key = RedisURIConstants.outfitResultCache + requestId;
             OutfitResultVO outfitResultVO = new OutfitResultVO(style.getId(), requestId, StatusEnum.PENDING.name());
+            outfitResultVO.setCreateTimeStamp(System.currentTimeMillis());
             cacheUtil.setCache(key, outfitResultVO, RedisURIConstants.verifyCodeTimeout);
         }
         return requestIds;
@@ -128,44 +133,74 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
     // 搭配完成后的回调通知处理
     public void callback(OutfitCallbackDTO callbackDTO) {
-        if (Objects.isNull(callbackDTO.getStatus())) {
+        if (Objects.isNull(callbackDTO.getStatus())
+                || callbackDTO.getStatus().equals("failed")
+                || callbackDTO.getStatus().equals("continue")) {
             return;
         }
 
-        if ("ok".equals(callbackDTO.getStatus()) || "stop".equals(callbackDTO.getStatus())) {
-            // 1. 判断path是否为空，是 -> 不做任何处理
-            if (StringUtil.isNullOrEmpty(callbackDTO.getPath())) {
-                return;
+        // 1. 判断path是否为空，是 -> 不做任何处理
+        if (("ok".equals(callbackDTO.getStatus())
+                || "stop".equals(callbackDTO.getStatus()))
+                && StringUtils.isBlank(callbackDTO.getPath())) {
+            log.error("状态为ok || stop时，path为空");
+            return;
+        }
+
+        if (StringUtils.isBlank(callbackDTO.getOutfit_id())) {
+            log.error("回调参数中，outfit_id为空");
+            return;
+        }
+
+        String requestId = callbackDTO.getOutfit_id();
+
+        // 2. 获取outfit_id,查询数据库
+        String key = RedisURIConstants.outfitResultCache + requestId;
+        Object outfitResult = cacheUtil.getCache(key);
+        if (Objects.isNull(outfitResult)) {
+            log.error("未知搭配请求");
+            return;
+        }
+
+        // 3.更新path, items, 状态
+        // 由于数据变化较频繁，考虑存到redis
+        if (outfitResult instanceof OutfitResultVO) {
+            String status;
+            switch(callbackDTO.getStatus()) {
+                case "ok":
+                    status = StatusEnum.RUNNING.name();
+                    ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
+                    break;
+                case "stop":
+                    status = StatusEnum.SUCCEEDED.name();
+                    ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
+                    break;
+                case "retrying":
+                    status = StatusEnum.PENDING.name();
+                    ((OutfitResultVO) outfitResult).setCreateTimeStamp(System.currentTimeMillis());
+                    ((OutfitResultVO) outfitResult).setPath(null);
+                    break;
+                case "almost_done":
+                    // 此时是没有更新path的
+                    status = StatusEnum.ALMOST_DONE.name();
+                    break;
+                case /*"failed",*/ "retry_failed":
+                    status = StatusEnum.FAILED.name();
+                    break;
+                default:
+                    log.error("outfit_id为{}，回调状态未知{}", requestId, callbackDTO.getStatus());
+                    status = StatusEnum.FAILED.name();
             }
 
-            if (StringUtil.isNullOrEmpty(callbackDTO.getOutfit_id())) {
-                log.error("回调参数中，outfit_id为空");
-                return;
-            }
-
-            String requestId = callbackDTO.getOutfit_id();
-
-            // 2. 获取outfit_id,查询数据库
-            String key = RedisURIConstants.outfitResultCache + requestId;
-            Object outfitResult = cacheUtil.getCache(key);
-            if (Objects.isNull(outfitResult)) {
-                log.error("未知搭配请求");
-                return;
-            }
-
-            // 3.更新path, items, 状态
-            // 由于数据变化较频繁，考虑存到redis
-            if (outfitResult instanceof OutfitResultVO) {
-                ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
-                String status = "ok".equals(callbackDTO.getStatus()) ? StatusEnum.RUNNING.name() : StatusEnum.SUCCEEDED.name();
-                ((OutfitResultVO) outfitResult).setStatus(status);
-                cacheUtil.setCache(key, outfitResult, RedisURIConstants.outfitResultTimeout);
-            }
+            ((OutfitResultVO) outfitResult).setStatus(status);
+            cacheUtil.setCache(key, outfitResult, RedisURIConstants.outfitResultTimeout);
         }
 
         // 生成结束或失败时更新数据库
-        if ("stop".equals(callbackDTO.getStatus()) || "failed".equals(callbackDTO.getStatus())) {
-            String requestId = callbackDTO.getOutfit_id();
+        if ("stop".equals(callbackDTO.getStatus())
+                /*|| "failed".equals(callbackDTO.getStatus())*/
+                || "retry_failed".equals(callbackDTO.getStatus())) {
+//            String requestId = callbackDTO.getOutfit_id();
 
             LambdaQueryWrapper<Style> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Style::getPythonRequestId, requestId);
@@ -197,6 +232,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
     public List<OutfitResultVO> getOutfitResult(List<String> requestIDs) {
         ArrayList<OutfitResultVO> resultVOS = new ArrayList<>();
         ArrayList<String> reQueryIds = new ArrayList<>();
+        List<String> expiredIds = new ArrayList<>();
         // 优先从redis中获取结果，没有再从数据库中查询
         for (String requestID : requestIDs) {
             String key = RedisURIConstants.outfitResultCache + requestID;
@@ -206,7 +242,25 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
                 reQueryIds.add(requestID);
                 continue;
             }
-            resultVOS.add((OutfitResultVO) outfit);
+
+            // 判断这条记录的状态是否为成功或者失败，否，判断这条记录的创建时间是否超过3分钟，否，继续往后，是，设置为失败并更新数据库
+            if (outfit instanceof OutfitResultVO) {
+                if ((((OutfitResultVO) outfit).getStatus().equals(StatusEnum.PENDING.name())
+                        || ((OutfitResultVO) outfit).getStatus().equals(StatusEnum.RUNNING.name())
+                        || ((OutfitResultVO) outfit).getStatus().equals(StatusEnum.ALMOST_DONE.name()))
+                        && isExpired(((OutfitResultVO) outfit).getCreateTimeStamp())) {
+                    // 设置状态为失败
+                    ((OutfitResultVO) outfit).setStatus(StatusEnum.FAILED.name());
+                    // 更新redis和数据库状态
+                    expiredIds.add(requestID);
+                    cacheUtil.setCache(key, outfit, RedisURIConstants.outfitResultTimeout);
+                }
+                resultVOS.add((OutfitResultVO) outfit);
+            }
+        }
+
+        if (!expiredIds.isEmpty()) {
+            batchUpdateExpiredRecords(expiredIds);
         }
 
         if (!reQueryIds.isEmpty()) {
@@ -215,12 +269,13 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
             List<Style> list = list(queryWrapper);
             if (!list.isEmpty()) {
+                // 在数据库中的数据，都是处于成功或失败的状态
                 for (Style style : list) {
                     OutfitResultVO outfitResultVO = new OutfitResultVO();
                     outfitResultVO.setId(style.getId());
                     outfitResultVO.setRequestId(style.getPythonRequestId());
                     outfitResultVO.setStatus(StatusEnum.of(style.getGenerationStatus()).name());
-                    if (!StringUtil.isNullOrEmpty(style.getStyleImageUrl())) {
+                    if (!StringUtils.isBlank(style.getStyleImageUrl())) {
                         outfitResultVO.setPath(minioUtil.getPresignedUrl(style.getStyleImageUrl(), CommonConstants.MINIO_PATH_TIMEOUT));
                     }
                     resultVOS.add(outfitResultVO);
@@ -231,6 +286,68 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         return resultVOS;
     }
 
+    // 3分钟的毫秒数
+    private static final long THREE_MINUTES_IN_MILLIS = 3 * 60 * 1000;
+
+    private boolean isExpired(long createTimeMillis) {
+        long currentTimeMillis = System.currentTimeMillis();
+        return (currentTimeMillis - createTimeMillis) >= THREE_MINUTES_IN_MILLIS;
+    }
+
+    private void batchUpdateExpiredRecords(List<String> expiredIds) {
+        try {
+            if (CollectionUtils.isEmpty(expiredIds)) {
+                return;
+            }
+
+            // 批量更新，减少数据库压力
+            lambdaUpdate()
+                    .in(Style::getPythonRequestId, expiredIds)
+                    .set(Style::getGenerationStatus, StatusEnum.FAILED.getCode())
+                    .set(Style::getUpdatedTime, LocalDateTime.now())
+                    .update();
+
+            log.info("批量更新过期记录为失败状态，数量：{}", expiredIds.size());
+
+        } catch (Exception e) {
+            log.error("批量更新过期记录失败", e);
+        }
+    }
+
+    @Override
+    public void setFavoriteStyle(Long styleId) {
+        if (styleId == null) {
+            throw new BusinessException("Style ID is required", "风格ID不能为空", ResultEnum.PARAMETER_ERROR.getCode());
+        }
+
+        Style style = this.getById(styleId);
+        if (style == null) {
+            throw new BusinessException("Style not found", "风格不存在", ResultEnum.FAIL.getCode());
+        }
+
+        // 设置为收藏
+        style.setIsFavorite(1);
+        this.updateById(style);
+        log.info("风格ID: {} 已设置为收藏", styleId);
+    }
+
+    @Override
+    public void cancelFavoriteStyle(Long styleId) {
+        if (styleId == null) {
+            throw new BusinessException("Style ID is required", "风格ID不能为空", ResultEnum.PARAMETER_ERROR.getCode());
+        }
+
+        Style style = this.getById(styleId);
+        if (style == null) {
+            throw new BusinessException("Style not found", "风格不存在", ResultEnum.FAIL.getCode());
+        }
+
+        // 取消收藏
+        style.setIsFavorite(0);
+        this.updateById(style);
+        log.info("风格ID: {} 已取消收藏", styleId);
+    }
+
     public SessionRecord saveOrUpdateSession(String sessionId, Long visitsId, String summary, List<String> occasion) {
         // 判断同一次进店记录中，当前会话id是否已存在
         QueryWrapper<SessionRecord> queryWrapper = new QueryWrapper<>();
@@ -256,7 +373,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         return sessionRecord;
     }
 
-    public List<String> retrieveAndRegenerate(Long tryOnEffectsId) {
+    public List<String> retrieveAndRegenerate(Long tryOnEffectsId, Long checkInId) {
         // 1. 判断id是否有效
         TryOnEffect tryOnEffect = tryOnEffectMapper.selectById(tryOnEffectsId);
         if (Objects.isNull(tryOnEffect)) {
@@ -267,6 +384,10 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
             log.error("Id 为：{} 的tryOnEffects记录,没有style_id", tryOnEffectsId);
             throw new BusinessException("Cannot recreate outfit from past data.");
         }
+        if (Objects.isNull(checkInId)) {
+            log.error("checkInId 为空");
+            throw new BusinessException("'checkInId' cannot be empty");
+        }
 
         // 2. 组装参数
         Style style = baseMapper.selectById(tryOnEffect.getStyleId());
@@ -281,7 +402,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
                 log.error("找不到Id 为：{} 的SessionRecord记录", outfitRequest.getSessionRecordId());
                 throw new BusinessException("Cannot recreate outfit from past data.");
             }
-            RequestOutfitDTO requestOutfitDTO = getRequestOutfitDTO(outfitRequest, sessionRecord);
+            RequestOutfitDTO requestOutfitDTO = getRequestOutfitDTO(outfitRequest, sessionRecord, checkInId);
 
             return requestOutfit(requestOutfitDTO);
         } else {
@@ -291,10 +412,10 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
     }
 
     @NotNull
-    private static RequestOutfitDTO getRequestOutfitDTO(OutfitRequest outfitRequest, SessionRecord sessionRecord) {
+    private static RequestOutfitDTO getRequestOutfitDTO(OutfitRequest outfitRequest, SessionRecord sessionRecord, Long checkInId) {
         RequestOutfitDTO requestOutfitDTO = new RequestOutfitDTO();
         requestOutfitDTO.setCustomerId(outfitRequest.getCustomerId());
-        requestOutfitDTO.setCheckInId(outfitRequest.getVisitRecordId());
+        requestOutfitDTO.setCheckInId(checkInId);
         requestOutfitDTO.setStylist(outfitRequest.getStylist());
         requestOutfitDTO.setGender(outfitRequest.getGender());
         requestOutfitDTO.setNum(1);

src/main/java/com/aida/lanecarford/service/impl/TryOnEffectServiceImpl.java

@@ -1,11 +1,13 @@
 package com.aida.lanecarford.service.impl;
 
 import cn.hutool.json.JSONObject;
+import com.aida.lanecarford.common.PageResult;
 import com.aida.lanecarford.common.constant.CommonConstants;
 import com.aida.lanecarford.config.MinioConfig;
 import com.aida.lanecarford.config.FaceSwapConfig;
 import com.aida.lanecarford.common.response.ResultEnum;
 import com.aida.lanecarford.common.constant.MinioFileConstants;
+import com.aida.lanecarford.dto.HistoricalDTO;
 import com.aida.lanecarford.entity.*;
 import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.mapper.CustomerMapper;
@@ -16,10 +18,13 @@ import com.aida.lanecarford.service.*;
 import com.aida.lanecarford.entity.Suggestion;
 import com.aida.lanecarford.util.MinioUtil;
 import com.aida.lanecarford.util.StringListConverter;
-import com.aida.lanecarford.vo.TryOnResultVo;
+import com.aida.lanecarford.vo.OutfitHisVO;
+import com.aida.lanecarford.vo.TryOnResultVO;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.auth.oauth2.GoogleCredentials;
 import lombok.RequiredArgsConstructor;
@@ -38,7 +43,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author AI Assistant
  * @since 2024-01-01
-/**
+ * /**
  * 试穿效果服务实现类
  */
 @Service
@@ -46,12 +51,7 @@ import java.util.concurrent.TimeUnit;
 public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOnEffect> implements TryOnEffectService {
     private static final Logger log = LoggerFactory.getLogger(TryOnEffectServiceImpl.class);
     private final StyleService styleService;
-    private final ModelPhotoService modelPhotoService;
     private final CustomerPhotoService customerPhotoService;
-    private final ImageCompositionService imageCompositionService;
-
-    private final CustomerMapper customerMapper;
-
     private final MinioUtil minioUtil;
     private final MinioConfig minioConfig;
     private final FaceSwapConfig faceSwapConfig;
@@ -59,7 +59,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
     private final OutfitRequestMapper outfitRequestMapper;
 
     @Override
-    public TryOnResultVo generateTryOnEffect(TryOnEffect tryOnEffectDto) {
+    public TryOnResultVO generateTryOnEffect(TryOnEffect tryOnEffectDto) {
         Integer isRegenerated = tryOnEffectDto.getIsRegenerated();
         String toAIlogicalUrl = null;
         String prompt = null;
@@ -74,7 +74,13 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
                 throw BusinessException.parameterRequired("originalTryOnId");
             }
             TryOnEffect originalTryOn = this.getById(originalTryOnId);
+            if (tryOnEffectDto.getStyleId()==null){
+                tryOnEffectDto.setStyleId(originalTryOn.getStyleId());
+            }
             String resultImageUrl = originalTryOn.getResultImageUrl();
+            if (tryOnEffectDto.getStyleId()==null){
+                tryOnEffectDto.setStyleId(originalTryOn.getStyleId());
+            }
             imageUrls.add(resultImageUrl);
 
             Long customerPhotoId = tryOnEffectDto.getCustomerPhotoId();
@@ -83,7 +89,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
                 CustomerPhoto customerPhoto = customerPhotoService.getById(customerPhotoId);
                 String customerPhotoUrl = customerPhoto.getPhotoUrl();
                 if (customerPhotoUrl != null && !customerPhotoUrl.trim().isEmpty()) {
-                    if (imageUrls.isEmpty()){
+                    if (imageUrls.isEmpty()) {
                         throw BusinessException.parameterRequired("TryOn result");
                     }
                     //先放tryon图片后放脸
@@ -114,24 +120,24 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
             for (Map<String, String> map : maps) {
                 String category = map.get("category");
                 sb.append("a ");
-                sb.append( category);
+                sb.append(category);
                 sb.append(",");
             }
 
             prompt = "A full-body, photorealistic professional studio shot of a **young " + outfitRequest.getGender() + "**, mid-20s, with **clear facial features and a confident expression**. The model is centered in the frame.They are **standing in a direct, static, full-view pose** on a **clean, pure white background** **The entire figure, from head to toe, should be in frame and occupy approximately 80% of the vertical space.**.\n" +
                     "\n" +
                     "**CRITICAL COMPOSITION INSTRUCTION:**\n" +
-                    "Generate a single, seamless image of the model with a complete and fully visible head,**wearing ALL distinct items("+sb.toString()+")** from the uploaded  image. **ALL items MUST be visible and correctly worn in the final outfit.**" +
+                    "Generate a single, seamless image of the model with a complete and fully visible head,**wearing ALL distinct items(" + sb.toString() + ")** from the uploaded  image. **ALL items MUST be visible and correctly worn in the final outfit.**" +
                     "\n" +
                     "**Placement Detail:** Outerwear must be worn on the outside, and if a bag is present, it must be visible.\n" +
                     "**Quality:** Ultra-high resolution, The figure should fill the frame as much as possible,studio photography quality. Emphasize **realistic fabric textures and sharp print fidelity**.\n" +
-                    "**Negative Constraints (Exclude):** **NO text, NO borders, NO tables, NO multiple models, NO extra items.** **CRITICAL: NO cropping of the head or face.**";
-                aiRreultlogicalUrl = AITryOnEffect(prompt, imageUrls);
+                    "**Negative Constraints (Exclude):** **NO text, NO borders, NO tables, NO multiple models, All items must be worn on the person; they must not be displayed anywhere else except on the model.** **CRITICAL: NO cropping of the head or face.**";
+            aiRreultlogicalUrl = AITryOnEffect(prompt, imageUrls);
 
-        }else if (tryOnEffectDto.getIsRegenerated() == 1 && imageUrls.size() == 1){
+        } else if (tryOnEffectDto.getIsRegenerated() == 1 && imageUrls.size() == 1) {
             //根据提示词修改图像
             aiRreultlogicalUrl = AITryOnEffect(prompt, imageUrls);
-        }else if (tryOnEffectDto.getIsRegenerated() == 1 && imageUrls.size() > 1){
+        } else if (tryOnEffectDto.getIsRegenerated() == 1 && imageUrls.size() > 1) {
             //换脸
             aiRreultlogicalUrl = callFaceSwapAPI(imageUrls);
         }
@@ -140,8 +146,8 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
         tryOnEffectDto.setGenerationStatus("completed");
         this.saveOrUpdate(tryOnEffectDto);
 
-        TryOnResultVo tryOnResultVo = new TryOnResultVo();
-        tryOnResultVo.setTryOnId(tryOnEffectDto.getId());
+        TryOnResultVO tryOnResultVo = new TryOnResultVO();
+        tryOnResultVo.setId(tryOnEffectDto.getId());
 
         tryOnResultVo.setTryOnUrl(minioUtil.convertToPresignedUrl(aiRreultlogicalUrl, CommonConstants.MINIO_PATH_TIMEOUT));
 
@@ -150,15 +156,15 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
 
     //library页面点击details后的显示
     @Override
-    public List<TryOnResultVo> getFavoriteTryOnEffects(Long visitRecordId) {
+    public List<TryOnResultVO> getFavoriteTryOnEffects(Long visitRecordId) {
         List<TryOnEffect> tryOnEffects = this.list(new LambdaQueryWrapper<TryOnEffect>()
                 .eq(TryOnEffect::getVisitRecordId, visitRecordId)
                 .eq(TryOnEffect::getIsFavorite, 1)
-                .orderByAsc(TryOnEffect::getCreatedTime));
-        List<TryOnResultVo> tryOnResultVos = new ArrayList<>();
+                .orderByDesc(TryOnEffect::getCreatedTime));
+        List<TryOnResultVO> tryOnResultVos = new ArrayList<>();
         for (TryOnEffect tryOnEffect : tryOnEffects) {
-            TryOnResultVo tryOnResultVo = new TryOnResultVo();
-            tryOnResultVo.setTryOnId(tryOnEffect.getId());
+            TryOnResultVO tryOnResultVo = new TryOnResultVO();
+            tryOnResultVo.setId(tryOnEffect.getId());
             // 使用新的API获取预签名URL，数据库存储的是逻辑URL
             tryOnResultVo.setTryOnUrl(minioUtil.convertToPresignedUrl(
                     tryOnEffect.getResultImageUrl(),
@@ -184,6 +190,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
 
     /**
      * 添加意见建议
+     *
      * @param suggestion 意见建议实体
      * @return 是否添加成功
      */
@@ -206,6 +213,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
         }
     }
 
+    //已废弃
     @Override
     public String reFace(Long customerPhotoId) {
 
@@ -255,16 +263,96 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
         return minioUtil.convertToPresignedUrl(aiRreultlogicalUrl, CommonConstants.MINIO_PATH_TIMEOUT);
     }
 
+    @Override
+    public PageResult<TryOnResultVO> getTryOnHistoricals(HistoricalDTO historicalDTO) {
+        LambdaQueryWrapper<TryOnEffect> tryOnEffectLambdaQueryWrapper = new LambdaQueryWrapper<TryOnEffect>()
+                .eq(TryOnEffect::getCustomerId, historicalDTO.getCustomerId())
+                .orderByDesc(TryOnEffect::getCreatedTime);
+        if (historicalDTO.getVisitRecordId() != null) {
+            tryOnEffectLambdaQueryWrapper.eq(TryOnEffect::getVisitRecordId, historicalDTO.getVisitRecordId());
+        }
+        if (historicalDTO.getIsLibrary() != null && historicalDTO.getIsLibrary()) {
+            tryOnEffectLambdaQueryWrapper.eq(TryOnEffect::getIsFavorite, 1);
+        }
+        if (CommonConstants.TRYON.equals(historicalDTO.getType())) {
+            tryOnEffectLambdaQueryWrapper.eq(TryOnEffect::getIsRegenerated, 0);
+        } else if (CommonConstants.GENAI.equals(historicalDTO.getType())) {
+            tryOnEffectLambdaQueryWrapper.eq(TryOnEffect::getIsRegenerated, 1);
+        }
+
+        long current = historicalDTO.getPageNum() == null || historicalDTO.getPageNum() <= 0 ? 1L : historicalDTO.getPageNum();
+        long size = historicalDTO.getPageSize() == null || historicalDTO.getPageSize() <= 0 ? 10L : historicalDTO.getPageSize();
+
+        IPage<TryOnEffect> page = this.page(new Page<>(current, size), tryOnEffectLambdaQueryWrapper);
+
+        List<TryOnResultVO> tryOnResultVos = new ArrayList<>();
+        for (TryOnEffect tryOnEffect : page.getRecords()) {
+            TryOnResultVO tryOnResultVo = new TryOnResultVO();
+            tryOnResultVo.setId(tryOnEffect.getId());
+            tryOnResultVo.setTryOnUrl(minioUtil.convertToPresignedUrl(
+                    tryOnEffect.getResultImageUrl(),
+                    CommonConstants.MINIO_PATH_TIMEOUT
+            ));
+            // 如果是原始效果，则获取对应的style图片
+            if (tryOnEffect.getIsRegenerated() == 0) {
+                LambdaQueryWrapper<Style> styleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                styleLambdaQueryWrapper.eq(Style::getId, tryOnEffect.getStyleId()).select(Style::getStyleImageUrl);
+                Style style = styleService.getOne(styleLambdaQueryWrapper);
+                tryOnResultVo.setStyleUrl(minioUtil.convertToPresignedUrl(
+                        style.getStyleImageUrl(),
+                        CommonConstants.MINIO_PATH_TIMEOUT
+                ));
+            }
+
+            tryOnResultVo.setIsRegenerated(tryOnEffect.getIsRegenerated());
+            tryOnResultVo.setIsFavorite(tryOnEffect.getIsFavorite());
+            tryOnResultVos.add(tryOnResultVo);
+        }
+        return new PageResult<>(tryOnResultVos, page.getTotal(), page.getCurrent(), page.getSize());
+    }
+
+    @Override
+    public PageResult<OutfitHisVO> getOutfitHistoricals(HistoricalDTO historicalDTO) {
+        LambdaQueryWrapper<Style> styleLambdaQueryWrapper = new LambdaQueryWrapper<Style>()
+                .eq(Style::getCustomerId, historicalDTO.getCustomerId())
+                .eq(Style::getGenerationStatus, 1)
+                .orderByDesc(Style::getCreatedTime);
+        if (historicalDTO.getVisitRecordId() != null) {
+            styleLambdaQueryWrapper.eq(Style::getVisitRecordId, historicalDTO.getVisitRecordId());
+        }
+        if (historicalDTO.getIsLibrary() != null && historicalDTO.getIsLibrary()) {
+            styleLambdaQueryWrapper.eq(Style::getIsFavorite, 1);
+        }
+
+        long current = historicalDTO.getPageNum() == null || historicalDTO.getPageNum() <= 0 ? 1L : historicalDTO.getPageNum();
+        long size = historicalDTO.getPageSize() == null || historicalDTO.getPageSize() <= 0 ? 10L : historicalDTO.getPageSize();
+
+        IPage<Style> page = styleService.page(new Page<>(current, size), styleLambdaQueryWrapper);
+
+        List<OutfitHisVO> outfitHisVos = new ArrayList<>();
+        for (Style style : page.getRecords()) {
+            OutfitHisVO outfitHisVo = new OutfitHisVO();
+            outfitHisVo.setId(style.getId());
+            outfitHisVo.setUrl(minioUtil.convertToPresignedUrl(
+                    style.getStyleImageUrl(),
+                    CommonConstants.MINIO_PATH_TIMEOUT
+            ));
+            outfitHisVo.setIsFavorite(style.getIsFavorite());
+            outfitHisVos.add(outfitHisVo);
+        }
+        return new PageResult<>(outfitHisVos, page.getTotal(), page.getCurrent(), page.getSize());
+    }
+
     //目前用于customize your look页面点击finish后的显示
     @Override
-    public List<TryOnResultVo> getTryOnEffectsByStyleId(Long styleId) {
+    public List<TryOnResultVO> getTryOnEffectsByStyleId(Long styleId) {
         List<TryOnEffect> tryOnEffects = this.list(new LambdaQueryWrapper<TryOnEffect>()
                 .eq(TryOnEffect::getStyleId, styleId)
-                .orderByAsc(TryOnEffect::getCreatedTime));
-        List<TryOnResultVo> tryOnResultVos = new ArrayList<>();
+                .orderByDesc(TryOnEffect::getCreatedTime));
+        List<TryOnResultVO> tryOnResultVos = new ArrayList<>();
         for (TryOnEffect tryOnEffect : tryOnEffects) {
-            TryOnResultVo tryOnResultVo = new TryOnResultVo();
-            tryOnResultVo.setTryOnId(tryOnEffect.getId());
+            TryOnResultVO tryOnResultVo = new TryOnResultVO();
+            tryOnResultVo.setId(tryOnEffect.getId());
             // 使用新的API获取预签名URL，数据库存储的是逻辑URL
             tryOnResultVo.setTryOnUrl(minioUtil.convertToPresignedUrl(
                     tryOnEffect.getResultImageUrl(),
@@ -402,7 +490,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
             return processGoogleAPIResponse(response);
         } catch (Exception e) {
             log.error("调用Google API失败: {}", e.getMessage(), e);
-            throw new BusinessException("Google API call failed", "Google API调用失败", ResultEnum.ERROR.getCode());
+            throw new BusinessException("Generation timed out. Please try again later.", "生成超时，请稍后再试", ResultEnum.ERROR.getCode());
         }
     }
 
@@ -569,7 +657,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
             String finishReason = candidate.getString("finishReason");
             if (!"STOP".equals(finishReason)) {
                 String finishMessage = candidate.getString("finishMessage");
-                if (finishReason != null && finishReason.equals("IMAGE_SAFETY")){
+                if (finishReason != null && finishReason.equals("IMAGE_SAFETY")) {
                     if (finishMessage != null && finishMessage.contains("Try rephrasing the prompt")) {
                         finishMessage = "Try rephrasing the prompt.If you think this was an error, send feedback.";
                         throw new BusinessException(finishMessage, "请尝试重新表述提示词。若您认为这是误判，可提交反馈。", ResultEnum.ERROR.getCode());
@@ -616,6 +704,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
 
     /**
      * 调用换脸API
+     *
      * @param imageUrls 图片URL列表，第一个为源图片，第二个为目标图片
      * @return 换脸后的图片URL
      */
@@ -630,7 +719,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
 
             // 构建输入图片列表（从第二张图片开始作为目标图片列表）
             JSONArray inputImageList = new JSONArray();
-                inputImageList.add(imageUrls.get(0));
+            inputImageList.add(imageUrls.get(0));
 
             // 构建请求体
             JSONObject requestBody = new JSONObject();
@@ -638,9 +727,11 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
             requestBody.put("input_face", inputFaceUrl);
             requestBody.put("threshold", 0.2);
 
+            log.info("换脸API请求体: {}", requestBody.toString());
             // 调用换脸API
             String response = sendFaceSwapRequest(faceSwapConfig.getRefaceUrl(), requestBody.toString());
 
+
             // 处理响应
             return processFaceSwapResponse(response);
 
@@ -733,7 +824,6 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
                         log.info("换脸成功，图片路径: {}", imagePath);
 
 
-                        
                         // 下载图片并上传到MinIO
                         return imagePath;
                     } else {
@@ -744,7 +834,7 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
                     log.error("output字段不是数组格式: {}", outputObj);
                     throw new BusinessException("Invalid output format", "output字段格式不正确", ResultEnum.ERROR.getCode());
                 }
-            }else {
+            } else {
                 log.error("换脸API响应失败: {}", response);
                 throw new BusinessException("reface error", "换脸失败", ResultEnum.ERROR.getCode());
             }

src/main/java/com/aida/lanecarford/vo/BaseVO.java

@@ -0,0 +1,15 @@
+package com.aida.lanecarford.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class BaseVO implements Serializable {
+
+    private static final long serialVersionUID = 10007L;
+
+    @Schema(description = "ID")
+    private Long id;
+}

src/main/java/com/aida/lanecarford/vo/OutfitHisVO.java

@@ -0,0 +1,11 @@
+package com.aida.lanecarford.vo;
+
+import lombok.Data;
+
+@Data
+public class OutfitHisVO extends BaseVO {
+
+    private String url;
+
+    private Integer isFavorite;
+}

src/main/java/com/aida/lanecarford/vo/OutfitResultVO.java

@@ -26,6 +26,8 @@ public class OutfitResultVO {
     )
     private String status;
 
+    private Long createTimeStamp;
+
     public OutfitResultVO(Long id, String requestId, String status) {
         this.id = id;
         this.requestId = requestId;

src/main/java/com/aida/lanecarford/vo/TryOnResultVO.java

@@ -3,9 +3,7 @@ package com.aida.lanecarford.vo;
 import lombok.Data;
 
 @Data
-public class TryOnResultVo {
-
-    private Long tryOnId;
+public class TryOnResultVO extends BaseVO {
 
     private String tryOnUrl;
 

src/main/resources/sql/schema.sql

@@ -71,6 +71,7 @@ CREATE TABLE `styles` (
   `style_image_url` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '风格图片URL',
   `python_request_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Python请求ID',
   `generation_status` tinyint DEFAULT '0' COMMENT '生成状态(0-处理中,1-已完成,2-失败)',
+  `is_favorite` tinyint NOT NULL DEFAULT '0' COMMENT '是否喜欢(0-否,1-是)',
   `items` json DEFAULT NULL COMMENT '单品唯一标识',
   `error_message` text COLLATE utf8mb4_unicode_ci COMMENT '错误信息',
   `created_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',