From dbecdea3ad1768d1c7f8e88a2d3b64193c62352a Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 12 Aug 2024 13:34:52 +0800
Subject: [PATCH] 国土调查的任务下发、更新、取消，成果上传
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 429 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 307 insertions(+), 122 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
index 8233451..358e53d 100644
--- a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
@@ -19,6 +19,7 @@
import com.dji.sample.media.dao.IFileMapper;
import com.dji.sample.media.dao.IMarkMapper;
import com.dji.sample.media.dao.INailMapper;
+import com.dji.sample.media.dao.IZipMapper;
import com.dji.sample.media.model.*;
import com.dji.sample.media.service.IFileService;
import com.dji.sample.media.util.ImgUtil;
@@ -55,6 +56,8 @@
import java.time.ZoneId;
import java.util.*;
import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import static com.dji.sample.media.util.ImageDownloaderAndCompressor.*;
@@ -74,6 +77,8 @@
private IMarkMapper markMapper;
@Autowired
private INailMapper nailMapper;
+ @Autowired
+ private IZipMapper zipMapper;
@Autowired
private GetPatchesMapper patchesMapper;
@Autowired
@@ -112,48 +117,81 @@
}
@Override
- public Integer saveFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
+ public Integer saveFile(String workspaceId, FileUploadDTO file) {
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
- int count = mapper.insert(fileEntity);
- String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
- if (file.getObjectKey().endsWith(".jpeg")) {
- File file1 = TbFjServiceImpl.downloadFile(url);
- Object data = ImgUtil.getInfo(file1);
- fileEntity.setDroneData(data);
- saveNailFile(workspaceId, file, file1,data);
- count = mapper.insert(fileEntity);
- file1.delete();
- }
- if (file.getObjectKey().endsWith(".mp4")) {
- saveNailFile(workspaceId, file, null,null);
- }
- return count;
+ return mapper.insert(fileEntity);
}
-
- public void saveNailFile(String workspaceId, FileUploadDTO file, File file1,Object data) throws IOException {
+ public void saveFiles(String workspaceId, FileUploadDTO file) {
+ // 更新文件状态
updateStatue(file.getName());
- boolean endsWith = file.getObjectKey().endsWith(".mp4");
- if (endsWith) {
- MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity((file));
- nailEntity.setWorkspaceId(workspaceId);
- nailEntity.setFileId(UUID.randomUUID().toString());
- nailMapper.insert(nailEntity);
- } else {
- File nailFile = new File(ImgZipUtil.compressImage(file1, 50).toURI());
- MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity(file);
- nailEntity.setIsOriginal(false);
- nailEntity.setDronedata(data);
- nailEntity.setWorkspaceId(workspaceId);
- nailEntity.setFileName("nail" + file.getName());
- nailEntity.setObjectKey("/nail" + file.getPath() + "/" + file.getName());
- nailEntity.setFilePath("nail" + file.getPath());
- String nailName = nailEntity.getObjectKey();
- nailEntity.setFileId(UUID.randomUUID().toString());
- uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), nailName, nailFile, "image/jpeg");
- uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", nailName, nailFile, "image/jpeg");
- nailMapper.insert(nailEntity);
+
+ // 使用 CompletableFuture 异步执行
+ CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+ try {
+ // 下载文件
+ boolean endsWithMp4 = file.getObjectKey().endsWith(".mp4");
+
+ if (endsWithMp4) {
+ // 处理视频文件
+ MediaFileZipEntity zipEntity = this.fileUploadConvertToZipEntity(file);
+ zipEntity.setWorkspaceId(workspaceId);
+ zipEntity.setFileId(UUID.randomUUID().toString());
+ zipMapper.insert(zipEntity);
+
+ // 处理视频文件的其他逻辑（如果有）
+ } else {
+ // 处理图片文件
+ String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
+ File downloadedFile = TbFjServiceImpl.downloadFile(url);
+ File nailFile = new File(ImgZipUtil.compressImage(downloadedFile, 50).toURI());
+ MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity(file);
+ Object data = ImgUtil.getInfo(downloadedFile);
+ nailEntity.setIsadd(0);
+ nailEntity.setIsOriginal(false);
+ nailEntity.setDronedata(data);
+ nailEntity.setWorkspaceId(workspaceId);
+ nailEntity.setFileName("nail" + file.getName());
+ nailEntity.setObjectKey("/nail" + file.getPath() + "/" + file.getName());
+ nailEntity.setFilePath("nail" + file.getPath());
+ String nailName = nailEntity.getObjectKey();
+ nailEntity.setFileId(UUID.randomUUID().toString());
+
+ // 上传图片文件
+// uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", file.getObjectKey(), downloadedFile, "image/jpeg");
+ uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), nailName, nailFile, "image/jpeg");
+// uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", nailName, nailFile, "image/jpeg");
+ nailMapper.insert(nailEntity);
+
+ // 处理压缩后的图片文件（如果有）
+ File zipFile = new File(ImgZipUtil.compressImageAndGetFile(downloadedFile, 0.5f).toURI());
+ MediaFileZipEntity zipEntity = this.fileUploadConvertToZipEntity(file);
+ zipEntity.setIsOriginal(false);
+ zipEntity.setWorkspaceId(workspaceId);
+ zipEntity.setFileName("zip" + file.getName());
+ zipEntity.setObjectKey("/zip" + file.getPath() + "/" + file.getName());
+ zipEntity.setFilePath("zip" + file.getPath());
+ String zipName = zipEntity.getObjectKey();
+ zipEntity.setFileId(UUID.randomUUID().toString());
+
+ // 上传压缩文件
+ uploadFile(pojo.getEndpoint(), pojo.getAccessKey(), pojo.getSecretKey(), pojo.getBucket(), zipName, zipFile, "image/jpeg");
+// uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", zipName, zipFile, "image/jpeg");
+ zipMapper.insert(zipEntity);
+ }
+ } catch (IOException | ImageProcessingException e) {
+ // 处理异常
+ e.printStackTrace();
+ }
+ });
+
+ // 等待异步任务完成
+ try {
+ future.get();
+ } catch (InterruptedException | ExecutionException e) {
+ Thread.currentThread().interrupt();
+ // 处理异步任务的中断和异常
}
}
@@ -195,11 +233,20 @@
return markEntity.getDronedata();
}
}
+ } else {
+ String names = "nail" + filename;
+ List<MediaFileNailEntity> entities = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>()
+ .eq(MediaFileNailEntity::getFileName, names));
+ if (entities != null && !entities.isEmpty()) {
+ for (MediaFileNailEntity NailEntity : entities) {
+ if (NailEntity.getDronedata() != null) {
+ return NailEntity.getDronedata();
+ }
+ }
+ }
}
-
return "null";
}
-
@Override
public List<MediaFileDTO> getAllFilesByWorkspaceId(String workspaceId) {
@@ -211,7 +258,7 @@
}
@Override
- public PaginationData<MediaFileEntity> mediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
+ public PaginationData<MediaFileEntity> mediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type,String jobId) {
// 创建查询条件对象
LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
@@ -232,6 +279,9 @@
return new PaginationData<>(Collections.emptyList(), new Pagination(new Page<>(page, pageSize)));
}
queryWrapper.in(MediaFileEntity::getJobId, jobIds);
+ }
+ if (jobId != null && !jobId.isEmpty()) {
+ queryWrapper.eq(MediaFileEntity::getJobId,jobId);
}
if (type != null && !type.isEmpty()) {
@@ -255,6 +305,47 @@
mediaFile.setJobName(taskNameResult);
})
.filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getFileName(), mediaFile) == null)
+ .collect(Collectors.toList());
+
+ // 计算分页信息
+ int total = uniqueResults.size();
+ int start = (page - 1) * pageSize;
+ int end = Math.min(start + pageSize, total);
+
+ // 获取当前页的结果
+ List<MediaFileEntity> pageResults = uniqueResults.subList(start, end);
+
+ // 创建临时的 Page 对象
+ Page<MediaFileEntity> resultPage = new Page<>(page, pageSize);
+ resultPage.setRecords(pageResults);
+ resultPage.setTotal(total);
+
+ // 返回分页数据
+ return new PaginationData<>(pageResults, new Pagination(resultPage));
+ }
+
+ @Override
+ public PaginationData<MediaFileEntity> mediaQuerys(Integer page, Integer pageSize, String workspaceId) {
+ // 创建查询条件对象
+ LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
+
+ // 添加查询条件
+ queryWrapper.eq(MediaFileEntity::getWorkspaceId, workspaceId);
+
+
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
+
+ // 执行查询获取所有结果
+ List<MediaFileEntity> allResults = mapper.selectList(queryWrapper);
+
+ // 处理结果去重并设置任务名称
+ Map<String, MediaFileEntity> uniqueFileMap = new LinkedHashMap<>();
+ List<MediaFileEntity> uniqueResults = allResults.stream()
+ .peek(mediaFile -> {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ })
+ .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getJobId(), mediaFile) == null)
.collect(Collectors.toList());
// 计算分页信息
@@ -421,18 +512,19 @@
@Override
public ResponseResult downloadImages(List<String> jobIds) {
+ String localSaveDir = "/home/drone/web/zip";
+ String downPath="https://wrj.shuixiongit.com/downloadZip/";
+ String filepath=TimerUtil.getNowDay()+".zip";
try {
- String bucketPath = "/data/software/minio-data/cloud-bucket/";
- // List<String> prefixes = getUniqueFilePaths(jobIds);
+ String bucketPath = "/data/software/minio-data/cloud-bucket";
+ List<String> prefixes = getUniqueFilePaths(jobIds);
MinioFileDownloader downloader = new MinioFileDownloader(bucketPath);
- // 下载并压缩文件到本地目录
- String localSaveDir = "/data/software/minio-data/zip-bucket/"; // 修改为你想保存的本地目录
- downloader.downloadAndZipFolders(jobIds, localSaveDir);
+ downloader.downloadAndZipFolders(prefixes, localSaveDir,filepath);
} catch (Exception e) {
e.printStackTrace();
return ResponseResult.error("下载失败" + e.getMessage());
}
- return ResponseResult.success("下载成功");
+ return ResponseResult.success(downPath+filepath);
}
@Override
@@ -503,16 +595,16 @@
return builder.build();
}
- private MediaFileMarkEntity fileUploadConvertToMarkEntity(FileUploadDTO file) {
- MediaFileMarkEntity.MediaFileMarkEntityBuilder builder = MediaFileMarkEntity.builder();
+ private MediaFileNailEntity fileUploadConvertToNailEntity(FileUploadDTO file) {
+ MediaFileNailEntity.MediaFileNailEntityBuilder builder = MediaFileNailEntity.builder();
if (file != null) {
builder.fileName(file.getName())
- .filePath(file.getPath())
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
.isOriginal(file.getExt().getIsOriginal())
+ .filePath(file.getPath())
.jobId(file.getExt().getFlightId())
.drone(file.getExt().getSn()).metadata(file.getMetadata())
.tinnyFingerprint(file.getExt().getTinnyFingerprint());
@@ -529,8 +621,8 @@
return builder.build();
}
- private MediaFileNailEntity fileUploadConvertToNailEntity(FileUploadDTO file) {
- MediaFileNailEntity.MediaFileNailEntityBuilder builder = MediaFileNailEntity.builder();
+ private MediaFileZipEntity fileUploadConvertToZipEntity(FileUploadDTO file) {
+ MediaFileZipEntity.MediaFileZipEntityBuilder builder = MediaFileZipEntity.builder();
if (file != null) {
builder.fileName(file.getName())
@@ -706,13 +798,100 @@
}
}
+ public void updateMediaZipFileNames(String jobId) {
+ // 查询符合条件的数据
+ List<MediaFileZipEntity> mediaFiles = zipMapper.selectList(new LambdaQueryWrapper<MediaFileZipEntity>()
+ .eq(MediaFileZipEntity::getJobId, jobId));
+ boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
+ boolean noneContainTilde = mediaFiles.stream().noneMatch(file -> file.getFileName().contains("~"));
+
+ // 如果所有 fileName 都包含 '~' 或者都不包含 '~'，将 is_add 字段改为 1
+ if (allContainTilde || noneContainTilde) {
+ return;
+ }
+
+ // 筛选出name字段不包含'~'的数据
+ List<MediaFileZipEntity> filteredFiles = mediaFiles.stream()
+ .filter(file -> !file.getFileName().contains("~"))
+ .collect(Collectors.toList());
+ for (MediaFileZipEntity currentFile : filteredFiles) {
+ String currentName = currentFile.getFileName();
+ Map<String, Object> currentMetadata = JSON.parseObject(JSON.toJSONString(currentFile.getMetadata()), Map.class);
+ Long currentCreatedTime = (Long) currentMetadata.get("createdTime");
+ // 找到metadata中的createdTime小于当前数据的createdTime且最接近的那条数据
+ Optional<MediaFileZipEntity> closestFileOpt = mediaFiles.stream()
+ .filter(file -> {
+ Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
+ Long createdTime = (Long) metadata.get("createdTime");
+ String filename = file.getFileName();
+ return createdTime < currentCreatedTime && filename.contains("~");
+ })
+ .min((file1, file2) -> {
+ Map<String, Object> metadata1 = JSON.parseObject(JSON.toJSONString(file1.getMetadata()), Map.class);
+ Map<String, Object> metadata2 = JSON.parseObject(JSON.toJSONString(file2.getMetadata()), Map.class);
+ Long time1 = (Long) metadata1.get("createdTime");
+ Long time2 = (Long) metadata2.get("createdTime");
+ return Long.compare(currentCreatedTime - time1, currentCreatedTime - time2);
+ });
+ if (closestFileOpt.isEmpty()) {
+ // 找不到小于的文件，尝试找大于且最接近的文件
+ closestFileOpt = mediaFiles.stream()
+ .filter(file -> {
+ Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
+ Long createdTime = (Long) metadata.get("createdTime");
+ String filename = file.getFileName();
+ return createdTime > currentCreatedTime && filename.contains("~");
+ })
+ .min((file1, file2) -> {
+ Map<String, Object> metadata1 = JSON.parseObject(JSON.toJSONString(file1.getMetadata()), Map.class);
+ Map<String, Object> metadata2 = JSON.parseObject(JSON.toJSONString(file2.getMetadata()), Map.class);
+ Long time1 = (Long) metadata1.get("createdTime");
+ Long time2 = (Long) metadata2.get("createdTime");
+ return Long.compare(time1 - currentCreatedTime, time2 - currentCreatedTime);
+ });
+ }
+ // 提取并替换name字段
+ closestFileOpt.ifPresent(closestFile -> {
+ String closestName = closestFile.getFileName();
+ int startIndex = closestName.indexOf("V");
+ if (startIndex == -1) startIndex = closestName.indexOf("W");
+ if (startIndex == -1) startIndex = closestName.indexOf("Z");
+ if (startIndex == -1) startIndex = closestName.indexOf("T");
+ if (startIndex == -1) {
+ return;
+ }
+ int endIndex = closestName.indexOf(".", startIndex);
+ if (endIndex == -1) {
+ return;
+ }
+ String replacement = closestName.substring(startIndex, endIndex);
+ int currentStartIndex = currentName.indexOf("V");
+ if (currentStartIndex == -1) currentStartIndex = currentName.indexOf("W");
+ if (currentStartIndex == -1) currentStartIndex = currentName.indexOf("Z");
+ if (currentStartIndex == -1) currentStartIndex = currentName.indexOf("T");
+ if (currentStartIndex == -1) {
+ return;
+ }
+ int currentEndIndex = currentName.indexOf(".", currentStartIndex);
+ if (currentEndIndex == -1) {
+ return;
+ }
+ String newName = currentName.substring(0, currentStartIndex)
+ + replacement
+ + currentName.substring(currentEndIndex);
+ currentFile.setFileName(newName);
+ updateZipById(currentFile.getId(), currentFile);
+ });
+ }
+ }
+
@Override
- public void updateMarkMediaFileNames(String jobId) {
+ public void updateNailMediaFileNames(String jobId) {
try {
// 查询符合条件的数据
- List<MediaFileMarkEntity> mediaFiles = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
- .eq(MediaFileMarkEntity::getJobId, jobId));
+ List<MediaFileNailEntity> mediaFiles = nailMapper.selectList(new LambdaQueryWrapper<MediaFileNailEntity>()
+ .eq(MediaFileNailEntity::getJobId, jobId));
// 判断所有 fileName 是否都包含 '~' 或者都不包含 '~'
boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
@@ -728,17 +907,17 @@
}
// 筛选出name字段不包含'~'的数据
- List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
+ List<MediaFileNailEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
.collect(Collectors.toList());
- for (MediaFileMarkEntity currentFile : filteredFiles) {
+ for (MediaFileNailEntity currentFile : filteredFiles) {
String currentName = currentFile.getFileName();
Map<String, Object> currentMetadata = JSON.parseObject(JSON.toJSONString(currentFile.getMetadata()), Map.class);
Long currentCreatedTime = (Long) currentMetadata.get("createdTime");
// 找到metadata中的createdTime小于当前数据的createdTime且最接近的那条数据
- Optional<MediaFileMarkEntity> closestFileOpt = mediaFiles.stream()
+ Optional<MediaFileNailEntity> closestFileOpt = mediaFiles.stream()
.filter(file -> {
Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
Long createdTime = (Long) metadata.get("createdTime");
@@ -810,72 +989,69 @@
}
}
- @Override
+
public PaginationData<MediaFileEntity> getJobId(int pageNum, int pageSize, String workspaceId) {
- List<MediaFileEntity> allRecords = new ArrayList<>();
- int currentPageNum = 1; // 从第一页开始获取记录
+ // 分页查询
+ Page<MediaFileEntity> page = new Page<>(pageNum, pageSize);
- // 用于存储去重后的记录
- Map<String, MediaFileEntity> uniqueFilesMap = new HashMap<>();
+ // 使用 QueryWrapper 执行查询
+ QueryWrapper<MediaFileEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper
+ .eq("workspace_id", workspaceId)
+ .orderByDesc("create_time"); // 根据 create_time 降序排序
- while (true) {
- // 分页查询
- Page<MediaFileEntity> page = new Page<>(currentPageNum, pageSize);
- Page<MediaFileEntity> resultPage = mapper.selectPage(page, new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getWorkspaceId, workspaceId));
+ // 执行分页查询
+ Page<MediaFileEntity> resultPage = mapper.selectPage(page, queryWrapper);
+ List<MediaFileEntity> result = resultPage.getRecords();
- List<MediaFileEntity> result = resultPage.getRecords();
- // 检查是否还有更多记录
- if (result.isEmpty()) {
- break; // 没有更多记录了，停止请求
- }
+ // 根据 job_id 字段进行去重
+ Map<String, MediaFileEntity> uniqueFilesMap = result.stream()
+ .collect(Collectors.toMap(
+ MediaFileEntity::getJobId,
+ entity -> entity,
+ (existing, replacement) -> existing // 如果有重复的，保留已有的
+ ));
- // 根据 fileName 字段进行去重并设置 JobName
- result.stream()
- .peek(mediaFile -> {
- String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
- mediaFile.setJobName(taskNameResult);
- })
- .forEach(mediaFile -> uniqueFilesMap.putIfAbsent(mediaFile.getFileName(), mediaFile));
+ List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
- // 增加当前页数以获取更多记录
- currentPageNum++;
+
+ // 为每个 MediaFileEntity 设置 jobName
+ for (MediaFileEntity mediaFile : uniqueFiles) {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
}
- // 获取去重后的实际总数
- List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
- int uniqueTotal = uniqueFiles.size();
+ // 使用分页对象构造 Pagination
+ Page<MediaFileEntity> newPage = new Page<>(pageNum, pageSize);
+ newPage.setRecords(uniqueFiles);
+ newPage.setTotal(resultPage.getTotal()); // 设置总记录数为原始查询的总记录数
- // 计算当前页的起始和结束索引
- int fromIndex = Math.min((pageNum - 1) * pageSize, uniqueTotal);
- int toIndex = Math.min(fromIndex + pageSize, uniqueTotal);
-
- // 获取当前页的数据
- List<MediaFileEntity> pagedUniqueFiles = uniqueFiles.subList(fromIndex, toIndex);
-
- // 创建新的分页对象，使用去重后的总数
- Page<MediaFileEntity> uniquePage = new Page<>(pageNum, pageSize, uniqueTotal);
-
- // 使用新的分页对象构造 Pagination
- Pagination pagination = new Pagination(uniquePage);
-
- return new PaginationData<>(pagedUniqueFiles, pagination);
+ Pagination pagination = new Pagination(newPage);
+ return new PaginationData<>(uniqueFiles, pagination);
}
+
+
+
+
@Override
public PaginationData<MediaFileEntity> getPhotoByJobId(int pageNum, int pageSize, String workspaceId, String jobId) {
-
// 分页查询
Page<MediaFileEntity> page = new Page<>(pageNum, pageSize);
- Page<MediaFileEntity> resultPage = mapper.selectPage(page, new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getJobId, jobId)
- .eq(MediaFileEntity::getWorkspaceId, workspaceId));
+ // 使用 QueryWrapper 来执行查询
+ LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
+
+ // 添加查询条件
+ queryWrapper.eq(MediaFileEntity::getWorkspaceId, workspaceId);
+ queryWrapper.eq(MediaFileEntity::getJobId,jobId);
+ queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
+ Page<MediaFileEntity> resultPage = mapper.selectPage(page, queryWrapper);
List<MediaFileEntity> result = resultPage.getRecords();
- // 根据 fileName 字段进行去重
+ // 根据 file_name 字段进行去重
Map<String, MediaFileEntity> uniqueFilesMap = result.stream()
.collect(Collectors.toMap(
MediaFileEntity::getFileName,
@@ -885,22 +1061,22 @@
List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
- // 使用去重后的列表重新计算总数
- int uniqueTotal = uniqueFiles.size();
+ // 为每个 MediaFileEntity 设置 jobName
+ for (MediaFileEntity mediaFile : uniqueFiles) {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ }
- // 创建新的分页对象，使用去重后的总数
- Page<MediaFileEntity> uniquePage = new Page<>(pageNum, pageSize, uniqueTotal);
+ // 使用分页对象构造 Pagination
+ Page<MediaFileEntity> newPage = new Page<>(pageNum, pageSize);
+ newPage.setRecords(uniqueFiles);
+ newPage.setTotal(uniqueFiles.size()); // 设置总记录数为去重后的记录数
- // 截取当前页的数据
- int fromIndex = Math.min((pageNum - 1) * pageSize, uniqueTotal);
- int toIndex = Math.min(fromIndex + pageSize, uniqueTotal);
- List<MediaFileEntity> pagedUniqueFiles = uniqueFiles.subList(fromIndex, toIndex);
-
- // 使用新的分页对象构造 Pagination
- Pagination pagination = new Pagination(uniquePage);
-
- return new PaginationData<>(pagedUniqueFiles, pagination);
+ Pagination pagination = new Pagination(newPage);
+ return new PaginationData<>(uniqueFiles, pagination);
}
+
+
public List<MediaFileEntity> getMedia(String jobId) {
@@ -909,12 +1085,19 @@
.groupBy(MediaFileEntity::getFileName)); // 使用groupBy去重
}
- public void updateById(Integer id, MediaFileMarkEntity entity) {
+ public void updateById(Integer id, MediaFileNailEntity entity) {
entity.setIsadd(1);
- UpdateWrapper<MediaFileMarkEntity> updateWrapper = new UpdateWrapper<>();
+ UpdateWrapper<MediaFileNailEntity> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id);
- markMapper.update(entity, updateWrapper);
+ nailMapper.update(entity, updateWrapper);
}
+
+ public void updateZipById(Integer id, MediaFileZipEntity entity) {
+ UpdateWrapper<MediaFileZipEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", id);
+ zipMapper.update(entity, updateWrapper);
+ }
+
public void updateMediaById(Integer id, MediaFileEntity entity) {
UpdateWrapper<MediaFileEntity> updateWrapper = new UpdateWrapper<>();
@@ -923,10 +1106,12 @@
}
public void getNoaddFile() {
- List<MediaFileMarkEntity> markEntities = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>().eq(MediaFileMarkEntity::getIsadd, 0));
- for (MediaFileMarkEntity mark : markEntities) {
- updateMarkMediaFileNames(mark.getJobId());
+ List<MediaFileNailEntity> markEntities = nailMapper.selectList(
+ new LambdaQueryWrapper<MediaFileNailEntity>().eq(MediaFileNailEntity::getIsadd, 0));
+ for (MediaFileNailEntity mark : markEntities) {
+ updateNailMediaFileNames(mark.getJobId());
updateMediaFileNames(mark.getJobId());
+ updateMediaZipFileNames(mark.getJobId());
}
}
--
Gitblit v1.9.3