From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/service/IFileService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 03354a4..3012b38 100644
--- a/src/main/java/com/dji/sample/media/service/IFileService.java
+++ b/src/main/java/com/dji/sample/media/service/IFileService.java
@@ -9,6 +9,7 @@
import javax.servlet.http.HttpServletResponse;
import java.awt.*;
+import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.List;
@@ -37,13 +38,15 @@
* @return
*/
Integer saveFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
- void saveNailFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
- void saveZipFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
+ void saveFiles(String workspaceId, FileUploadDTO file,File mediaFile);
+// void saveNailFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
+
+// void saveZipFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException;
void updateNailMediaFileNames(String jobId);
PaginationData<MediaFileEntity> getJobId( int pageNum, int pageSize,String workspaceId);
PaginationData<MediaFileEntity> getPhotoByJobId(int page,int pageSize ,String workspaceId,String jobId);
-
+ PaginationData<MediaFileEntity> mediaQuerys(Integer page, Integer pageSize, String workspaceId );
/**
* 获取媒体文件状态
* @param fileId
@@ -59,6 +62,7 @@
*/
List<MediaFileDTO> getAllFilesByWorkspaceId(String workspaceId);
+ void saveMarkFile(String workspaceId, FileUploadDTO files, File file1);
PaginationData<MediaFileEntity> mediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName,String worksapceId,String isVedio,String jobId);
PaginationData<MediaFileNailEntity> mediaNailQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type);
@@ -119,4 +123,6 @@
Boolean updateMediaFile(String workspaceId, MediaFileEntity mediaFileEntity);
int deleteMedia(String workspaceId, String fileId);
+
+ void getNoaddFile();
}
--
Gitblit v1.9.3