From b5acf3799d5585e76be23aadecd43d16a59fa9da Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 16 Dec 2025 16:31:19 +0800
Subject: [PATCH] 2025-12-16 zwy 优化-保存定时任务时,判断时间为当前时间的10分钟之前的时间。否则失败

---
 ard-work/src/main/resources/mapper/ArdMediaMapper.xml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/ArdMediaMapper.xml b/ard-work/src/main/resources/mapper/ArdMediaMapper.xml
index f80f327..2548d11 100644
--- a/ard-work/src/main/resources/mapper/ArdMediaMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdMediaMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.ard.work.mapper.ArdMediaMapper">
 
     <!-- 结果映射 -->
-    <resultMap id="ArdMediaResult" type="com.ard.work.domain.entity.ArdMedia">
+    <resultMap id="ArdMediaResult" type="ArdMedia">
         <result property="id" column="id"/>
         <result property="taskId" column="task_id"/>
         <result property="mediaType" column="media_type"/>
@@ -15,6 +15,7 @@
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
         <result property="height" column="height"/>
+        <result property="thumbnailUrl" column="thumbnail_url"/>
         <result property="captureTime" column="capture_time"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
@@ -23,7 +24,7 @@
     <!-- 查询媒体列表:根据条件动态生成SQL -->
     <select id="selectArdMedia" resultMap="ArdMediaResult">
         SELECT
-        id, task_id, media_type, file_size, file_md5, media_url, source_url,
+        id, task_id, media_type, file_size, file_md5, media_url, source_url,thumbnail_url,
         photo_id, longitude, latitude, height, capture_time, create_time
         FROM ard_media
         <where>
@@ -33,6 +34,7 @@
             <if test="fileMd5 != null">AND file_md5 = #{fileMd5}</if>
             <if test="mediaUrl != null">AND media_url = #{mediaUrl}</if>
             <if test="sourceUrl != null">AND source_url = #{sourceUrl}</if>
+            <if test="thumbnailUrl != null">AND thumbnail_url = #{thumbnailUrl}</if>
             <if test="photoId != null">AND photo_id = #{photoId}</if>
             <if test="longitude != null">AND longitude = #{longitude}</if>
             <if test="latitude != null">AND latitude = #{latitude}</if>
@@ -40,7 +42,11 @@
             <if test="captureTime != null">AND capture_time = #{captureTime}</if>
             <if test="createTime != null">AND create_time = #{createTime}</if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY
+            CASE
+                WHEN media_type = 0 THEN capture_time
+                ELSE create_time
+            END DESC
     </select>
 
 
@@ -53,6 +59,7 @@
                file_md5,
                media_url,
                source_url,
+               thumbnail_url,
                photo_id,
                longitude,
                latitude,
@@ -71,6 +78,7 @@
                file_md5,
                media_url,
                source_url,
+               thumbnail_url,
                photo_id,
                longitude,
                latitude,
@@ -92,6 +100,7 @@
             <if test="fileMd5 != null">file_md5,</if>
             <if test="mediaUrl != null">media_url,</if>
             <if test="sourceUrl != null">source_url,</if>
+            <if test="thumbnailUrl != null">thumbnail_url,</if>
             <if test="photoId != null">photo_id,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
@@ -108,6 +117,7 @@
             <if test="fileMd5 != null">#{fileMd5},</if>
             <if test="mediaUrl != null">#{mediaUrl},</if>
             <if test="sourceUrl != null">#{sourceUrl},</if>
+            <if test="thumbnailUrl != null">#{thumbnailUrl},</if>
             <if test="photoId != null">#{photoId},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
@@ -126,6 +136,7 @@
         file_md5,
         media_url,
         source_url,
+        thumbnail_url,
         photo_id,
         longitude,
         latitude,
@@ -142,6 +153,7 @@
             #{item.fileMd5},
             #{item.mediaUrl},
             #{item.sourceUrl},
+            #{item.thumbnailUrl},
             #{item.photoId},
             #{item.longitude},
             #{item.latitude},

--
Gitblit v1.9.3