From d5616f37094de90159f26e908a52dd026c47b69a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 05 Feb 2026 14:08:44 +0800
Subject: [PATCH] 2026-02-04 增加对/minioTransfer/**路径的 Token 不解析，直接放行
---
ard-work/src/main/resources/mapper/ArdMediaPicMapper.xml | 100 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdMediaPicMapper.xml b/ard-work/src/main/resources/mapper/ArdMediaPicMapper.xml
index cba6580..986ade0 100644
--- a/ard-work/src/main/resources/mapper/ArdMediaPicMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdMediaPicMapper.xml
@@ -18,42 +18,27 @@
<result property="captureTime" column="capture_time"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
+ <result property="syncStatus" column="sync_status"/>
</resultMap>
<!-- 查询图片列表 -->
<select id="selectPicList" resultMap="ArdMediaPicResult">
- SELECT
- id, task_id, file_size, file_md5, media_url, source_url,
- longitude, latitude, height, capture_time, create_time, update_time
+ SELECT *
FROM ard_media_pic
<where>
<if test="taskId != null">AND task_id = #{taskId}</if>
- <if test="fileMd5 != null">AND file_md5 = #{fileMd5}</if>
+ <if test="syncStatus != null">AND sync_status = #{syncStatus}</if>
</where>
ORDER BY capture_time DESC
</select>
- <!-- 查询 media_url为 NULL 的视频 -->
- <select id="selectPicsWithNullMedia" resultMap="ArdMediaPicResult">
- SELECT
- id,
- task_id,
- file_size,
- file_md5,
- media_url,
- source_url,
- longitude,
- latitude,
- height,
- capture_time,
- create_time,
- update_time
- FROM
- ard_media_pic
- WHERE
- media_url IS NULL
- ORDER BY
- capture_time ASC
+ <!-- 查询待处理的图片 -->
+ <select id="selectPendingPics" resultMap="ArdMediaPicResult">
+ SELECT *
+ FROM ard_media_pic
+ WHERE sync_status = 0
+ ORDER BY id LIMIT #{limit}
</select>
+
<!-- 根据任务ID查询图片 -->
<select id="selectPicByTaskId" resultMap="ArdMediaPicResult">
SELECT * FROM ard_media_pic WHERE task_id = #{taskId}
@@ -66,41 +51,58 @@
id, task_id, file_size, file_md5,
media_url, source_url,
longitude, latitude, height,
- capture_time, create_time
+ capture_time, create_time,sync_status
) VALUES (
#{id}, #{taskId}, #{fileSize}, #{fileMd5},
#{mediaUrl}, #{sourceUrl},
#{longitude}, #{latitude}, #{height},
- #{captureTime}, #{createTime}
+ #{captureTime}, #{createTime},0
)
</insert>
- <!-- 更新图片 -->
+
+ <!-- 更新图片（按需补全字段） -->
<update id="updatePic" parameterType="ArdMediaPic">
UPDATE ard_media_pic
- SET
- media_url = #{mediaUrl},
+ <set>
+ <if test="mediaUrl != null">
+ media_url = #{mediaUrl},
+ </if>
+ <if test="fileSize != null">
+ file_size = #{fileSize},
+ </if>
+ <if test="fileMd5 != null">
+ file_md5 = #{fileMd5},
+ </if>
+ <if test="captureTime != null">
+ capture_time = #{captureTime},
+ </if>
+ <if test="longitude != null">
+ longitude = #{longitude},
+ </if>
+ <if test="latitude != null">
+ latitude = #{latitude},
+ </if>
+ <if test="height != null">
+ height = #{height},
+ </if>
+ <if test="syncStatus != null">
+ sync_status = #{syncStatus},
+ </if>
update_time = #{updateTime}
- WHERE id = #{id} AND media_url IS NULL
+ </set>
+ WHERE id = #{id}
</update>
- <!-- 批量插入图片 -->
- <insert id="insertPicList">
- INSERT INTO ard_media_pic (
- id, task_id, file_size, file_md5,
- media_url, source_url,
- longitude, latitude, height,
- capture_time, create_time
- )
- VALUES
- <foreach collection="list" item="item" separator=",">
- (
- #{item.id}, #{item.taskId}, #{item.fileSize}, #{item.fileMd5},
- #{item.mediaUrl}, #{item.sourceUrl},
- #{item.longitude}, #{item.latitude}, #{item.height},
- #{item.captureTime}, #{item.createTime}
- )
- </foreach>
- </insert>
+ <!-- 标记为处理中 -->
+ <update id="markProcessing">
+ UPDATE ard_media_pic SET sync_status = 1 WHERE id = #{id} AND sync_status = 0
+ </update>
+ <!-- 更新同步状态 -->
+ <update id="updateSyncStatus">
+ UPDATE ard_media_pic
+ SET sync_status = #{status},update_time = NOW()
+ WHERE id = #{id}
+ </update>
<delete id="deletePicById">
DELETE FROM ard_media_pic WHERE id = #{id}
--
Gitblit v1.9.3