From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密

---
 src/main/java/com/dji/sample/media/dao/IFileMapper.xml |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 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 d9fd9a0..7062db7 100644
--- a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
+++ b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
@@ -42,7 +42,8 @@
             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' GROUP BY job_id) t ON t.job_id = m.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' GROUP BY job_id) t ON t.job_id = m.job_id
+        LEFT JOIN (SELECT CONCAT(#{param.fileAddress},object_key) as url,job_id from media_file WHERE file_name LIKE '%.jpeg' GROUP BY job_id) 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 != ''">
@@ -58,23 +59,21 @@
         <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
+        ORDER BY
+        <if test="param.sort eq 2">j.collect_status = 1 desc,</if>
+        <if test="param.sort eq 3">m.collect_status = 1 desc,</if>
+        j.create_time desc
     </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,
+            CONCAT(#{fileAddress},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
@@ -84,5 +83,14 @@
         <if test="jobId != null and jobId != ''">
             and m.job_id = #{jobId}
         </if>
+        ORDER BY type = '视频' DESC
+    </select>
+
+    <select id="getMediaFieByTid" resultType="com.dji.sample.media.model.MediaFileEntity">
+        SELECT *
+        FROM media_file
+        WHERE CAST(JSON_EXTRACT(metadata, '$.createdTime') AS UNSIGNED) >= #{timestamp}
+        ORDER BY CAST(JSON_EXTRACT(metadata, '$.createdTime') / 1000 AS UNSIGNED) ASC
+            LIMIT 1;
     </select>
 </mapper>

--
Gitblit v1.9.3