From 8b12caa558dd66a3c5d70f701426a53521c8deae Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 08 Jul 2024 17:29:10 +0800
Subject: [PATCH] 修改每日定时任务，修复文件信息返回空对象问题
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 78afc16..4d570b1 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
@@ -25,6 +25,7 @@
import com.dji.sample.media.service.IMediaService;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.dji.sample.wayline.service.IWaylineJobService;
+import com.drew.imaging.ImageProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -88,7 +89,7 @@
}
@Override
- public Integer saveMediaFile(String workspaceId, FileUploadDTO file) {
+ public Integer saveMediaFile(String workspaceId, FileUploadDTO file) throws ImageProcessingException, IOException {
return fileService.saveFile(workspaceId, file);
}
@@ -131,7 +132,7 @@
* @return
*/
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_FILE_UPLOAD_CALLBACK, outputChannel = ChannelName.OUTBOUND_EVENTS)
- public CommonTopicReceiver handleFileUploadCallBack(CommonTopicReceiver receiver) throws IOException, FontFormatException {
+ public CommonTopicReceiver handleFileUploadCallBack(CommonTopicReceiver receiver) throws IOException, FontFormatException, ImageProcessingException {
FileUploadCallback callback = objectMapper.convertValue(receiver.getData(), FileUploadCallback.class);
if (callback.getResult() != ResponseResult.CODE_SUCCESS) {
log.error("媒体文件上传失败；Media file upload failed!");
@@ -217,7 +218,7 @@
BizCodeEnum.FILE_UPLOAD_CALLBACK.getCode(), mediaFileCount);
}
- private Boolean parseMediaFile(FileUploadCallback callback, WaylineJobDTO job) throws IOException, FontFormatException {
+ private Boolean parseMediaFile(FileUploadCallback callback, WaylineJobDTO job) throws IOException, FontFormatException, ImageProcessingException {
// Set the drone sn that shoots the media
Optional<DeviceDTO> dockDTO = deviceService.getDeviceBySn(job.getDockSn());
dockDTO.ifPresent(dock -> callback.getFile().getExt().setSn(dock.getChildDeviceSn()));
--
Gitblit v1.9.3