From 3f6c77f511e0037e1b7e595ddfb56d54092f0222 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 27 Nov 2023 11:47:22 +0800
Subject: [PATCH] 无人机 -文件地址修改

---
 src/main/java/com/dji/sample/media/dao/IFileMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 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 b63de38..3d6ff33 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 != ''">
@@ -72,7 +73,7 @@
             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

--
Gitblit v1.9.3