From e18802f171fb12246a8bad5a699c55c630a6d2e3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 12 Feb 2026 10:50:55 +0800
Subject: [PATCH] 2026-02-12 优化媒体文件入库代码。
---
ard-sample/src/main/java/com/ard/sample/media/service/impl/MediaServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/media/service/impl/MediaServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/media/service/impl/MediaServiceImpl.java
index 2109174..8617010 100644
--- a/ard-sample/src/main/java/com/ard/sample/media/service/impl/MediaServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/media/service/impl/MediaServiceImpl.java
@@ -116,7 +116,8 @@
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_FILE_UPLOAD_CALLBACK, outputChannel = ChannelName.OUTBOUND)
public void handleFileUploadCallBack(CommonTopicReceiver receiver) {
FileUploadCallback callback = objectMapper.convertValue(receiver.getData(), FileUploadCallback.class);
-
+ log.info("媒体库回调-原始报文内容：{}",receiver);
+ log.info("媒体库调试-收到文件上传回调：{}",callback);
String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + receiver.getGateway()
+ TopicConst.EVENTS_SUF + TopicConst._REPLY_SUF;
CommonTopicResponse<RequestsReply> data = CommonTopicResponse.<RequestsReply>builder()
@@ -129,6 +130,7 @@
if (callback.getResult() != ResponseResult.CODE_SUCCESS) {
messageSenderService.publish(topic, data);
+ log.info("媒体库调试-回调失败：{}",callback);
return;
}
@@ -213,9 +215,10 @@
// 设置拍摄媒体的无人机
Optional<DeviceDTO> dockDTO = deviceService.getDeviceBySn(job.getDockSn());
dockDTO.ifPresent(dock -> callback.getFile().getExt().setSn(dock.getChildDeviceSn()));
+ dockDTO.ifPresent(dock -> callback.getFile().getExt().setPayloadModelKey(dockDTO.get().getDomain()+"-"+dockDTO.get().getType()+"-"+dockDTO.get().getSubType()));
// 设定路径
- String objectKey = callback.getFile().getObjectKey();
+ String objectKey = callback.getFile().getObjectKey()!= null ? callback.getFile().getObjectKey() : "";
callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
log.info("保存媒体库数据：{}",callback);
return fileService.saveFile(callback.getFile()) > 0;
--
Gitblit v1.9.3