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 +++--
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 8 +++++++-
src/main/java/com/dji/sample/media/model/param/SearchMediaParam.java | 1 +
src/main/java/com/dji/sample/media/dao/IFileMapper.java | 2 +-
src/main/resources/application.yml | 3 ++-
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/dao/IFileMapper.java b/src/main/java/com/dji/sample/media/dao/IFileMapper.java
index 81beb14..d1e773f 100644
--- a/src/main/java/com/dji/sample/media/dao/IFileMapper.java
+++ b/src/main/java/com/dji/sample/media/dao/IFileMapper.java
@@ -21,5 +21,5 @@
Page<MediaJobDTO> mediaPage(@Param("page") Page<MediaJobDTO> mediaFileEntityPage, @Param("workspaceId") String workspaceId, @Param("param") SearchMediaParam param);
- Page<MediaJobDTO> mediaDetail(Page<MediaJobDTO> mediaJobDTOPage, @Param("jobId") String jobId);
+ Page<MediaJobDTO> mediaDetail(Page<MediaJobDTO> mediaJobDTOPage, @Param("jobId") String jobId, @Param("fileAddress") String fileAddress);
}
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
diff --git a/src/main/java/com/dji/sample/media/model/param/SearchMediaParam.java b/src/main/java/com/dji/sample/media/model/param/SearchMediaParam.java
index 3c08b6b..43e1942 100644
--- a/src/main/java/com/dji/sample/media/model/param/SearchMediaParam.java
+++ b/src/main/java/com/dji/sample/media/model/param/SearchMediaParam.java
@@ -13,4 +13,5 @@
private Long page;
private Long pageSize;
private String dockSn;
+ private String fileAddress;
}
diff --git a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
index 81996a8..bbbf66f 100644
--- a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
@@ -27,6 +27,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.MessageHeaders;
import org.springframework.stereotype.Service;
@@ -71,6 +72,10 @@
@Autowired
private IFileMapper mapper;
+ @Value("${oss.out-net-file-address}")
+ private String fileAddress;
+ @Value("${oss.bucket}")
+ private String bucket;
@Override
public Boolean fastUpload(String workspaceId, String fingerprint) {
return fileService.checkExist(workspaceId, fingerprint);
@@ -101,13 +106,14 @@
@Override
public PaginationData<MediaJobDTO> mediaPage(String workspaceId, SearchMediaParam param) {
+ param.setFileAddress(fileAddress+"/"+bucket);
Page<MediaJobDTO> waylineJobDTOPage = mapper.mediaPage(new Page<MediaJobDTO>(param.getPage(), param.getPageSize()), workspaceId, param);
return new PaginationData<MediaJobDTO>(waylineJobDTOPage.getRecords(), new Pagination(waylineJobDTOPage));
}
@Override
public PaginationData<MediaJobDTO> mediaDetail( String jobId,Long page, Long pageSize) {
- Page<MediaJobDTO> waylineJobDTOPage = mapper.mediaDetail(new Page<MediaJobDTO>(page, pageSize), jobId);
+ Page<MediaJobDTO> waylineJobDTOPage = mapper.mediaDetail(new Page<MediaJobDTO>(page, pageSize), jobId,fileAddress+"/"+bucket);
return new PaginationData<MediaJobDTO>(waylineJobDTOPage.getRecords(), new Pagination(waylineJobDTOPage));
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c3b268d..520093d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -39,7 +39,7 @@
max-request-size: 2GB
# rabbitmq:
# host: 182.106.212.58
-# port: 25672
+# port: 35672
# username: root
# password: root
# virtualHost: /
@@ -142,6 +142,7 @@
expire: 3600
region: us-east-1
object-dir-prefix:
+ out-net-file-address: http://171.34.76.171:8880/drone/file
logging:
level:
--
Gitblit v1.9.3