From 68f80a7451a126335153ec00bb6cb520a5ae1f8d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:02:45 +0800
Subject: [PATCH] 定时任务逻辑修改

---
 src/main/java/com/dji/sample/media/dao/IFileMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
index 0b6ed2e..5528d10 100644
--- a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
+++ b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
@@ -36,11 +36,14 @@
         SELECT
             j.collect_status,
             m.job_id,
+            t.url,
             COUNT( CASE WHEN m.file_name LIKE '%.mp4' THEN 1 END) AS videoCount,
             COUNT( CASE WHEN m.file_name LIKE '%.jpeg' THEN 1 END ) AS picCount,
             DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') as create_time
         FROM
             media_file m LEFT JOIN wayline_job j ON m.job_id = j.job_id
+        LEFT JOIN (SELECT CONCAT("https://dev.jxpskj.com:8026/cloud-bucket",object_key) as url,job_id from media_file WHERE file_name LIKE '%.jpeg') t ON t.job_id = m.job_id
+        LEFT JOIN wayline_file w ON w.wayline_id = j.file_id
         where 1=1
         <if test="workspaceId != null and workspaceId != ''">
             and j.workspace_id = #{workspaceId}
@@ -55,11 +58,14 @@
         <if test="param.endTime !=null and param.endTime !=null">
             AND DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d')   &lt;= DATE_FORMAT(#{param.endTime},'%Y-%m-%d')
         </if>
-        <if test="param.sort != null and param.sort = 2">
+        <if test="param.sort eq 2">
             and j.collect_status = 1
         </if>
-        <if test="param.sort != null and param.sort = 3">
+        <if test="param.sort eq 3">
             and m.collect_status = 1
+        </if>
+        <if test="param.waylineFileId != null and param.waylineFileId != ''">
+            and w.wayline_id = #{param.waylineFileId}
         </if>
         GROUP BY m.job_id
     </select>
@@ -68,7 +74,7 @@
             m.collect_status,
             m.job_id,
             m.file_id,
-            m.file_path as url,
+            CONCAT("https://dev.jxpskj.com:8026/cloud-bucket",m.object_key) as url,
             CASE WHEN m.file_name LIKE '%.mp4' THEN "视频" ELSE "图片" END  AS type,
             DATE_FORMAT( FROM_UNIXTIME( m.create_time / 1000, '%Y-%m-%d' ), '%Y-%m-%d' ) AS create_time
         FROM

--
Gitblit v1.9.3