From 2caa210098644f51ff46daa33b87ce4b7f862a91 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 10:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htxx_dev' into htxx_dev

---
 src/main/java/com/dji/sample/media/dao/IFileMapper.xml |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 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 cd40598..5528d10 100644
--- a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
+++ b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
@@ -32,4 +32,57 @@
         ORDER BY create_time DESC
 
     </select>
+    <select id="mediaPage" resultType="com.dji.sample.media.model.MediaJobDTO">
+        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}
+        </if>
+        <if test="param.dockSn !=null and param.dockSn != ''">
+            and j.dock_sn = #{param.dockSn}
+        </if>
+        <if test="param.startTime !=null and param.endTime !=null">
+            AND DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d')  &gt;=  DATE_FORMAT(#{param.startTime},'%Y-%m-%d')
+        </if>
+
+        <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 eq 2">
+            and j.collect_status = 1
+        </if>
+        <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>
+    <select id="mediaDetail" resultType="com.dji.sample.media.model.MediaJobDTO">
+        SELECT
+            m.collect_status,
+            m.job_id,
+            m.file_id,
+            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
+            media_file m
+        WHERE
+            1 = 1
+        <if test="jobId != null and jobId != ''">
+            and m.job_id = #{jobId}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3