From 914a1a800b7f8758cfd4d08704e8bbd0cf3e83be Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 15 Jul 2024 14:05:19 +0800
Subject: [PATCH] 航线云台俯仰角事件
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 484 +++++++++++++++++++++++++++++------------------------
1 files changed, 265 insertions(+), 219 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 27e1e77..621b57d 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
@@ -78,6 +78,8 @@
private IWaylineJobService waylineJobService;
@Autowired
private IWaylineFileService waylineFileService;
+ @Autowired
+ private MinioPojo pojo;
private ObjectMapper objectMapper = new ObjectMapper();
@@ -110,13 +112,8 @@
}
public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
- boolean endsWith = file.getObjectKey().endsWith(".mp4");
- if (endsWith) {
- MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
- mediaFileMarkEntity.setWorkspaceId(workspaceId);
- mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
- markMapper.insert(mediaFileMarkEntity);
- } else {
+
+ try {
boolean contains = file.getName().contains("~");
if (contains) {
String name = TimerUtil.getDkbh(file.getName());
@@ -129,37 +126,50 @@
patchesMapper.update(null, updateWrapper);
}
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ boolean endsWith = file.getObjectKey().endsWith(".mp4");
+ if (endsWith) {
MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
- String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
- File file1 = TbFjServiceImpl.downloadFile(url);
- long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
- File file2 = 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.setFileId(UUID.randomUUID().toString());
- mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
- mediaFileMarkEntity.setFileName("mark" + file.getName());
- mediaFileMarkEntity.setFilePath("mark" + file.getPath());
- String endpoint = "http://dev.jxpskj.com:9000";
- String accessKey = "pskj";
- String secretKey = "pskj@2021";
- String bucketName = "cloud-bucket";
- String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
- uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
markMapper.insert(mediaFileMarkEntity);
}
+ MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
+ String url = pojo.getEndpoint()+"/"+pojo.getBucket() + file.getObjectKey();
+ File file1 = TbFjServiceImpl.downloadFile(url);
+ long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
+ File file2 = 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.setFileId(UUID.randomUUID().toString());
+ mediaFileMarkEntity.setObjectKey("/mark" + file.getPath() + "/" + file.getName());
+ mediaFileMarkEntity.setFileName("mark" + file.getName());
+ mediaFileMarkEntity.setFilePath("mark" + file.getPath());
+ String endpoint = pojo.getEndpoint();
+ String accessKey = pojo.getAccessKey();
+ String secretKey = pojo.getSecretKey();
+ String bucketName = pojo.getBucket();
+ String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
+ uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2,"image/jpeg");
+ markMapper.insert(mediaFileMarkEntity);
}
@Override
public Object mediaInfo(String filename) {
String name = "mark" + filename;
- MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
+ List<MediaFileMarkEntity> entity = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
.eq(MediaFileMarkEntity::getFileName, name));
- return entity.getDronedata();
+ if (entity != null) {
+ return entity.get(0).getDronedata();
+ } else {
+ return "该图片信息正在加载";
+ }
}
@Override
@@ -173,9 +183,6 @@
@Override
public PaginationData<MediaFileEntity> MediaQuery(Integer page, Integer pageSize, Long updateStart, Long updateEnd, Long photoStart, Long photoEnd, String jobName, String workspaceId, String type) {
- // 创建分页对象
- Page<MediaFileEntity> pageObj = new Page<>(page, pageSize);
-
// 创建查询条件对象
LambdaQueryWrapper<MediaFileEntity> queryWrapper = new LambdaQueryWrapper<>();
@@ -192,14 +199,12 @@
if (jobName != null && !jobName.isEmpty()) {
List<String> jobIds = waylineJobService.getJobIds(jobName);
- // 检查 jobIds 列表是否为空
if (jobIds.isEmpty()) {
- // 如果为空，则直接返回空的分页数据
- return new PaginationData<>(Collections.emptyList(), new Pagination(pageObj));
+ return new PaginationData<>(Collections.emptyList(), new Pagination(new Page<>(page, pageSize)));
}
-
queryWrapper.in(MediaFileEntity::getJobId, jobIds);
}
+
if (type != null && !type.isEmpty()) {
if ("图片".equals(type)) {
queryWrapper.likeLeft(MediaFileEntity::getFileName, ".jpeg");
@@ -207,25 +212,40 @@
queryWrapper.likeLeft(MediaFileEntity::getFileName, ".mp4");
}
}
- queryWrapper.last("ORDER BY JSON_EXTRACT(metadata, '$.createdTime') DESC");
- // 执行分页查询
- Page<MediaFileEntity> resultPage = mapper.selectPage(pageObj, queryWrapper);
- // 处理查询结果
- List<MediaFileEntity> records = resultPage.getRecords()
- .stream()
+ 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 -> {
- // 获取任务名称并设置到fileId
String taskNameResult = waylineJobService.getName(mediaFile.getJobId());
mediaFile.setJobName(taskNameResult);
})
- .collect(Collectors.toList()
- );
+ .filter(mediaFile -> uniqueFileMap.putIfAbsent(mediaFile.getFileName(), mediaFile) == null)
+ .collect(Collectors.toList());
-// 返回分页数据
- return new PaginationData<>(records, new Pagination(resultPage));
+ // 计算分页信息
+ 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
@@ -344,7 +364,7 @@
if (file != null) {
builder.fileName(file.getName())
.filePath(file.getPath())
- .examine(1)
+ .examine(0)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
@@ -420,7 +440,7 @@
return builder.build();
}
- public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file) {
+ public static void uploadFile(String endpoint, String accessKey, String secretKey, String bucketName, String objectName, File file,String type) {
try {
// 创建MinIO客户端实例
MinioClient minioClient = MinioClient.builder()
@@ -434,7 +454,7 @@
.bucket(bucketName)
.object(objectName)
.stream(fileInputStream, file.length(), -1)
- .contentType("image/jpeg")
+ .contentType(type)
.build()
);
fileInputStream.close();
@@ -454,171 +474,197 @@
}
-// public void updateMediaFileNames(String jobId) {
-// // 查询符合条件的数据
-// List<MediaFileEntity> mediaFiles = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
-// .eq(MediaFileEntity::getJobId, jobId)
-//// .eq(MediaFileMarkEntity::getIsadd, 0)
-// );
-//
-// // 筛选出name字段不包含'~'的数据
-// List<MediaFileEntity> filteredFiles = mediaFiles.stream()
-// .filter(file -> !file.getFileName().contains("~"))
-// .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");
-// 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);
-// });}
-// if (closestFileOpt.isEmpty()) {
-// throw new RuntimeException("当前图片无法绑定图斑");
-// }
-// // 提取并替换name字段
-// closestFileOpt.ifPresent(closestFile -> {
-// String closestName = closestFile.getFileName();
-// int startIndex = closestName.indexOf("V");
-// if (closestName.contains("W")) {
-// startIndex = closestName.indexOf("W");
-// }
-// if (closestName.contains("Z")) {
-// startIndex = closestName.indexOf("Z");
-// }
-// int endIndex = closestName.indexOf(".", startIndex);
-// String replacement = closestName.substring(startIndex, endIndex);
-// int currentStartIndex = currentName.indexOf("V");
-// if (currentName.contains("W")) {
-// currentStartIndex = closestName.indexOf("W");
-// }
-// if (currentName.contains("Z")) {
-// currentStartIndex = closestName.indexOf("Z");
-// }
-// int currentEndIndex = currentName.indexOf(".", currentStartIndex);
-// String newName = currentName.substring(0, currentStartIndex)
-// + replacement
-// + currentName.substring(currentEndIndex);
-// currentFile.setFileName(newName);
-// updateMediaById(currentFile.getId(), currentFile);
-// });
-// }
-// }
-//
-// @Override
-// public void updateMarkMediaFileNames(String jobId) {
-// try {
-//
-//
-// // 查询符合条件的数据
-// List<MediaFileMarkEntity> mediaFiles = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
-// .eq(MediaFileMarkEntity::getJobId, jobId)
-//// .eq(MediaFileMarkEntity::getIsadd, 0)
-// );
-//
-//
-// // 筛选出name字段不包含'~'的数据
-// List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
-// .filter(file -> !file.getFileName().contains("~"))
-// .toList();
-//
-// for (MediaFileMarkEntity 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()
-// .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);
-// });
-// }
-// if (closestFileOpt.isEmpty()) {
-// throw new RuntimeException("没有符合时间的对象");
-// }
-// // 提取并替换name字段
-// closestFileOpt.ifPresent(closestFile -> {
-// String closestName = closestFile.getFileName();
-// int startIndex = closestName.indexOf("V");
-// if (closestName.contains("W")) {
-// startIndex = closestName.indexOf("W");
-// }
-// if (closestName.contains("Z")) {
-// startIndex = closestName.indexOf("Z");
-// }
-// int endIndex = closestName.indexOf(".", startIndex);
-// String replacement = closestName.substring(startIndex, endIndex);
-// int currentStartIndex = currentName.indexOf("V");
-// if (currentName.contains("W")) {
-// currentStartIndex = closestName.indexOf("W");
-// }
-// if (currentName.contains("Z")) {
-// currentStartIndex = closestName.indexOf("Z");
-// }
-// int currentEndIndex = currentName.indexOf(".", currentStartIndex);
-// String newName = currentName.substring(0, currentStartIndex)
-// + replacement
-// + currentName.substring(currentEndIndex);
-// currentFile.setFileName(newName);
-// updateById(currentFile.getId(), currentFile);
-// });
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
+ public void updateMediaFileNames(String jobId) {
+ // 查询符合条件的数据
+ List<MediaFileEntity> mediaFiles = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::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<MediaFileEntity> filteredFiles = mediaFiles.stream()
+ .filter(file -> !file.getFileName().contains("~"))
+ .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");
+ 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);
+ updateMediaById(currentFile.getId(), currentFile);
+ });
+ }
+ }
+
+
+ @Override
+ public void updateMarkMediaFileNames(String jobId) {
+ try {
+ // 查询符合条件的数据
+ List<MediaFileMarkEntity> mediaFiles = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
+ .eq(MediaFileMarkEntity::getJobId, jobId));
+
+ // 判断所有 fileName 是否都包含 '~' 或者都不包含 '~'
+ 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) {
+ mediaFiles.forEach(file -> {
+ file.setIsadd(1);
+ updateById(file.getId(), file);
+ });
+ return;
+ }
+
+ // 筛选出name字段不包含'~'的数据
+ List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
+ .filter(file -> !file.getFileName().contains("~"))
+ .collect(Collectors.toList());
+
+ for (MediaFileMarkEntity 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()
+ .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);
+ updateById(currentFile.getId(), currentFile);
+ });
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
public void updateById(Integer id, MediaFileMarkEntity entity) {
entity.setIsadd(1);
@@ -633,13 +679,13 @@
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());
-// }
-// }
+ 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());
+ }
+ }
}
--
Gitblit v1.9.3