From 2aaaaf4598b869085ae35871de018cd35847c232 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 09 Jul 2024 16:41:39 +0800
Subject: [PATCH] 航线拐点
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 46 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 7967e94..c1b923a 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
@@ -102,21 +102,12 @@
}
@Override
- public Integer saveFile(String workspaceId, FileUploadDTO file) {
+ public Integer saveFile(String workspaceId, FileUploadDTO file) throws ImageProcessingException, IOException {
MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file);
fileEntity.setWorkspaceId(workspaceId);
fileEntity.setFileId(UUID.randomUUID().toString());
- return mapper.insert(fileEntity);
- }
-
- 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 {
+ Integer count= mapper.insert(fileEntity);
+ try {
boolean contains = file.getName().contains("~");
if (contains) {
String name = TimerUtil.getDkbh(file.getName());
@@ -129,6 +120,20 @@
patchesMapper.update(null, updateWrapper);
}
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return count;
+ }
+
+ 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);
+ }
MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
File file1 = TbFjServiceImpl.downloadFile(url);
@@ -151,15 +156,19 @@
uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
markMapper.insert(mediaFileMarkEntity);
}
- }
+
@Override
public Object mediaInfo(String filename) {
- String name = "mark" + filename;
+ String name = "mark"+filename;
MediaFileMarkEntity entity = markMapper.selectOne(new LambdaQueryWrapper<MediaFileMarkEntity>()
.eq(MediaFileMarkEntity::getFileName, name));
- return entity.getDronedata();
+ if (entity!=null){
+ return entity.getDronedata();}
+ else {
+ return "该图片信息正在加载";
+ }
}
@Override
@@ -457,9 +466,7 @@
public void updateMediaFileNames(String jobId) {
// 查询符合条件的数据
List<MediaFileEntity> mediaFiles = mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getJobId, jobId)
-// .eq(MediaFileMarkEntity::getIsadd, 0)
- );
+ .eq(MediaFileEntity::getJobId, jobId));
boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
boolean noneContainTilde = mediaFiles.stream().noneMatch(file -> file.getFileName().contains("~"));
@@ -512,22 +519,28 @@
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");
+ 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 (currentName.contains("W")) {
- currentStartIndex = closestName.indexOf("W");
- }
- if (currentName.contains("Z")) {
- currentStartIndex = closestName.indexOf("Z");
+ 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);
@@ -537,16 +550,14 @@
}
}
+
@Override
public void updateMarkMediaFileNames(String jobId) {
try {
-
-
// 查询符合条件的数据
List<MediaFileMarkEntity> mediaFiles = markMapper.selectList(new LambdaQueryWrapper<MediaFileMarkEntity>()
- .eq(MediaFileMarkEntity::getJobId, jobId)
-// .eq(MediaFileMarkEntity::getIsadd, 0)
- );
+ .eq(MediaFileMarkEntity::getJobId, jobId));
+
// 判断所有 fileName 是否都包含 '~' 或者都不包含 '~'
boolean allContainTilde = mediaFiles.stream().allMatch(file -> file.getFileName().contains("~"));
boolean noneContainTilde = mediaFiles.stream().noneMatch(file -> file.getFileName().contains("~"));
@@ -557,9 +568,9 @@
file.setIsadd(1);
updateById(file.getId(), file);
});
- return;
-
+ return;
}
+
// 筛选出name字段不包含'~'的数据
List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
@@ -569,6 +580,7 @@
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 -> {
@@ -584,6 +596,7 @@
Long time2 = (Long) metadata2.get("createdTime");
return Long.compare(currentCreatedTime - time1, currentCreatedTime - time2);
});
+
if (closestFileOpt.isEmpty()) {
// 找不到小于的文件，尝试找大于且最接近的文件
closestFileOpt = mediaFiles.stream()
@@ -601,26 +614,34 @@
return Long.compare(time1 - currentCreatedTime, time2 - currentCreatedTime);
});
}
+
// 提取并替换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");
+ 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);
- String replacement = closestName.substring(startIndex, endIndex);
- int currentStartIndex = currentName.indexOf("V");
- if (currentName.contains("W")) {
- currentStartIndex = closestName.indexOf("W");
+ if (endIndex == -1) {
+ return;
}
- if (currentName.contains("Z")) {
- currentStartIndex = closestName.indexOf("Z");
+ 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);
@@ -633,6 +654,7 @@
}
}
+
public void updateById(Integer id, MediaFileMarkEntity entity) {
entity.setIsadd(1);
UpdateWrapper<MediaFileMarkEntity> updateWrapper = new UpdateWrapper<>();
--
Gitblit v1.9.3