From 25cfe4f5057917a9e6ec2accef7e72e40b2f9047 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 08 Jul 2024 19:45:22 +0800
Subject: [PATCH] 航线生成云台旋转
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 7429d24..20eca7e 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://139.196.74.78: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
@@ -541,6 +550,7 @@
}
}
+
@Override
public void updateMarkMediaFileNames(String jobId) {
try {
--
Gitblit v1.9.3