From 3afaf1a21f47b6f9b46dd8e089e15e1e325c810a Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Jul 2024 15:44:51 +0800
Subject: [PATCH] 更新喇叭，图斑解析更新
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 152 +++++++++++++++++++++++++++++---------------------
1 files changed, 88 insertions(+), 64 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..067b622 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
@@ -211,7 +221,8 @@
// 执行分页查询
Page<MediaFileEntity> resultPage = mapper.selectPage(pageObj, queryWrapper);
- // 处理查询结果
+ // 处理查询结果并去重
+ Map<String, MediaFileEntity> uniqueFileMap = new LinkedHashMap<>();
List<MediaFileEntity> records = resultPage.getRecords()
.stream()
.peek(mediaFile -> {
@@ -219,13 +230,13 @@
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));
-
}
+
@Override
@@ -420,7 +431,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 +445,7 @@
.bucket(bucketName)
.object(objectName)
.stream(fileInputStream, file.length(), -1)
- .contentType("image/jpeg")
+ .contentType(type)
.build()
);
fileInputStream.close();
@@ -457,9 +468,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 +521,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 +552,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 +570,9 @@
file.setIsadd(1);
updateById(file.getId(), file);
});
- return;
-
+ return;
}
+
// 筛选出name字段不包含'~'的数据
List<MediaFileMarkEntity> filteredFiles = mediaFiles.stream()
.filter(file -> !file.getFileName().contains("~"))
@@ -569,6 +582,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 +598,7 @@
Long time2 = (Long) metadata2.get("createdTime");
return Long.compare(currentCreatedTime - time1, currentCreatedTime - time2);
});
+
if (closestFileOpt.isEmpty()) {
// 找不到小于的文件，尝试找大于且最接近的文件
closestFileOpt = mediaFiles.stream()
@@ -601,26 +616,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 +656,7 @@
}
}
+
public void updateById(Integer id, MediaFileMarkEntity entity) {
entity.setIsadd(1);
UpdateWrapper<MediaFileMarkEntity> updateWrapper = new UpdateWrapper<>();
--
Gitblit v1.9.3