From 56cf48282b9fa39637fdcad9b445d2a2f81a61d9 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Jul 2024 15:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/service/IFileService.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/service/IFileService.java b/src/main/java/com/dji/sample/media/service/IFileService.java
index 41eb659..1dbcaf7 100644
--- a/src/main/java/com/dji/sample/media/service/IFileService.java
+++ b/src/main/java/com/dji/sample/media/service/IFileService.java
@@ -37,16 +37,7 @@
* @return
*/
Integer saveFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
-
- /**
- * 存储水印图片
- * @param workspaceId
- * @param file
- * @throws IOException
- * @throws FontFormatException
- * @throws ImageProcessingException
- */
- void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException;
+ void saveNailFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
void updateMarkMediaFileNames(String jobId);
PaginationData<MediaFileEntity> getJobId( int pageNum, int pageSize,String workspaceId);
PaginationData<MediaFileEntity> getPhotoByJobId(int page,int pageSize ,String workspaceId,String jobId);
@@ -104,7 +95,7 @@
*/
URL getObjectUrl(String workspaceId, String fileId);
- void downloadImages( String jobId, HttpServletResponse response);
+ ResponseResult downloadImages( List<String> jobIds);
/**
* Query all media files of a job.
@@ -115,6 +106,7 @@
*/
List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId);
+ List<String> getUniqueFilePaths(List<String> jobIds);
/**
* 更新文件
*
--
Gitblit v1.9.3