You've already forked FrameTour-BE
feat(puzzle): 修改生成记录查询逻辑以支持人脸ID
- 将查询条件从 orderId 更改为 faceId - 更新 Mapper 接口方法名和参数 - 修改 XML 映射文件中的字段和查询条件 - 调整插入记录时使用的字段名称 - 更新基础列定义以反映新的字段结构
This commit is contained in:
@@ -27,8 +27,8 @@ public class PuzzleGenerateController {
|
|||||||
*/
|
*/
|
||||||
@PostMapping("/generate")
|
@PostMapping("/generate")
|
||||||
public ApiResponse<PuzzleGenerateResponse> generatePuzzle(@RequestBody PuzzleGenerateRequest request) {
|
public ApiResponse<PuzzleGenerateResponse> generatePuzzle(@RequestBody PuzzleGenerateRequest request) {
|
||||||
log.info("拼图生成请求: templateCode={}, userId={}, orderId={}",
|
log.info("拼图生成请求: templateCode={}, userId={}, faceId={}",
|
||||||
request.getTemplateCode(), request.getUserId(), request.getOrderId());
|
request.getTemplateCode(), request.getUserId(), request.getFaceId());
|
||||||
|
|
||||||
// 参数校验
|
// 参数校验
|
||||||
if (request.getTemplateCode() == null || request.getTemplateCode().trim().isEmpty()) {
|
if (request.getTemplateCode() == null || request.getTemplateCode().trim().isEmpty()) {
|
||||||
|
|||||||
@@ -23,11 +23,6 @@ public class PuzzleGenerateRequest {
|
|||||||
*/
|
*/
|
||||||
private Long userId;
|
private Long userId;
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单ID(可选)
|
|
||||||
*/
|
|
||||||
private String orderId;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 业务类型(可选)
|
* 业务类型(可选)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -44,10 +44,10 @@ public class PuzzleGenerationRecordEntity {
|
|||||||
private Long userId;
|
private Long userId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 关联订单号
|
* 人脸ID(用于关联素材和追溯)
|
||||||
*/
|
*/
|
||||||
@TableField("order_id")
|
@TableField("face_id")
|
||||||
private String orderId;
|
private Long faceId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 业务类型(如:order-订单 ticket-门票 certificate-证书)
|
* 业务类型(如:order-订单 ticket-门票 certificate-证书)
|
||||||
|
|||||||
@@ -27,9 +27,9 @@ public interface PuzzleGenerationRecordMapper {
|
|||||||
@Param("limit") Integer limit);
|
@Param("limit") Integer limit);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询订单的生成记录列表
|
* 查询人脸ID的生成记录列表
|
||||||
*/
|
*/
|
||||||
List<PuzzleGenerationRecordEntity> listByOrderId(@Param("orderId") String orderId);
|
List<PuzzleGenerationRecordEntity> listByFaceId(@Param("faceId") Long faceId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 插入记录
|
* 插入记录
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<result column="template_id" property="templateId"/>
|
<result column="template_id" property="templateId"/>
|
||||||
<result column="template_code" property="templateCode"/>
|
<result column="template_code" property="templateCode"/>
|
||||||
<result column="user_id" property="userId"/>
|
<result column="user_id" property="userId"/>
|
||||||
<result column="order_id" property="orderId"/>
|
<result column="face_id" property="faceId"/>
|
||||||
<result column="business_type" property="businessType"/>
|
<result column="business_type" property="businessType"/>
|
||||||
<result column="generation_params" property="generationParams"/>
|
<result column="generation_params" property="generationParams"/>
|
||||||
<result column="result_image_url" property="resultImageUrl"/>
|
<result column="result_image_url" property="resultImageUrl"/>
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
<!-- 基础列 -->
|
<!-- 基础列 -->
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
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,
|
generation_params, result_image_url, result_file_size, result_width, result_height,
|
||||||
status, error_message, generation_duration, retry_count,
|
status, error_message, generation_duration, retry_count,
|
||||||
scenic_id, client_ip, user_agent, create_time, update_time
|
scenic_id, client_ip, user_agent, create_time, update_time
|
||||||
@@ -54,11 +54,11 @@
|
|||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 查询订单的生成记录列表 -->
|
<!-- 查询人脸ID的生成记录列表 -->
|
||||||
<select id="listByOrderId" resultMap="BaseResultMap">
|
<select id="listByFaceId" resultMap="BaseResultMap">
|
||||||
SELECT <include refid="Base_Column_List"/>
|
SELECT <include refid="Base_Column_List"/>
|
||||||
FROM puzzle_generation_record
|
FROM puzzle_generation_record
|
||||||
WHERE order_id = #{orderId}
|
WHERE face_id = #{faceId}
|
||||||
ORDER BY create_time DESC
|
ORDER BY create_time DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
@@ -66,12 +66,12 @@
|
|||||||
<insert id="insert" parameterType="com.ycwl.basic.puzzle.entity.PuzzleGenerationRecordEntity"
|
<insert id="insert" parameterType="com.ycwl.basic.puzzle.entity.PuzzleGenerationRecordEntity"
|
||||||
useGeneratedKeys="true" keyProperty="id">
|
useGeneratedKeys="true" keyProperty="id">
|
||||||
INSERT INTO puzzle_generation_record (
|
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,
|
generation_params, result_image_url, result_file_size, result_width, result_height,
|
||||||
status, error_message, generation_duration, retry_count,
|
status, error_message, generation_duration, retry_count,
|
||||||
scenic_id, client_ip, user_agent, create_time, update_time
|
scenic_id, client_ip, user_agent, create_time, update_time
|
||||||
) VALUES (
|
) VALUES (
|
||||||
#{templateId}, #{templateCode}, #{userId}, #{orderId}, #{businessType},
|
#{templateId}, #{templateCode}, #{userId}, #{faceId}, #{businessType},
|
||||||
#{generationParams}, #{resultImageUrl}, #{resultFileSize}, #{resultWidth}, #{resultHeight},
|
#{generationParams}, #{resultImageUrl}, #{resultFileSize}, #{resultWidth}, #{resultHeight},
|
||||||
#{status}, #{errorMessage}, #{generationDuration}, #{retryCount},
|
#{status}, #{errorMessage}, #{generationDuration}, #{retryCount},
|
||||||
#{scenicId}, #{clientIp}, #{userAgent}, NOW(), NOW()
|
#{scenicId}, #{clientIp}, #{userAgent}, NOW(), NOW()
|
||||||
|
|||||||
Reference in New Issue
Block a user