From 2d8ded3e77b22e44985265ca4063102662e452c1 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Mon, 12 Dec 2022 18:32:19 +0800
Subject: [PATCH] initial v1.3.1
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 143 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 128 insertions(+), 15 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 0e0063a..d14b3de 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
@@ -1,12 +1,21 @@
package com.dji.sample.media.service.impl;
+import com.dji.sample.common.error.CommonErrorEnum;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.*;
import com.dji.sample.component.mqtt.service.IMessageSenderService;
+import com.dji.sample.component.redis.RedisConst;
+import com.dji.sample.component.redis.RedisOpsUtils;
+import com.dji.sample.component.websocket.model.BizCodeEnum;
+import com.dji.sample.component.websocket.model.CustomWebSocketMessage;
+import com.dji.sample.component.websocket.service.ISendMessageService;
+import com.dji.sample.component.websocket.service.IWebSocketManageService;
import com.dji.sample.manage.model.dto.DeviceDTO;
+import com.dji.sample.manage.model.enums.UserTypeEnum;
import com.dji.sample.manage.service.IDeviceService;
import com.dji.sample.media.model.FileUploadCallback;
import com.dji.sample.media.model.FileUploadDTO;
+import com.dji.sample.media.model.MediaFileCountDTO;
import com.dji.sample.media.model.MediaFileDTO;
import com.dji.sample.media.service.IFileService;
import com.dji.sample.media.service.IMediaService;
@@ -15,9 +24,13 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.mqtt.support.MqttHeaders;
+import org.springframework.messaging.MessageHeaders;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -43,6 +56,12 @@
@Autowired
private IDeviceService deviceService;
+
+ @Autowired
+ private ISendMessageService sendMessageService;
+
+ @Autowired
+ private IWebSocketManageService webSocketManageService;
@Override
public Boolean fastUpload(String workspaceId, String fingerprint) {
@@ -79,32 +98,126 @@
String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + receiver.getGateway()
+ TopicConst.EVENTS_SUF + TopicConst._REPLY_SUF;
- CommonTopicResponse<Object> data = CommonTopicResponse.builder()
+ CommonTopicResponse<RequestsReply> data = CommonTopicResponse.<RequestsReply>builder()
.timestamp(System.currentTimeMillis())
.method(EventsMethodEnum.FILE_UPLOAD_CALLBACK.getMethod())
.data(RequestsReply.success())
.tid(receiver.getTid())
.bid(receiver.getBid())
.build();
- if (callback.getResult() == ResponseResult.CODE_SUCCESS) {
- String jobId = callback.getFile().getExt().getFlightId();
- Optional<WaylineJobDTO> jobOpt = waylineJobService.getJobByJobId(jobId);
- if (jobOpt.isPresent()) {
- // Set the drone sn that shoots the media
- Optional<DeviceDTO> dockDTO = deviceService.getDeviceBySn(jobOpt.get().getDockSn());
- dockDTO.ifPresent(dock -> callback.getFile().getExt().setSn(dock.getChildDeviceSn()));
- // set path
- String objectKey = callback.getFile().getObjectKey();
- callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
+ if (callback.getResult() != ResponseResult.CODE_SUCCESS) {
+ messageSenderService.publish(topic, data);
+ return;
+ }
- int id = fileService.saveFile(jobOpt.get().getWorkspaceId(), callback.getFile());
- if (id <= 0) {
- data.setData(ResponseResult.error());
- }
+ String jobId = callback.getFile().getExt().getFlightId();
+
+ MediaFileCountDTO mediaFileCount = (MediaFileCountDTO) RedisOpsUtils.hashGet(RedisConst.MEDIA_FILE_PREFIX + receiver.getGateway(), jobId);
+ // duplicate data
+ if (receiver.getBid().equals(mediaFileCount.getBid()) && receiver.getTid().equals(mediaFileCount.getTid())) {
+ System.out.println("相同" + receiver.getBid() + "\t tid:" + receiver.getTid());
+ messageSenderService.publish(topic, data);
+ return;
+ }
+
+ Optional<WaylineJobDTO> jobOpt = waylineJobService.getJobByJobId(jobId);
+ if (jobOpt.isPresent()) {
+ boolean isSave = parseMediaFile(callback, jobOpt.get());
+ if (!isSave) {
+ data.setData(RequestsReply.error(CommonErrorEnum.ILLEGAL_ARGUMENT));
}
}
messageSenderService.publish(topic, data);
+
+ notifyUploadedCount(mediaFileCount, receiver, jobId);
+ }
+
+ /**
+ * update the uploaded count and notify web side
+ * @param mediaFileCount
+ * @param receiver
+ * @param jobId
+ */
+ private void notifyUploadedCount(MediaFileCountDTO mediaFileCount, CommonTopicReceiver receiver, String jobId) {
+ mediaFileCount.setBid(receiver.getBid());
+ mediaFileCount.setTid(receiver.getTid());
+ mediaFileCount.setUploadedCount(mediaFileCount.getUploadedCount() + 1);
+
+ String key = RedisConst.MEDIA_FILE_PREFIX + receiver.getGateway();
+ // After all the files of the job are uploaded, delete the media file key.
+ if (mediaFileCount.getUploadedCount() >= mediaFileCount.getMediaCount()) {
+ RedisOpsUtils.hashDel(key, new String[]{jobId});
+
+ // After uploading, delete the key with the highest priority.
+ String highestKey = RedisConst.MEDIA_HIGHEST_PRIORITY_PREFIX + receiver.getGateway();
+ if (jobId.equals(Objects.requireNonNullElse(RedisOpsUtils.get(highestKey), ""))) {
+ RedisOpsUtils.del(highestKey);
+ }
+
+ if (RedisOpsUtils.hashLen(key) == 0) {
+ RedisOpsUtils.del(key);
+ }
+ } else {
+ RedisOpsUtils.hashSet(key, jobId, mediaFileCount);
+ }
+
+ DeviceDTO dock = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + receiver.getGateway());
+ sendMessageService.sendBatch(webSocketManageService.getValueWithWorkspaceAndUserType(dock.getWorkspaceId(), UserTypeEnum.WEB.getVal()),
+ CustomWebSocketMessage.builder()
+ .bizCode(BizCodeEnum.FILE_UPLOAD_CALLBACK.getCode())
+ .timestamp(System.currentTimeMillis())
+ .data(mediaFileCount)
+ .build());
+ }
+
+ private Boolean parseMediaFile(FileUploadCallback callback, WaylineJobDTO job) {
+ // Set the drone sn that shoots the media
+ Optional<DeviceDTO> dockDTO = deviceService.getDeviceBySn(job.getDockSn());
+ dockDTO.ifPresent(dock -> callback.getFile().getExt().setSn(dock.getChildDeviceSn()));
+
+ // set path
+ String objectKey = callback.getFile().getObjectKey();
+ callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
+
+ return fileService.saveFile(job.getWorkspaceId(), callback.getFile()) > 0;
+ }
+
+ @Override
+ @ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_HIGHEST_PRIORITY_UPLOAD_FLIGHT_TASK_MEDIA, outputChannel = ChannelName.OUTBOUND)
+ public void handleHighestPriorityUploadFlightTaskMedia(CommonTopicReceiver receiver, MessageHeaders headers) {
+ Map map = objectMapper.convertValue(receiver.getData(), Map.class);
+ if (map.isEmpty() || !map.containsKey(MapKeyConst.FLIGHT_ID)) {
+ return;
+ }
+
+ String dockSn = receiver.getGateway();
+ String jobId = map.get(MapKeyConst.FLIGHT_ID).toString();
+ String key = RedisConst.MEDIA_HIGHEST_PRIORITY_PREFIX + dockSn;
+ Object preJobId = RedisOpsUtils.get(key);
+
+ RedisOpsUtils.setWithExpire(key, jobId,
+ RedisConst.DEVICE_ALIVE_SECOND * 5);
+
+ DeviceDTO dock = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + dockSn);
+
+ sendMessageService.sendBatch(webSocketManageService.getValueWithWorkspaceAndUserType(dock.getWorkspaceId(), UserTypeEnum.WEB.getVal()),
+ CustomWebSocketMessage.builder()
+ .timestamp(System.currentTimeMillis())
+ .bizCode(BizCodeEnum.HIGHEST_PRIORITY_UPLOAD_FLIGHT_TASK_MEDIA.getCode())
+ .data(MediaFileCountDTO.builder()
+ .preJobId(Objects.nonNull(preJobId) ? preJobId.toString() : null)
+ .jobId(jobId).build())
+ .build());
+
+ messageSenderService.publish(headers.get(MqttHeaders.RECEIVED_TOPIC) + TopicConst._REPLY_SUF,
+ CommonTopicResponse.builder()
+ .data(RequestsReply.success())
+ .method(receiver.getMethod())
+ .timestamp(System.currentTimeMillis())
+ .bid(receiver.getBid())
+ .tid(receiver.getTid())
+ .build());
}
}
--
Gitblit v1.9.3