From 75e6eea8cd3fac9cc888e2ffc9cdb126fab8429d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 14 Aug 2024 15:45:55 +0800
Subject: [PATCH] 任务下发、更新、取消，优化图斑逻辑
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 14 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 5a75fa0..648305a 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,5 +1,9 @@
package com.dji.sample.media.service.impl;
+import com.aliyuncs.utils.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dji.sample.common.model.Pagination;
+import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.ChannelName;
import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
@@ -11,27 +15,34 @@
import com.dji.sample.component.websocket.service.ISendMessageService;
import com.dji.sample.manage.model.dto.DeviceDTO;
import com.dji.sample.manage.model.enums.UserTypeEnum;
+import com.dji.sample.manage.model.receiver.OsdSubDeviceReceiver;
import com.dji.sample.manage.service.IDeviceRedisService;
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.dao.IFileMapper;
+import com.dji.sample.media.model.*;
+import com.dji.sample.media.model.param.SearchMediaParam;
import com.dji.sample.media.service.IFileService;
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;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.MessageHeaders;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+import java.awt.*;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.stream.Collectors;
/**
@@ -64,13 +75,21 @@
@Autowired
private IDeviceRedisService deviceRedisService;
+ @Autowired
+ private IFileMapper mapper;
+
+ @Value("${oss.out-net-file-address}")
+ private String fileAddress;
+ @Value("${oss.bucket}")
+ private String bucket;
+
@Override
public Boolean fastUpload(String workspaceId, String fingerprint) {
return fileService.checkExist(workspaceId, fingerprint);
}
@Override
- public Integer saveMediaFile(String workspaceId, FileUploadDTO file) {
+ public Integer saveMediaFile(String workspaceId, FileUploadDTO file) throws IOException, ImageProcessingException {
return fileService.saveFile(workspaceId, file);
}
@@ -92,17 +111,31 @@
}
+ @Override
+ public PaginationData<MediaJobDTO> mediaPage(String workspaceId, SearchMediaParam param) {
+ param.setFileAddress(fileAddress + "/" + bucket);
+ Page<MediaJobDTO> waylineJobDTOPage = mapper.mediaPage(new Page<MediaJobDTO>(param.getPage(), param.getPageSize()), workspaceId, param);
+ return new PaginationData<MediaJobDTO>(waylineJobDTOPage.getRecords(), new Pagination(waylineJobDTOPage));
+ }
+
+ @Override
+ public PaginationData<MediaJobDTO> mediaDetail(String jobId, Long page, Long pageSize) {
+ Page<MediaJobDTO> waylineJobDTOPage = mapper.mediaDetail(new Page<MediaJobDTO>(page, pageSize), jobId, fileAddress + "/" + bucket);
+ return new PaginationData<MediaJobDTO>(waylineJobDTOPage.getRecords(), new Pagination(waylineJobDTOPage));
+ }
+
/**
* Handle media files messages reported by dock.
+ * 处理由dock报告的媒体文件消息。
+ *
* @param receiver
* @return
*/
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_FILE_UPLOAD_CALLBACK, outputChannel = ChannelName.OUTBOUND_EVENTS)
- public CommonTopicReceiver handleFileUploadCallBack(CommonTopicReceiver receiver) {
+ 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!");
+ log.error("媒体文件上传失败；Media file upload failed!");
return null;
}
@@ -123,7 +156,16 @@
if (jobOpt.isPresent()) {
boolean isSave = parseMediaFile(callback, jobOpt.get());
if (!isSave) {
- log.error("Failed to save the file to the database, please check the data manually.");
+ log.error("保存文件到数据库失败，请手动检查数据；Failed to save the file to the database, please check the data manually.");
+ return null;
+ }
+ } else if (!StringUtils.isEmpty(jobId)) { //一键起飞操作需要
+ WaylineJobDTO waylineJobDTO = new WaylineJobDTO();
+ waylineJobDTO.setWorkspaceId(device.getWorkspaceId());
+ waylineJobDTO.setDockSn(device.getDeviceSn());
+ boolean isSave = parseMediaFile(callback, waylineJobDTO);
+ if (!isSave) {
+ log.error("保存文件到数据库失败，请手动检查数据；Failed to save the file to the database, please check the data manually.");
return null;
}
}
@@ -134,12 +176,15 @@
/**
* update the uploaded count and notify web side
+ * 更新上传的计数并通知web端
+ *
* @param mediaFileCount
* @param receiver
* @param jobId
*/
private void notifyUploadedCount(MediaFileCountDTO mediaFileCount, CommonTopicReceiver receiver, String jobId, DeviceDTO dock) {
// Do not notify when files that do not belong to the route are uploaded.
+ //上传不属于该路线的文件时不进行通知。
if (Objects.isNull(mediaFileCount)) {
return;
}
@@ -149,10 +194,12 @@
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 (RedisOpsUtils.checkExist(highestKey) &&
jobId.equals(((MediaFileCountDTO) RedisOpsUtils.get(highestKey)).getJobId())) {
@@ -166,11 +213,12 @@
RedisOpsUtils.hashSet(key, jobId, mediaFileCount);
}
+ //通过websocket把数据发送给web
sendMessageService.sendBatch(dock.getWorkspaceId(), UserTypeEnum.WEB.getVal(),
- BizCodeEnum.FILE_UPLOAD_CALLBACK.getCode(), mediaFileCount);
+ 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()));
@@ -178,12 +226,15 @@
// 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;
+ 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
@@ -217,7 +268,7 @@
return null;
}
sendMessageService.sendBatch(deviceOpt.get().getWorkspaceId(), UserTypeEnum.WEB.getVal(),
- BizCodeEnum.HIGHEST_PRIORITY_UPLOAD_FLIGHT_TASK_MEDIA.getCode(), countDTO);
+ BizCodeEnum.HIGHEST_PRIORITY_UPLOAD_FLIGHT_TASK_MEDIA.getCode(), countDTO);
return receiver;
}
--
Gitblit v1.9.3