From f6d6a639774c415ef3df2b31467fe8bbc0711b3e Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Thu, 20 Nov 2025 10:47:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(puzzle):=20=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E4=BA=BA=E8=84=B8ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将查询条件从 orderId 更改为 faceId - 更新 Mapper 接口方法名和参数 - 修改 XML 映射文件中的字段和查询条件 - 调整插入记录时使用的字段名称 - 更新基础列定义以反映新的字段结构 --- .../controller/PuzzleGenerateController.java | 4 ++-- .../basic/puzzle/dto/PuzzleGenerateRequest.java | 5 ----- .../entity/PuzzleGenerationRecordEntity.java | 6 +++--- .../mapper/PuzzleGenerationRecordMapper.java | 4 ++-- .../mapper/PuzzleGenerationRecordMapper.xml | 14 +++++++------- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ycwl/basic/puzzle/controller/PuzzleGenerateController.java b/src/main/java/com/ycwl/basic/puzzle/controller/PuzzleGenerateController.java index d40de0b0..c23b08cd 100644 --- a/src/main/java/com/ycwl/basic/puzzle/controller/PuzzleGenerateController.java +++ b/src/main/java/com/ycwl/basic/puzzle/controller/PuzzleGenerateController.java @@ -27,8 +27,8 @@ public class PuzzleGenerateController { */ @PostMapping("/generate") public ApiResponse generatePuzzle(@RequestBody PuzzleGenerateRequest request) { - log.info("拼图生成请求: templateCode={}, userId={}, orderId={}", - request.getTemplateCode(), request.getUserId(), request.getOrderId()); + log.info("拼图生成请求: templateCode={}, userId={}, faceId={}", + request.getTemplateCode(), request.getUserId(), request.getFaceId()); // 参数校验 if (request.getTemplateCode() == null || request.getTemplateCode().trim().isEmpty()) { diff --git a/src/main/java/com/ycwl/basic/puzzle/dto/PuzzleGenerateRequest.java b/src/main/java/com/ycwl/basic/puzzle/dto/PuzzleGenerateRequest.java index 2f9328d3..edb83fab 100644 --- a/src/main/java/com/ycwl/basic/puzzle/dto/PuzzleGenerateRequest.java +++ b/src/main/java/com/ycwl/basic/puzzle/dto/PuzzleGenerateRequest.java @@ -23,11 +23,6 @@ public class PuzzleGenerateRequest { */ private Long userId; - /** - * 订单ID（可选） - */ - private String orderId; - /** * 业务类型（可选） */ diff --git a/src/main/java/com/ycwl/basic/puzzle/entity/PuzzleGenerationRecordEntity.java b/src/main/java/com/ycwl/basic/puzzle/entity/PuzzleGenerationRecordEntity.java index 76402f1c..152b14ec 100644 --- a/src/main/java/com/ycwl/basic/puzzle/entity/PuzzleGenerationRecordEntity.java +++ b/src/main/java/com/ycwl/basic/puzzle/entity/PuzzleGenerationRecordEntity.java @@ -44,10 +44,10 @@ public class PuzzleGenerationRecordEntity { private Long userId; /** - * 关联订单号 + * 人脸ID（用于关联素材和追溯） */ - @TableField("order_id") - private String orderId; + @TableField("face_id") + private Long faceId; /** * 业务类型（如：order-订单 ticket-门票 certificate-证书） diff --git a/src/main/java/com/ycwl/basic/puzzle/mapper/PuzzleGenerationRecordMapper.java b/src/main/java/com/ycwl/basic/puzzle/mapper/PuzzleGenerationRecordMapper.java index 3e045b3e..314df102 100644 --- a/src/main/java/com/ycwl/basic/puzzle/mapper/PuzzleGenerationRecordMapper.java +++ b/src/main/java/com/ycwl/basic/puzzle/mapper/PuzzleGenerationRecordMapper.java @@ -27,9 +27,9 @@ public interface PuzzleGenerationRecordMapper { @Param("limit") Integer limit); /** - * 查询订单的生成记录列表 + * 查询人脸ID的生成记录列表 */ - List listByOrderId(@Param("orderId") String orderId); + List listByFaceId(@Param("faceId") Long faceId); /** * 插入记录 diff --git a/src/main/resources/mapper/PuzzleGenerationRecordMapper.xml b/src/main/resources/mapper/PuzzleGenerationRecordMapper.xml index 80c363bc..595848c8 100644 --- a/src/main/resources/mapper/PuzzleGenerationRecordMapper.xml +++ b/src/main/resources/mapper/PuzzleGenerationRecordMapper.xml @@ -9,7 +9,7 @@ - + @@ -29,7 +29,7 @@ - id, template_id, template_code, user_id, order_id, business_type, + id, template_id, template_code, user_id, face_id, business_type, generation_params, result_image_url, result_file_size, result_width, result_height, status, error_message, generation_duration, retry_count, scenic_id, client_ip, user_agent, create_time, update_time @@ -54,11 +54,11 @@ - - SELECT FROM puzzle_generation_record - WHERE order_id = #{orderId} + WHERE face_id = #{faceId} ORDER BY create_time DESC @@ -66,12 +66,12 @@ INSERT INTO puzzle_generation_record ( - template_id, template_code, user_id, order_id, business_type, + template_id, template_code, user_id, face_id, business_type, generation_params, result_image_url, result_file_size, result_width, result_height, status, error_message, generation_duration, retry_count, scenic_id, client_ip, user_agent, create_time, update_time ) VALUES ( - #{templateId}, #{templateCode}, #{userId}, #{orderId}, #{businessType}, + #{templateId}, #{templateCode}, #{userId}, #{faceId}, #{businessType}, #{generationParams}, #{resultImageUrl}, #{resultFileSize}, #{resultWidth}, #{resultHeight}, #{status}, #{errorMessage}, #{generationDuration}, #{retryCount}, #{scenicId}, #{clientIp}, #{userAgent}, NOW(), NOW()