From b35dd737c03ee80d45753939ade49a59f556197f Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 22 May 2024 16:45:41 +0800
Subject: [PATCH] 航线问题修复，水印格式修改，图斑图片加水印
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
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..1ac5b12 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,11 +27,14 @@
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;
import org.springframework.web.bind.annotation.RequestParam;
+import java.awt.*;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -71,6 +74,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);
@@ -79,6 +86,9 @@
@Override
public Integer saveMediaFile(String workspaceId, FileUploadDTO file) {
return fileService.saveFile(workspaceId, file);
+ }
+ public Integer saveMediaMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException {
+ return fileService.saveMarkFile(workspaceId, file);
}
@Override
@@ -101,13 +111,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));
}
@@ -146,7 +157,7 @@
log.error("保存文件到数据库失败，请手动检查数据；Failed to save the file to the database, please check the data manually.");
return null;
}
- } else if (!StringUtils.isEmpty(jobId)) { //一键起飞操作需要上传文件
+ } else if (!StringUtils.isEmpty(jobId)) { //一键起飞操作需要
WaylineJobDTO waylineJobDTO = new WaylineJobDTO();
waylineJobDTO.setWorkspaceId(device.getWorkspaceId());
waylineJobDTO.setDockSn(device.getDeviceSn());
--
Gitblit v1.9.3