Merge remote-tracking branch 'origin/dev/dev-ltx' into dev/dev

.gitea/workflows/prod_build_commit.yaml

@@ -1,147 +0,0 @@
-name: git commit 控制 连卡佛 back-java prod 分支构建部署
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - prod/release_1.0
-
-jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-    if: "contains(github.event.head_commit.message, '[run build]')"
-
-    permissions:
-      contents: read
-      packages: write
-
-    env:
-      REMOTE_DEPLOY_PATH: /workspace/workspace_lanecrawford/back
-
-    steps:
-      - name: 1.检出代码
-        uses: actions/checkout@v4
-        with:
-          ref: prod/release_1.0
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-
-      - name: 2.设置JAVA Maven 环境
-        run: |
-          # 适配act的root用户和Gitea Runner普通用户
-          SUDO=""
-          [ "$(id -u)" != "0" ] && SUDO="sudo"
-          
-          # 安装依赖
-          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
-          
-          # 下载并安装Maven
-          MAVEN_VERSION="3.6.3"
-          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
-          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
-          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
-          
-          # 解压+软链接
-          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
-          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
-          
-          # 配置PATH
-          echo "/usr/local/maven/bin" >> $GITHUB_PATH
-          export PATH="/usr/local/maven/bin:$PATH"
-          
-          # 验证
-          mvn -v
-
-      - name: 2.构建jar包
-        run:
-          mvn -B clean package -DskipTests --file pom.xml
-
-      - name: 3.检查 Runner 本地文件
-        run: |
-          echo "当前目录：$(pwd)"
-          echo "target 目录内容："
-          ls -la ./target/
-          
-          # 容错:处理通配符无匹配的情况
-          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
-          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
-            echo "❌ Runner 本地无有效 JAR 包！"
-            exit 1
-          fi
-          
-          # 检查Docker配置文件
-          for FILE in Dockerfile docker-compose.yml; do
-            if [ ! -f "./$FILE" ]; then
-              echo "❌ 缺失文件：$FILE"
-              exit 1
-            fi
-          done
-          echo "✅ 本地文件校验通过！"
-
-      - name: 4. 同步文件到远程服务器
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
-          target: ${{ env.REMOTE_DEPLOY_PATH }}
-          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-          strip_components: 0
-
-      - name: 5. 验证远程文件
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          script: |
-            echo "===== 远程部署目录文件列表 ====="
-            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
-            
-            # 容错:检查JAR包
-            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
-            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
-              echo "❌ 远程服务器无有效 JAR 包！"
-              exit 1
-            fi
-            
-            # 检查Docker文件
-            for FILE in Dockerfile docker-compose.yml; do
-              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
-                echo "❌ 远程缺失文件：$FILE"
-                exit 1
-              fi
-            done
-            echo "✅ 远程文件校验通过！"
-
-      - name: 6. 部署和运行服务
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          script: |
-            echo "===== 开始部署服务 ====="
-            cd ${{ env.REMOTE_DEPLOY_PATH }}
-            
-            # 容错:停止旧容器（不存在则跳过）
-            echo "停止旧容器..."
-            docker compose down || true
-            
-            # 清理无效镜像（可选，释放空间）
-            docker system prune -f
-            
-            # 构建并启动新容器
-            echo "构建Docker镜像..."
-            docker compose build --no-cache
-            echo "启动服务..."
-            docker compose up -d
-            
-            # 验证服务状态
-            echo "验证容器状态..."
-            docker compose ps
-            echo "✅ 部署完成！"

.gitea/workflows/prod_build_manual.yaml

@@ -1,143 +0,0 @@
-name: 手动 连卡佛 back-java prod 分支构建部署
-on:
-  workflow_dispatch:
-
-jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-
-    env:
-      REMOTE_DEPLOY_PATH: /workspace/workspace_lanecrawford/back
-
-    steps:
-      - name: 1.检出代码
-        uses: actions/checkout@v4
-        with:
-          ref: prod/release_1.0
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-
-      - name: 2.设置JAVA Maven 环境
-        run: |
-          # 适配act的root用户和Gitea Runner普通用户
-          SUDO=""
-          [ "$(id -u)" != "0" ] && SUDO="sudo"
-          
-          # 安装依赖
-          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
-          
-          # 下载并安装Maven
-          MAVEN_VERSION="3.6.3"
-          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
-          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
-          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
-          
-          # 解压+软链接
-          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
-          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
-          
-          # 配置PATH
-          echo "/usr/local/maven/bin" >> $GITHUB_PATH
-          export PATH="/usr/local/maven/bin:$PATH"
-          
-          # 验证
-          mvn -v
-
-      - name: 2.构建jar包
-        run:
-          mvn -B clean package -DskipTests --file pom.xml
-
-      - name: 3.检查 Runner 本地文件
-        run: |
-          echo "当前目录：$(pwd)"
-          echo "target 目录内容："
-          ls -la ./target/
-          
-          # 容错:处理通配符无匹配的情况
-          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
-          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
-            echo "❌ Runner 本地无有效 JAR 包！"
-            exit 1
-          fi
-          
-          # 检查Docker配置文件
-          for FILE in Dockerfile docker-compose.yml; do
-            if [ ! -f "./$FILE" ]; then
-              echo "❌ 缺失文件：$FILE"
-              exit 1
-            fi
-          done
-          echo "✅ 本地文件校验通过！"
-
-      - name: 4. 同步文件到远程服务器
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
-          target: ${{ env.REMOTE_DEPLOY_PATH }}
-          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-          strip_components: 0
-
-      - name: 5. 验证远程文件
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          script: |
-            echo "===== 远程部署目录文件列表 ====="
-            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
-            
-            # 容错:检查JAR包
-            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
-            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
-              echo "❌ 远程服务器无有效 JAR 包！"
-              exit 1
-            fi
-            
-            # 检查Docker文件
-            for FILE in Dockerfile docker-compose.yml; do
-              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
-                echo "❌ 远程缺失文件：$FILE"
-                exit 1
-              fi
-            done
-            echo "✅ 远程文件校验通过！"
-
-      - name: 6. 部署和运行服务
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          script: |
-            echo "===== 开始部署服务 ====="
-            cd ${{ env.REMOTE_DEPLOY_PATH }}
-            
-            # 容错:停止旧容器（不存在则跳过）
-            echo "停止旧容器..."
-            docker compose down || true
-            
-            # 清理无效镜像（可选，释放空间）
-            docker system prune -f
-            
-            # 构建并启动新容器
-            echo "构建Docker镜像..."
-            docker compose build --no-cache
-            echo "启动服务..."
-            docker compose up -d
-            
-            # 验证服务状态
-            echo "验证容器状态..."
-            docker compose ps
-            echo "✅ 部署完成！"

.gitea/workflows/prod_build_schedule.yaml

@@ -1,146 +0,0 @@
-name: 定时 连卡佛 back-java prod 分支构建部署
-on:
-  schedule:
-    #       cron为UTC时区，构建时间=部署时间-8小时 {*分 (-8)时 *日 *月  *周}  ---
-    #      示例： 1月1日22点22分触发构建 cron写作 - '22 14 1 1 *'
-    - cron: '22 14 1 1 *'
-
-jobs:
-  build_and_deploy:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-
-    env:
-      REMOTE_DEPLOY_PATH: /workspace/workspace_lanecrawford/back
-
-    steps:
-      - name: 1.检出代码
-        uses: actions/checkout@v4
-        with:
-          ref: prod/release_1.0
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-
-      - name: 2.设置JAVA Maven 环境
-        run: |
-          # 适配act的root用户和Gitea Runner普通用户
-          SUDO=""
-          [ "$(id -u)" != "0" ] && SUDO="sudo"
-          
-          # 安装依赖
-          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
-          
-          # 下载并安装Maven
-          MAVEN_VERSION="3.6.3"
-          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
-          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
-          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
-          
-          # 解压+软链接
-          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
-          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
-          
-          # 配置PATH
-          echo "/usr/local/maven/bin" >> $GITHUB_PATH
-          export PATH="/usr/local/maven/bin:$PATH"
-          
-          # 验证
-          mvn -v
-
-      - name: 2.构建jar包
-        run:
-          mvn -B clean package -DskipTests --file pom.xml
-
-      - name: 3.检查 Runner 本地文件
-        run: |
-          echo "当前目录：$(pwd)"
-          echo "target 目录内容："
-          ls -la ./target/
-          
-          # 容错:处理通配符无匹配的情况
-          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
-          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
-            echo "❌ Runner 本地无有效 JAR 包！"
-            exit 1
-          fi
-          
-          # 检查Docker配置文件
-          for FILE in Dockerfile docker-compose.yml; do
-            if [ ! -f "./$FILE" ]; then
-              echo "❌ 缺失文件：$FILE"
-              exit 1
-            fi
-          done
-          echo "✅ 本地文件校验通过！"
-
-      - name: 4. 同步文件到远程服务器
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
-          target: ${{ env.REMOTE_DEPLOY_PATH }}
-          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-          strip_components: 0
-
-      - name: 5. 验证远程文件
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          script: |
-            echo "===== 远程部署目录文件列表 ====="
-            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
-            
-            # 容错:检查JAR包
-            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
-            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
-              echo "❌ 远程服务器无有效 JAR 包！"
-              exit 1
-            fi
-            
-            # 检查Docker文件
-            for FILE in Dockerfile docker-compose.yml; do
-              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
-                echo "❌ 远程缺失文件：$FILE"
-                exit 1
-              fi
-            done
-            echo "✅ 远程文件校验通过！"
-
-      - name: 6. 部署和运行服务
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          script: |
-            echo "===== 开始部署服务 ====="
-            cd ${{ env.REMOTE_DEPLOY_PATH }}
-            
-            # 容错:停止旧容器（不存在则跳过）
-            echo "停止旧容器..."
-            docker compose down || true
-            
-            # 清理无效镜像（可选，释放空间）
-            docker system prune -f
-            
-            # 构建并启动新容器
-            echo "构建Docker镜像..."
-            docker compose build --no-cache
-            echo "启动服务..."
-            docker compose up -d
-            
-            # 验证服务状态
-            echo "验证容器状态..."
-            docker compose ps
-            echo "✅ 部署完成！"

docker-compose.yml

@@ -6,4 +6,4 @@ services:
       # 日志目录映射
       - ./log:/log
     ports:
-      - '10095:8080'
+      - '10010:8080'

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/security/JwtInterceptor.java

@@ -2,6 +2,7 @@ package com.aida.lanecarford.common.security;
 
 import com.aida.lanecarford.common.security.config.JwtProperties;
 import com.aida.lanecarford.common.security.context.UserContext;
+import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.util.CacheUtil;
 import com.aida.lanecarford.vo.AuthPrincipalVO;
 import com.alibaba.fastjson.JSONObject;
@@ -24,7 +25,7 @@ public class JwtInterceptor implements HandlerInterceptor {
     private final JwtProperties jwtProperties;
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
             return true;
         }
@@ -40,8 +41,7 @@ public class JwtInterceptor implements HandlerInterceptor {
             String extracted = jwtUtil.extractUserinfo(jwtToken);
             if (StringUtil.isNullOrEmpty(extracted)) {
                 log.warn("TOKEN已过期，请重新登录！(token without userInfo)");
-                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-//                throw new BusinessException("Token has expired, please log in again.");
+                throw new BusinessException("Token has expired, please log in again.");
             }
 
             AuthPrincipalVO authPrincipalVO = JSONObject.parseObject(extracted, AuthPrincipalVO.class);
@@ -54,12 +54,10 @@ public class JwtInterceptor implements HandlerInterceptor {
 
             if (Objects.isNull(token)) {
                 log.warn("TOKEN已过期，请重新登录！(local cache empty)");
-                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-//                throw new BusinessException("Token has expired, please log in again.");
+                throw new BusinessException("Token has expired, please log in again.");
             } else if (!token.toString().equals(jwtToken)) {
                 log.warn("TOKEN已过期，请重新登录！(token not match local cache)");
-                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-//                throw new BusinessException("Token has expired, please log in again.");
+                throw new BusinessException("Token has expired, please log in again.");
             }
             return true;
         }

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

@@ -2,7 +2,6 @@ package com.aida.lanecarford.controller;
 
 import com.aida.lanecarford.common.ApiResponse;
 import com.aida.lanecarford.dto.BaseRequest;
-import com.aida.lanecarford.entity.Customer;
 import com.aida.lanecarford.service.CustomerService;
 import com.aida.lanecarford.vo.CustomerCheckInVO;
 import com.aida.lanecarford.vo.CustomerVO;
@@ -26,11 +25,11 @@ public class CustomerController {
 
     @Operation(
         summary = "顾客入店登记", 
-        description = "验证顾客身份并创建入店记录"
+        description = "验证顾客身份并创建入店记录，如果是新顾客则自动注册到系统中。"
     )
     @GetMapping("/checkIn")
-    public ApiResponse<CustomerCheckInVO> customerCheckIn(@RequestParam String nickname) {
-        return ApiResponse.success(customerService.customerCheckIn(nickname));
+    public ApiResponse<CustomerCheckInVO> customerCheckIn(@RequestParam String name, @RequestParam String email) {
+        return ApiResponse.success(customerService.customerCheckIn(name, email));
     }
 
     @PostMapping("/getAllCustomer")
@@ -38,15 +37,4 @@ public class CustomerController {
         return ApiResponse.success(customerService.getAllCustomer(request));
     }
 
-    @Operation(
-            summary = "新增顾客",
-            description = "根据用户提供的vipId和昵称与当前sales绑定，创建账号"
-    )
-    @GetMapping("/createCustomer")
-    public ApiResponse<Customer> createCustomer(@RequestParam String vipId, @RequestParam String nickname) {
-        return ApiResponse.success(customerService.createCustomer(vipId, nickname));
-    }
-
-
-
 }

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

@@ -78,15 +78,28 @@ public class StyleController {
         return ApiResponse.success(styleService.getOutfitResult(requestIDs));
     }
 
-    @Operation(
-            summary = "回溯历史对话，重新生成搭配图",
-            description = "根据当前的穿搭结果，回溯历史穿搭请求数据及历史对话，重新生成搭配"
-    )
-    @GetMapping("/retrieveAndRegenerate")
-    public ApiResponse<List<String>> retrieveAndRegenerate(
-            @Parameter(description = "tryOn后的图片id", required = true, example = "1369")
-            @RequestParam Long tryOnEffectsId) {
-        return ApiResponse.success(styleService.retrieveAndRegenerate(tryOnEffectsId));
+    /**
+     * 设置喜欢的风格
+     */
+    @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();
     }
 
 }

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

@@ -1,10 +1,14 @@
 package com.aida.lanecarford.controller;
 
 import com.aida.lanecarford.common.ApiResponse;
+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 +36,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(
+    @Operation(summary = "获取历史生成记录", description = "根据type，进店记录id，是否收藏来决定返回的数据")
+    @GetMapping("/getHistoricals")
+    public ApiResponse<List<? extends BaseVO>> getHistoricals(
             @Parameter(description = "服装ID", required = true)
-            @PathVariable Long styleId) {
-        List<TryOnResultVo> tryOnResultVos = tryOnEffectService.getTryOnEffectsByStyleId(styleId);
-        return ApiResponse.success(tryOnResultVos);
+            @RequestBody HistoricalDTO historicalDTO) {
+        if (CommonConstants.OUTFIT.equals(historicalDTO.getType())){
+            List<OutfitHisVO> outfitHisVOS = tryOnEffectService.getOutfitHistoricals(historicalDTO);
+            return ApiResponse.success(outfitHisVOS);
+        }else {
+            List<TryOnResultVO> tryOnResultVos = tryOnEffectService.getTryOnHistoricals(historicalDTO);
+            return ApiResponse.success(tryOnResultVos);
+        }
     }
 
     /**

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

@@ -0,0 +1,17 @@
+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 visitRecordId;
+
+    @Schema(description = "类型",example = "Outfit , Try-on , Gen-AI")
+    private String type;
+
+    @Schema(description = "是否是收藏",example = "true")
+    private Boolean isLibrary;
+
+}

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

@@ -16,8 +16,4 @@ public class OutfitCallbackDTO {
     private String path;
 
     private List<Map<String, String>> items;
-
-    private String request_summary;
-
-    private List<String> occasions;
 }

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

@@ -1,12 +1,9 @@
 package com.aida.lanecarford.dto;
 
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.util.List;
-
 
 @Data
 @Schema(description = "AI穿搭推荐请求参数")
@@ -62,10 +59,4 @@ public class RequestOutfitDTO {
     )
     private String sessionId;
 
-    @Hidden
-    private String summary;
-
-    @Hidden
-    private List<String> occasion;
-
 }

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

@@ -20,18 +20,6 @@ import java.time.LocalDateTime;
 @TableName("customers")
 public class Customer extends BaseEntity {
 
-    /**
-     * 导购id,即user表的主键id
-     */
-    @TableField("user_id")
-    private Long salesId;
-
-    /**
-     * vip ID
-     */
-    @TableField("vip_id")
-    private String vipId;
-
     /**
      * 顾客姓名
      */

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

@@ -31,9 +31,4 @@ public class OutfitRequest extends BaseEntity{
      * 当前任务状态
      */
     private int status;
-
-    /**
-     * 会话记录id
-     */
-    private Long sessionRecordId;
 }

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

@@ -1,51 +0,0 @@
-package com.aida.lanecarford.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@TableName("session_record")
-public class SessionRecord extends BaseEntity{
-
-    private Long visitRecordId;
-
-    private String sessionId;
-
-    private String requestSummary;
-
-    private String occasions;
-
-    // 获取时转换为List
-    @JsonIgnore
-    public List<String> getOccasionsList() {
-        if (StringUtils.isBlank(this.occasions)) {
-            return new ArrayList<>();
-        }
-        // 使用特定分隔符，确保不会出现在内容中
-        return Arrays.asList(this.occasions.split("\\|\\|"));
-    }
-
-    // 设置时转换为String
-    public void setOccasionsList(List<String> occasionsList) {
-        if (occasionsList == null || occasionsList.isEmpty()) {
-            this.occasions = null;
-        } else {
-            this.occasions = String.join("||", occasionsList);
-        }
-    }
-
-}

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/mapper/SessionRecordMapper.java

@@ -1,9 +0,0 @@
-package com.aida.lanecarford.mapper;
-
-import com.aida.lanecarford.entity.SessionRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SessionRecordMapper extends BaseMapper<SessionRecord> {
-}

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

@@ -12,10 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface CustomerService extends IService<Customer> {
 
-    CustomerCheckInVO customerCheckIn(String vipId);
+    CustomerCheckInVO customerCheckIn(String name, String email);
 
     IPage<CustomerVO> getAllCustomer(BaseRequest request);
 
-    Customer createCustomer(String vipId, String nickname);
-
 }

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

@@ -19,6 +19,16 @@ 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);
 
 }

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

@@ -1,8 +1,10 @@
 package com.aida.lanecarford.service;
 
+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 +18,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 +34,7 @@ public interface TryOnEffectService extends IService<TryOnEffect> {
      */
     void cancelFavoriteTryOnEffect(Long tryOnId);
 
-    List<TryOnResultVo> getTryOnEffectsByStyleId(Long styleId);
+    List<TryOnResultVO> getTryOnEffectsByStyleId(Long styleId);
 
     /**
      * 添加意见建议
@@ -44,4 +46,8 @@ public interface TryOnEffectService extends IService<TryOnEffect> {
     String reFace(Long customerPhotoId);
 
     String generateUrl(String prompt, String tryonUrl);
+
+    List<TryOnResultVO> getTryOnHistoricals(HistoricalDTO historicalDTO);
+
+    List<OutfitHisVO> getOutfitHistoricals(HistoricalDTO historicalDTO);
 }

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

@@ -1,11 +1,9 @@
 package com.aida.lanecarford.service.impl;
 
-import com.aida.lanecarford.common.response.ResultEnum;
 import com.aida.lanecarford.common.security.context.UserContext;
 import com.aida.lanecarford.dto.BaseRequest;
 import com.aida.lanecarford.entity.Customer;
 import com.aida.lanecarford.entity.VisitRecord;
-import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.mapper.CustomerMapper;
 import com.aida.lanecarford.service.CustomerService;
 import com.aida.lanecarford.service.VisitRecordService;
@@ -17,7 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -33,16 +30,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     private final VisitRecordService visitRecordService;
 
     // 选择顾客登录并添加入店记录
-    public CustomerCheckInVO customerCheckIn(String nickname) {
-        // sales ID即当前的用户id
-        Long salesId = UserContext.getUserHolder().getId();
-        if (StringUtils.isBlank(nickname)) {
-            throw new BusinessException("Please enter a nickname.", ResultEnum.PROMPT.getCode());
-        }
+    public CustomerCheckInVO customerCheckIn(String name, String email) {
         // 1. 判断当前顾客信息在数据库中是否有存储
         LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Customer::getName, nickname)
-                .eq(Customer::getSalesId, salesId);
+        queryWrapper.eq(Customer::getName, name).eq(Customer::getEmail, email);
 
         Customer customer = getOne(queryWrapper);
 
@@ -50,28 +41,27 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         if (Objects.isNull(customer)) {
             // todo 从连卡佛数据库查数据
             // 先假设都找不到
-             throw new BusinessException("This customer does not currently have a registered VIP account.");
+            // throw new BusinessException("This customer does not currently have a registered VIP account.");
             // 如果找到了，则添加到数据库
             // 3. 添加当前顾客到本系统数据库
-//            customer = new Customer();
-//            customer.setVipId(vipId);
-//            customer.setCreatedTime(LocalDateTime.now());
-//
-//            save(customer);
+            customer = new Customer();
+            customer.setName(name);
+            customer.setEmail(email);
+            customer.setCreatedTime(LocalDateTime.now());
+
+            save(customer);
         }
 
         // 4. 添加入店记录
-        VisitRecord visitRecord = visitRecordService.addRecord(customer.getId(), salesId);
+        VisitRecord visitRecord = visitRecordService.addRecord(customer.getId(), UserContext.getUserHolder().getId());
 
         return new CustomerCheckInVO(customer.getId(), visitRecord.getId());
     }
 
     // 获取所有的顾客名单
     public IPage<CustomerVO> getAllCustomer(BaseRequest request) {
-        Long salesId = UserContext.getUserHolder().getId();
         LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Customer::getSalesId, salesId);
-        queryWrapper.select(Customer::getName, Customer::getVipId);
+        queryWrapper.select(Customer::getName, Customer::getEmail);
 
         Page<Customer> page = page(new Page<>(request.getCurrent(), request.getSize()), queryWrapper);
 
@@ -83,36 +73,4 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         });
     }
 
-    public Customer createCustomer(String vipId, String nickname) {
-        Long salesId = UserContext.getUserHolder().getId();
-        // 1. 确认nickname是否有重复，有，返回提示信息
-        boolean nicknameExists = lambdaQuery().eq(Customer::getName, nickname)
-                .eq(Customer::getSalesId, salesId).count() > 0;
-        if (nicknameExists) {
-            throw new BusinessException("'" + nickname + "' already exists. Please choose a different nickname.");
-        }
-
-        // 2. 确认输入的vipId是否已存在账号
-        LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Customer::getVipId, vipId)
-                .eq(Customer::getSalesId, salesId);
-
-        Customer customer = getOne(queryWrapper);
-
-        // 3. 不存在则新建
-        if (Objects.isNull(customer)) {
-            customer = new Customer();
-            customer.setVipId(vipId);
-            customer.setName(nickname);
-            customer.setSalesId(salesId);
-            customer.setCreatedTime(LocalDateTime.now());
-
-            save(customer);
-        } else {
-            throw new BusinessException("VIP ID'" + vipId + "' already exists.Please proceed directly to check-in.");
-        }
-
-        return customer;
-    }
-
 }

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

@@ -4,17 +4,14 @@ 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;
-import com.aida.lanecarford.entity.SessionRecord;
 import com.aida.lanecarford.entity.Style;
-import com.aida.lanecarford.entity.TryOnEffect;
 import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.mapper.OutfitRequestMapper;
-import com.aida.lanecarford.mapper.SessionRecordMapper;
 import com.aida.lanecarford.mapper.StyleMapper;
-import com.aida.lanecarford.mapper.TryOnEffectMapper;
 import com.aida.lanecarford.service.StyleService;
 import com.aida.lanecarford.util.CacheUtil;
 import com.aida.lanecarford.util.MinioUtil;
@@ -24,16 +21,12 @@ import com.aida.lanecarford.vo.OutfitResultVO;
 import com.alibaba.fastjson.JSONObject;
 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;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -49,8 +42,6 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
     private final CacheUtil cacheUtil;
     private final MinioUtil minioUtil;
     private final OutfitRequestMapper outfitRequestMapper;
-    private final SessionRecordMapper sessionRecordMapper;
-    private final TryOnEffectMapper tryOnEffectMapper;
 
     @Value("${webhook.domain}")
     private String webhookDomain;
@@ -61,16 +52,14 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         // 请求需要顾客id, 生成的数量，风格
 
         StylistPathEnum stylistPathEnum = StylistPathEnum.of(requestOutfitDTO.getStylist());
-        Map<String, Object> params = setRequestOutfitParams(requestOutfitDTO, stylistPathEnum);
-
-        SessionRecord sessionRecord = saveOrUpdateSession(requestOutfitDTO.getSessionId(), requestOutfitDTO.getCheckInId(), null, null);
+        Map<String, Object> params = setRequestOutfitParams(requestOutfitDTO.getCustomerId(), requestOutfitDTO.getNum(),
+                stylistPathEnum.getPath(), requestOutfitDTO.getGender(), requestOutfitDTO.getSessionId());
 
         OutfitRequest outfitRequest = new OutfitRequest();
         outfitRequest.setCustomerId(requestOutfitDTO.getCustomerId());
         outfitRequest.setVisitRecordId(requestOutfitDTO.getCheckInId());
         outfitRequest.setStylist(requestOutfitDTO.getStylist());
         outfitRequest.setGender(requestOutfitDTO.getGender());
-        outfitRequest.setSessionRecordId(sessionRecord.getId());
         outfitRequestMapper.insert(outfitRequest);
 
         log.info("agent request params: {}", JSON.toJSONString(params));
@@ -106,22 +95,16 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
     }
 
-    private Map<String, Object> setRequestOutfitParams(RequestOutfitDTO requestOutfitDTO, StylistPathEnum stylistPathEnum) {
+    private Map<String, Object> setRequestOutfitParams(Long customerId, int num, String stylistPath, String gender, String sessionId) {
         HashMap<String, Object> params = new HashMap<>();
-        params.put("user_id", requestOutfitDTO.getCustomerId().toString());
-        params.put("num_outfits", requestOutfitDTO.getNum());
-        params.put("stylist_path", stylistPathEnum.getName());
+        params.put("user_id", customerId.toString());
+        params.put("num_outfits", num);
+        params.put("stylist_path", stylistPath);
         params.put("callback_url", webhookDomain);
-        params.put("gender", requestOutfitDTO.getGender());
-//        params.put("max_len", 5);
-        params.put("session_id", requestOutfitDTO.getSessionId());
+        params.put("gender", gender);
+        params.put("max_len", 5);
+        params.put("session_id", sessionId);
         params.put("batch_sources", Collections.singleton("2025_q4"));
-        if (StringUtils.isNotBlank(requestOutfitDTO.getSummary())) {
-            params.put("request_summary", requestOutfitDTO.getSummary());
-        }
-        if (!CollectionUtils.isEmpty(requestOutfitDTO.getOccasion())) {
-            params.put("occasions", requestOutfitDTO.getOccasion());
-        }
 
         return params;
     }
@@ -184,13 +167,6 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
             outfit.setItems(itemsJson);
 
             updateById(outfit);
-            OutfitRequest outfitRequest = outfitRequestMapper.selectById(outfit.getOutfitRequestId());
-            if (Objects.nonNull(outfitRequest) && Objects.nonNull(outfitRequest.getSessionRecordId())) {
-                SessionRecord sessionRecord = sessionRecordMapper.selectById(outfitRequest.getSessionRecordId());
-                saveOrUpdateSession(sessionRecord.getSessionId(), sessionRecord.getVisitRecordId(),
-                        callbackDTO.getRequest_summary(), callbackDTO.getOccasions());
-            }
-
         }
     }
 
@@ -231,77 +207,38 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         return resultVOS;
     }
 
-    public SessionRecord saveOrUpdateSession(String sessionId, Long visitsId, String summary, List<String> occasion) {
-        // 判断同一次进店记录中，当前会话id是否已存在
-        QueryWrapper<SessionRecord> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SessionRecord::getVisitRecordId, visitsId)
-                .eq(SessionRecord::getSessionId, sessionId);
-        SessionRecord sessionRecord = sessionRecordMapper.selectOne(queryWrapper);
-        if (Objects.isNull(sessionRecord)) {
-            sessionRecord = new SessionRecord();
-            sessionRecord.setVisitRecordId(visitsId);
-            sessionRecord.setSessionId(sessionId);
-            sessionRecord.setRequestSummary(summary);
-            sessionRecord.setOccasionsList(occasion);
-            sessionRecord.setCreatedTime(LocalDateTime.now());
-            int insert = sessionRecordMapper.insert(sessionRecord);
-            log.info("新增session record，影响{}条记录", insert);
-        } else {
-            sessionRecord.setRequestSummary(summary);
-            sessionRecord.setOccasionsList(occasion);
-            sessionRecord.setUpdatedTime(LocalDateTime.now());
-            int row = sessionRecordMapper.updateById(sessionRecord);
-            log.info("更新session record，影响{}条记录", row);
+    @Override
+    public void setFavoriteStyle(Long styleId) {
+        if (styleId == null) {
+            throw new BusinessException("Style ID is required", "风格ID不能为空", ResultEnum.PARAMETER_ERROR.getCode());
         }
-        return sessionRecord;
+
+        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);
     }
 
-    public List<String> retrieveAndRegenerate(Long tryOnEffectsId) {
-        // 1. 判断id是否有效
-        TryOnEffect tryOnEffect = tryOnEffectMapper.selectById(tryOnEffectsId);
-        if (Objects.isNull(tryOnEffect)) {
-            log.error("无效id: {}", tryOnEffectsId);
-            throw new BusinessException("Error: Invalid ID.");
-        }
-        if (Objects.isNull(tryOnEffect.getStyleId())) {
-            log.error("Id 为：{} 的tryOnEffects记录,没有style_id", tryOnEffectsId);
-            throw new BusinessException("Cannot recreate outfit from past data.");
+    @Override
+    public void cancelFavoriteStyle(Long styleId) {
+        if (styleId == null) {
+            throw new BusinessException("Style ID is required", "风格ID不能为空", ResultEnum.PARAMETER_ERROR.getCode());
         }
 
-        // 2. 组装参数
-        Style style = baseMapper.selectById(tryOnEffect.getStyleId());
-        if (Objects.nonNull(style)) {
-            OutfitRequest outfitRequest = outfitRequestMapper.selectById(style.getOutfitRequestId());
-            if (Objects.isNull(outfitRequest)){
-                log.error("找不到Id 为：{} 的OutfitRequest记录", style.getOutfitRequestId());
-                throw new BusinessException("Cannot recreate outfit from past data.");
-            }
-            SessionRecord sessionRecord = sessionRecordMapper.selectById(outfitRequest.getSessionRecordId());
-            if (Objects.isNull(sessionRecord)){
-                log.error("找不到Id 为：{} 的SessionRecord记录", outfitRequest.getSessionRecordId());
-                throw new BusinessException("Cannot recreate outfit from past data.");
-            }
-            RequestOutfitDTO requestOutfitDTO = getRequestOutfitDTO(outfitRequest, sessionRecord);
-
-            return requestOutfit(requestOutfitDTO);
-        } else {
-            log.error("找不到Id 为：{} 的Style记录", tryOnEffect.getStyleId());
-            throw new BusinessException("Cannot recreate outfit from past data.");
+        Style style = this.getById(styleId);
+        if (style == null) {
+            throw new BusinessException("Style not found", "风格不存在", ResultEnum.FAIL.getCode());
         }
-    }
 
-    @NotNull
-    private static RequestOutfitDTO getRequestOutfitDTO(OutfitRequest outfitRequest, SessionRecord sessionRecord) {
-        RequestOutfitDTO requestOutfitDTO = new RequestOutfitDTO();
-        requestOutfitDTO.setCustomerId(outfitRequest.getCustomerId());
-        requestOutfitDTO.setCheckInId(outfitRequest.getVisitRecordId());
-        requestOutfitDTO.setStylist(outfitRequest.getStylist());
-        requestOutfitDTO.setGender(outfitRequest.getGender());
-        requestOutfitDTO.setNum(1);
-        requestOutfitDTO.setSessionId(sessionRecord.getSessionId());
-        requestOutfitDTO.setSummary(sessionRecord.getRequestSummary());
-        requestOutfitDTO.setOccasion(sessionRecord.getOccasionsList());
-        return requestOutfitDTO;
+        // 取消收藏
+        style.setIsFavorite(0);
+        this.updateById(style);
+        log.info("风格ID: {} 已取消收藏", styleId);
     }
 
 }

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

@@ -6,6 +6,7 @@ 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,7 +17,8 @@ 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;
@@ -59,7 +61,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;
@@ -140,8 +142,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 +152,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(),
@@ -255,16 +257,82 @@ public class TryOnEffectServiceImpl extends ServiceImpl<TryOnEffectMapper, TryOn
         return minioUtil.convertToPresignedUrl(aiRreultlogicalUrl, CommonConstants.MINIO_PATH_TIMEOUT);
     }
 
+    @Override
+    public List<TryOnResultVO> getTryOnHistoricals(HistoricalDTO historicalDTO) {
+            LambdaQueryWrapper<TryOnEffect> tryOnEffectLambdaQueryWrapper = new LambdaQueryWrapper<TryOnEffect>()
+                    .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);
+            }
+            List<TryOnEffect> tryOnEffects = this.list(tryOnEffectLambdaQueryWrapper);
+            List<TryOnResultVO> tryOnResultVos = new ArrayList<>();
+            for (TryOnEffect tryOnEffect : tryOnEffects) {
+                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 tryOnResultVos;
+    }
+
+    @Override
+    public List<OutfitHisVO> getOutfitHistoricals(HistoricalDTO historicalDTO) {
+        LambdaQueryWrapper<Style> styleLambdaQueryWrapper = new LambdaQueryWrapper<Style>().orderByDesc(Style::getCreatedTime);
+        if (historicalDTO.getVisitRecordId() != null){
+            styleLambdaQueryWrapper.eq(Style::getVisitRecordId, historicalDTO.getVisitRecordId());
+        }
+        if (historicalDTO.getIsLibrary() != null||historicalDTO.getIsLibrary()){
+            styleLambdaQueryWrapper.eq(Style::getIsFavorite, 1);
+        }
+        List<Style> styles = styleService.list(styleLambdaQueryWrapper);
+        List<OutfitHisVO> outfitHisVos = new ArrayList<>();
+        for (Style style : styles) {
+            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 outfitHisVos;
+    }
+
     //目前用于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 +470,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());
         }
     }
 

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/CustomerVO.java

@@ -16,15 +16,12 @@ public class CustomerVO {
     /**
      * 顾客姓名
      */
-    @Schema(description = "顾客姓名", example = "张三")
+    @Schema(description = "顾客姓名", example = "张三", required = true)
     private String name;
 
     /**
      * 顾客邮箱
      */
-    @Schema(description = "顾客邮箱地址", example = "zhangsan@example.com")
+    @Schema(description = "顾客邮箱地址", example = "zhangsan@example.com", required = true)
     private String email;
-
-    @Schema(description = "顾客vipId", example = "1")
-    private String vipId;
 }

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/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 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 '创建时间',