From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
index 07846f4..15b4c9e 100644
--- a/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java
@@ -89,7 +89,7 @@
}
@Override
- public Integer saveMediaFile(String workspaceId, FileUploadDTO file){
+ public Integer saveMediaFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
return fileService.saveFile(workspaceId, file);
}
@@ -218,7 +218,7 @@
BizCodeEnum.FILE_UPLOAD_CALLBACK.getCode(), mediaFileCount);
}
- private Boolean parseMediaFile(FileUploadCallback callback, WaylineJobDTO job) {
+ private Boolean parseMediaFile(FileUploadCallback callback, WaylineJobDTO job) throws ImageProcessingException, IOException, FontFormatException {
// Set the drone sn that shoots the media
Optional<DeviceDTO> dockDTO = deviceService.getDeviceBySn(job.getDockSn());
dockDTO.ifPresent(dock -> callback.getFile().getExt().setSn(dock.getChildDeviceSn()));
@@ -226,17 +226,15 @@
// set path
String objectKey = callback.getFile().getObjectKey();
callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
- try {
- fileService.saveMarkFile(job.getWorkspaceId(), callback.getFile());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- return fileService.saveFile(job.getWorkspaceId(), callback.getFile()) > 0;
+ int count =fileService.saveFile(job.getWorkspaceId(), callback.getFile());
+// fileService.saveFiles(job.getWorkspaceId(), callback.getFile());
+// fileService.saveZipFile(job.getWorkspaceId(),callback.getFile());
+ return count > 0;
}
/**
* Handles the highest priority message about media uploads.
- *
+ * 处理有关媒体上传的最高优先级消息。
* @param receiver
* @param headers
* @return
@@ -274,4 +272,9 @@
return receiver;
}
+
+ @Override
+ public MediaFileEntity getMediaFieByTid(String timestamp) {
+ return mapper.getMediaFieByTid(timestamp);
+ }
}
--
Gitblit v1.9.3