From 473b5351fbbfd4e5fa4b0f87356253776bfa6da6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 02 Mar 2026 08:25:41 +0800
Subject: [PATCH] 2026-03-02 优化媒体文件查询列表，新增任务名称
---
ard-sample/src/main/java/com/ard/sample/media/service/impl/MediaServiceImpl.java | 11 +++++++++--
1 files changed, 9 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 52fcc5a..46dfc70 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
@@ -1,5 +1,6 @@
package com.ard.sample.media.service.impl;
+import com.ard.common.config.OssConfiguration;
import com.ard.sample.common.error.CommonErrorEnum;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.mqtt.model.*;
@@ -10,6 +11,7 @@
import com.ard.sample.component.websocket.model.CustomWebSocketMessage;
import com.ard.sample.component.websocket.service.ISendMessageService;
import com.ard.sample.component.websocket.service.IWebSocketManageService;
+import com.ard.sample.config.DockConfiguration;
import com.ard.sample.manage.model.dto.DeviceDTO;
import com.ard.sample.manage.model.enums.UserTypeEnum;
import com.ard.sample.manage.service.IDeviceService;
@@ -116,6 +118,7 @@
@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;
@@ -214,10 +217,14 @@
// 设置拍摄媒体的无人机
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();
- callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
+ String objectKey = callback.getFile().getObjectKey()!= null ? callback.getFile().getObjectKey() : "";
+ String path = String.format("%s/%s/%s", OssConfiguration.endpoint, DockConfiguration.bucket, objectKey);
+ log.info("媒体库上传文件完整路path：{}",path);
+ callback.getFile().setPath(path);
+// callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
log.info("保存媒体库数据：{}",callback);
return fileService.saveFile(callback.getFile()) > 0;
}
--
Gitblit v1.9.3