From e945a560b26437d610754cea5abfd992cd63fd7b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 13:39:14 +0800
Subject: [PATCH] 媒体文件处理，国土对接证书替换
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 464 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 379 insertions(+), 85 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 ebc2d92..6cf4a3d 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,9 +19,11 @@
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;
+import com.dji.sample.media.util.MinioFileDownloader;
import com.dji.sample.patches.dao.GetPatchesMapper;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.utils.DistrictCodeUtils;
@@ -30,6 +32,10 @@
import com.dji.sample.territory.service.impl.TbFjServiceImpl;
import com.dji.sample.territory.utils.ImgZipUtil;
import com.dji.sample.territory.utils.WaterMarkUtil;
+import com.dji.sample.wayline.dao.IWaylineFileMapper;
+import com.dji.sample.wayline.dao.IWaylineJobMapper;
+import com.dji.sample.wayline.model.entity.WaylineFileEntity;
+import com.dji.sample.wayline.model.entity.WaylineJobEntity;
import com.dji.sample.wayline.service.IWaylineFileService;
import com.dji.sample.wayline.service.IWaylineJobService;
import com.drew.imaging.ImageProcessingException;
@@ -43,6 +49,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
import java.awt.*;
import java.io.File;
import java.io.FileInputStream;
@@ -53,7 +60,12 @@
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.*;
+import static com.dji.sample.patches.utils.TimerUtil.getDkbh;
/**
* @author sean
@@ -71,6 +83,8 @@
@Autowired
private INailMapper nailMapper;
@Autowired
+ private IZipMapper zipMapper;
+ @Autowired
private GetPatchesMapper patchesMapper;
@Autowired
private IDeviceDictionaryService deviceDictionaryService;
@@ -86,6 +100,10 @@
private MinioPojo pojo;
private ObjectMapper objectMapper = new ObjectMapper();
+ @Autowired
+ private IWaylineJobMapper jobMapper;
+ @Autowired
+ private IWaylineFileMapper fileMapper;
private Optional<MediaFileEntity> getMediaByFingerprint(String workspaceId, String fingerprint) {
@@ -102,78 +120,93 @@
return Optional.ofNullable(fileEntity);
}
+ public void saveMarkFile(String workspaceId, FileUploadDTO files, File file1,String dkbh) {
+ try {
+ MediaFileMarkEntity file=fileUploadConvertToMarkEntity(files);
+ MediaFileMarkEntity mediaFileMarkEntity = new MediaFileMarkEntity();
+ mediaFileMarkEntity.setWorkspaceId(workspaceId);
+ mediaFileMarkEntity.setIsadd(0);
+ mediaFileMarkEntity.setIsOriginal(false);
+ mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
+ mediaFileMarkEntity.setObjectKey("/mark" + file.getFilePath() + "/" + file.getFileName());
+ mediaFileMarkEntity.setFileName("mark" + file.getFileName());
+ mediaFileMarkEntity.setFilePath("mark" + file.getFilePath());
+ long timestamp = convertToTimestamp(files.getMetadata().getCreatedTime());
+ int type=getLotInfo(dkbh);
+ File markFile = new File(WaterMarkUtil.addWatermark(file1, timestamp, files.getMetadata().getShootPosition().getLat(),
+ files.getMetadata().getShootPosition().getLng(), files.getMetadata().getGimbalYawDegree(),type).toURI());
+ uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", mediaFileMarkEntity.getObjectKey(), markFile, "image/jpeg");
+ markMapper.insert(mediaFileMarkEntity);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
@Override
public Boolean checkExist(String workspaceId, String fingerprint) {
return this.getMediaByFingerprint(workspaceId, fingerprint).isPresent();
}
@Override
- public Integer saveFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
+ public Integer saveFile(String workspaceId, FileUploadDTO file) throws ImageProcessingException, IOException {
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
- String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
- File file1 = TbFjServiceImpl.downloadFile(url);
- Object data = ImgUtil.getInfo(file1);
- fileEntity.setDroneData(data);
+ int isPlane=checkWaylineType(file.getExt().getFlightId());
+ //避免对视频处理引发报错
+ if (file.getObjectKey().endsWith("jpeg")&&isPlane!=2) {
+ fileEntity.setIsadd(0);
+ String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
+ File downloadedFile = TbFjServiceImpl.downloadFile(url);
+ Object data = ImgUtil.getInfo(downloadedFile);
+ fileEntity.setDroneData(data);
+ updateStatue(file.getName());
+ saveFiles(workspaceId, file, downloadedFile);
+ if (isPlane==1){
+ fileEntity.setDkbh(getDkbh(fileEntity.getFileName()));
+ saveMarkFile(workspaceId, file, downloadedFile, fileEntity.getDkbh());
+ }
+ }
return mapper.insert(fileEntity);
}
- public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException {
- 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 {
- String endpoint = pojo.getEndpoint();
- String accessKey = pojo.getAccessKey();
- String secretKey = pojo.getSecretKey();
- String bucketName = pojo.getBucket();
- String url = pojo.getEndpoint() + "/" + pojo.getBucket() + file.getObjectKey();
- File file1 = TbFjServiceImpl.downloadFile(url);
- File nailFile = new File(ImgZipUtil.compressImage(file1, 50).toURI());
+ public void saveFiles(String workspaceId, FileUploadDTO file, File mediaFile) {
+ // 更新文件状态
+// updateStatue(file.getName());
+
+ try {
+ // 处理图片文件
+ File nailFile = new File(ImgZipUtil.compressImage(mediaFile, 50).toURI());
MediaFileNailEntity nailEntity = this.fileUploadConvertToNailEntity(file);
+ Object data = ImgUtil.getInfo(mediaFile);
+// 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(endpoint, accessKey, secretKey, bucketName, nailName, nailFile, "image/jpeg");
+ uploadFile("http://139.196.74.78:9000", "sxkj", "sxkj2024", "cloud-bucket", nailName, nailFile, "image/jpeg");
nailMapper.insert(nailEntity);
- try {
- if (file.getName().contains("~")) {
- String name = TimerUtil.getDkbh(file.getName());
- List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
- if (!lotInfos.isEmpty()) {
- LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(LotInfo::getDkbh, name)
- .eq(LotInfo::getInvestigate, 0)
- .set(LotInfo::getInvestigate, 1);
- patchesMapper.update(null, updateWrapper);
- }
- }
- MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
- long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
- File markFile = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
- file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree()).toURI());
- Object data = ImgUtil.getInfo(file1);
- mediaFileMarkEntity.setDronedata(data);
- mediaFileMarkEntity.setWorkspaceId(workspaceId);
- mediaFileMarkEntity.setIsadd(0);
- mediaFileMarkEntity.setIsOriginal(false);
- mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
- mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
- mediaFileMarkEntity.setFileName("mark" + file.getName());
- mediaFileMarkEntity.setFilePath("mark" + file.getPath());
- String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
- uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, markFile, "image/jpeg");
- markMapper.insert(mediaFileMarkEntity);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (IOException | ImageProcessingException e) {
+ // 处理异常
+ e.printStackTrace();
+ }
+ }
+
+
+ public void updateStatue(String filename) {
+ if (filename.contains("~")) {
+ String name = getDkbh(filename);
+ List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
+ if (!lotInfos.isEmpty()) {
+ LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(LotInfo::getDkbh, name)
+ .eq(LotInfo::getInvestigate, 0)
+ .set(LotInfo::getInvestigate, 1);
+ patchesMapper.update(null, updateWrapper);
}
}
}
@@ -181,18 +214,27 @@
@Override
public Object mediaInfo(String filename) {
String name = filename;
- if (!filename.contains("mark")) {
- name = "mark" + filename;
- }
- List<MediaFileMarkEntity> entity = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
- .eq(MediaFileMarkEntity::getFileName, name));
- if (entity != null) {
- return entity.get(0).getDronedata();
+ List<MediaFileEntity> entitys = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getFileName, name));
+ if (entitys != null && !entitys.isEmpty()) {
+ for (MediaFileEntity entity : entitys) {
+ if (entity.getDroneData() != null) {
+ return entity.getDroneData();
+ }
+ }
} else {
- List<MediaFileEntity> entitys = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getFileName, name));
- return entitys.get(0).getDroneData();
+ 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
@@ -205,7 +247,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<>();
@@ -226,6 +268,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()) {
@@ -249,6 +294,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());
// 计算分页信息
@@ -414,6 +500,34 @@
}
@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);
+ MinioFileDownloader downloader = new MinioFileDownloader(bucketPath);
+ downloader.downloadAndZipFolders(prefixes, localSaveDir, filepath);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseResult.error("下载失败" + e.getMessage());
+ }
+ return ResponseResult.success(downPath + filepath);
+ }
+
+ @Override
+ public List<String> getUniqueFilePaths(List<String> jobIds) {
+ return mapper.selectList(
+ new LambdaQueryWrapper<MediaFileEntity>()
+ .in(MediaFileEntity::getJobId, jobIds))
+ .stream()
+ .map(MediaFileEntity::getFilePath)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
+ @Override
public List<MediaFileDTO> getFilesByWorkspaceAndJobId(String workspaceId, String jobId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getWorkspaceId, workspaceId)
@@ -470,8 +584,8 @@
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())
@@ -479,6 +593,7 @@
.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());
@@ -495,8 +610,8 @@
return builder.build();
}
- private MediaFileNailEntity fileUploadConvertToNailEntity(FileUploadDTO file) {
- MediaFileNailEntity.MediaFileNailEntityBuilder builder = MediaFileNailEntity.builder();
+ private MediaFileMarkEntity fileUploadConvertToMarkEntity(FileUploadDTO file) {
+ MediaFileMarkEntity.MediaFileMarkEntityBuilder builder = MediaFileMarkEntity.builder();
if (file != null) {
builder.fileName(file.getName())
@@ -504,6 +619,7 @@
.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());
@@ -583,11 +699,90 @@
.eq(MediaFileEntity::getJobId, jobId));
}
+ public int getLotInfo(String dkbh){
+ LotInfo lotInfo=patchesMapper.selectOne(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, dkbh));
+ return lotInfo.getType();
+ }
+ public int checkWaylineType(String jobId) {
+ WaylineJobEntity jobEntity = jobMapper.selectOne(new LambdaQueryWrapper<WaylineJobEntity>().eq(WaylineJobEntity::getJobId, jobId));
+ WaylineFileEntity fileEntity=fileMapper.selectOne(new LambdaQueryWrapper<WaylineFileEntity>().eq(WaylineFileEntity::getWaylineId, jobEntity.getFileId()));
+ return fileEntity.getWaylineType();
+ }
public void updateMediaFileNames(String jobId) {
// 查询符合条件的数据
List<MediaFileEntity> mediaFiles = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
.eq(MediaFileEntity::getJobId, jobId));
+
+ // 判断所有的dkbh字段是否都不为空或者都为空
+ boolean allHaveDkbh = mediaFiles.stream().allMatch(file -> file.getDkbh() != null && !file.getDkbh().isEmpty());
+ boolean noneHaveDkbh = mediaFiles.stream().noneMatch(file -> file.getDkbh() != null && !file.getDkbh().isEmpty());
+
+ // 如果所有dkbh字段都不为空或者都为空，将is_add字段改为1
+ if (allHaveDkbh || noneHaveDkbh) {
+ mediaFiles.forEach(file -> {
+ file.setIsadd(1);
+ updateMediaById(file.getId(), file);
+ });
+ return;
+ }
+
+ // 筛选出dkbh字段为空的数据
+ List<MediaFileEntity> filteredFiles = mediaFiles.stream()
+ .filter(file -> file.getDkbh() == null || file.getDkbh().isEmpty())
+ .collect(Collectors.toList());
+
+ for (MediaFileEntity 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<MediaFileEntity> closestFileOpt = mediaFiles.stream()
+ .filter(file -> {
+ Map<String, Object> metadata = JSON.parseObject(JSON.toJSONString(file.getMetadata()), Map.class);
+ Long createdTime = (Long) metadata.get("createdTime");
+ return createdTime < currentCreatedTime && file.getDkbh() != null && !file.getDkbh().isEmpty();
+ })
+ .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");
+ return createdTime > currentCreatedTime && file.getDkbh() != null && !file.getDkbh().isEmpty();
+ })
+ .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);
+ });
+ }
+
+ // 将最接近的文件的dkbh值赋给当前文件
+ closestFileOpt.ifPresent(closestFile -> {
+ currentFile.setDkbh(closestFile.getDkbh());
+ currentFile.setIsadd(1);
+ updateMediaById(currentFile.getId(), currentFile);
+ });
+ }
+ }
+
+
+ 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("~"));
@@ -597,15 +792,15 @@
}
// 筛选出name字段不包含'~'的数据
- List<MediaFileEntity> filteredFiles = mediaFiles.stream()
+ List<MediaFileZipEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
.collect(Collectors.toList());
- for (MediaFileEntity currentFile : filteredFiles) {
+ 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<MediaFileEntity> closestFileOpt = mediaFiles.stream()
+ 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");
@@ -666,18 +861,18 @@
+ replacement
+ currentName.substring(currentEndIndex);
currentFile.setFileName(newName);
- updateMediaById(currentFile.getId(), currentFile);
+ 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("~"));
@@ -693,17 +888,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");
@@ -776,24 +971,123 @@
}
- public void updateById(Integer id, MediaFileMarkEntity entity) {
- entity.setIsadd(1);
- UpdateWrapper<MediaFileMarkEntity> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("id", id);
- markMapper.update(entity, updateWrapper);
+ public PaginationData<MediaFileEntity> getJobId(int pageNum, int pageSize, String workspaceId) {
+ // 分页查询
+ Page<MediaFileEntity> page = new Page<>(pageNum, pageSize);
+
+ // 使用 QueryWrapper 执行查询
+ QueryWrapper<MediaFileEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper
+ .eq("workspace_id", workspaceId)
+ .orderByDesc("create_time"); // 根据 create_time 降序排序
+
+ // 执行分页查询
+ Page<MediaFileEntity> resultPage = mapper.selectPage(page, queryWrapper);
+ List<MediaFileEntity> result = resultPage.getRecords();
+
+
+ // 根据 job_id 字段进行去重
+ Map<String, MediaFileEntity> uniqueFilesMap = result.stream()
+ .collect(Collectors.toMap(
+ MediaFileEntity::getJobId,
+ entity -> entity,
+ (existing, replacement) -> existing // 如果有重复的，保留已有的
+ ));
+
+ List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
+
+
+ // 为每个 MediaFileEntity 设置 jobName
+ for (MediaFileEntity mediaFile : uniqueFiles) {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ }
+
+ // 使用分页对象构造 Pagination
+ Page<MediaFileEntity> newPage = new Page<>(pageNum, pageSize);
+ newPage.setRecords(uniqueFiles);
+ newPage.setTotal(resultPage.getTotal()); // 设置总记录数为原始查询的总记录数
+
+ 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);
+
+ // 使用 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();
+
+ // 根据 file_name 字段进行去重
+ Map<String, MediaFileEntity> uniqueFilesMap = result.stream()
+ .collect(Collectors.toMap(
+ MediaFileEntity::getFileName,
+ entity -> entity,
+ (existing, replacement) -> existing // 如果有重复的，保留已有的
+ ));
+
+ List<MediaFileEntity> uniqueFiles = new ArrayList<>(uniqueFilesMap.values());
+
+ // 为每个 MediaFileEntity 设置 jobName
+ for (MediaFileEntity mediaFile : uniqueFiles) {
+ String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
+ mediaFile.setJobName(taskNameResult);
+ }
+
+ // 使用分页对象构造 Pagination
+ Page<MediaFileEntity> newPage = new Page<>(pageNum, pageSize);
+ newPage.setRecords(uniqueFiles);
+ newPage.setTotal(uniqueFiles.size()); // 设置总记录数为去重后的记录数
+
+ Pagination pagination = new Pagination(newPage);
+ return new PaginationData<>(uniqueFiles, pagination);
+ }
+
+
+ public List<MediaFileEntity> getMedia(String jobId) {
+ return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getJobId, jobId)
+ .groupBy(MediaFileEntity::getFileName)); // 使用groupBy去重
+ }
+
+ public void updateById(Integer id, MediaFileNailEntity entity) {
+// entity.setIsadd(1);
+ UpdateWrapper<MediaFileNailEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", id);
+ 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) {
+ entity.setIsadd(1);
UpdateWrapper<MediaFileEntity> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", id);
mapper.update(entity, updateWrapper);
}
public void getNoaddFile() {
- List<MediaFileMarkEntity> markEntities = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>().eq(MediaFileMarkEntity::getIsadd, 0));
- for (MediaFileMarkEntity mark : markEntities) {
- updateMarkMediaFileNames(mark.getJobId());
- updateMediaFileNames(mark.getJobId());
+ List<MediaFileEntity> mediaEntities = mapper.selectList(
+ new LambdaQueryWrapper<MediaFileEntity>().eq(MediaFileEntity::getIsadd, 0));
+ for (MediaFileEntity media : mediaEntities) {
+// updateNailMediaFileNames(media.getJobId());
+ updateMediaFileNames(media.getJobId());
+// updateMediaZipFileNames(media.getJobId());
}
}
--
Gitblit v1.9.3