From 3430a3dd889ba51d06cbdb77014aa63d0a070e48 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 16 Aug 2024 16:38:08 +0800
Subject: [PATCH] 优化国土对接接口
---
src/main/java/com/dji/sample/media/service/IFileService.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 66b9e8e..94ff38b 100644
--- a/src/main/java/com/dji/sample/media/service/IFileService.java
+++ b/src/main/java/com/dji/sample/media/service/IFileService.java
@@ -3,13 +3,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
-import com.dji.sample.media.model.FileUploadDTO;
-import com.dji.sample.media.model.MediaFileDTO;
-import com.dji.sample.media.model.MediaFileEntity;
-import com.dji.sample.media.model.MediaFileQueryParam;
+import com.dji.sample.media.model.*;
import com.drew.imaging.ImageProcessingException;
+import org.springframework.web.bind.annotation.RequestParam;
+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,24 +37,23 @@
* @param file
* @return
*/
- Integer saveFile(String workspaceId, FileUploadDTO file);
+ 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 updateMarkMediaFileNames(String jobId);
+ void saveFiles(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 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
* @return
*/
Object mediaInfo(String fileId);
+ List<MediaFileEntity> getMedia(String jobId);
/**
* Query information about all files in this workspace based on the workspace id.
*
@@ -63,7 +62,10 @@
*/
List<MediaFileDTO> getAllFilesByWorkspaceId(String workspaceId);
- PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName,String worksapceId,String isVedio);
+ void saveMarkFile(String workspaceId, MediaFileEntity file, 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);
/**
* 获取图斑图片集合
* @param dkbh
@@ -99,6 +101,8 @@
*/
URL getObjectUrl(String workspaceId, String fileId);
+ ResponseResult downloadImages( List<String> jobIds);
+
/**
* Query all media files of a job.
*
@@ -108,6 +112,7 @@
*/
List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId);
+ List<String> getUniqueFilePaths(List<String> jobIds);
/**
* 更新文件
*
@@ -118,4 +123,6 @@
Boolean updateMediaFile(String workspaceId, MediaFileEntity mediaFileEntity);
int deleteMedia(String workspaceId, String fileId);
+
+ void getNoaddFile();
}
--
Gitblit v1.9.3