From c00662a72ca1582c064a2bd76aa92fd22fbfedc6 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 30 May 2024 13:53:07 +0800
Subject: [PATCH] 修改水印部分信息，添加图斑图片审核，大屏图斑图片添加水印
---
src/main/java/com/dji/sample/media/service/impl/MediaServiceImpl.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 1ac5b12..2ef3439 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
@@ -15,6 +15,7 @@
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.dao.IFileMapper;
@@ -39,6 +40,8 @@
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;
/**
@@ -78,6 +81,7 @@
private String fileAddress;
@Value("${oss.bucket}")
private String bucket;
+
@Override
public Boolean fastUpload(String workspaceId, String fingerprint) {
return fileService.checkExist(workspaceId, fingerprint);
@@ -86,9 +90,6 @@
@Override
public Integer saveMediaFile(String workspaceId, FileUploadDTO file) {
return fileService.saveFile(workspaceId, file);
- }
- public Integer saveMediaMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException {
- return fileService.saveMarkFile(workspaceId, file);
}
@Override
@@ -111,27 +112,27 @@
@Override
public PaginationData<MediaJobDTO> mediaPage(String workspaceId, SearchMediaParam param) {
- param.setFileAddress(fileAddress+"/"+bucket);
+ 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);
+ 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 {
FileUploadCallback callback = objectMapper.convertValue(receiver.getData(), FileUploadCallback.class);
-
if (callback.getResult() != ResponseResult.CODE_SUCCESS) {
log.error("媒体文件上传失败；Media file upload failed!");
return null;
@@ -175,6 +176,7 @@
/**
* update the uploaded count and notify web side
* 更新上传的计数并通知web端
+ *
* @param mediaFileCount
* @param receiver
* @param jobId
@@ -212,10 +214,10 @@
//通过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 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()));
@@ -223,12 +225,29 @@
// set path
String objectKey = callback.getFile().getObjectKey();
callback.getFile().setPath(objectKey.substring(objectKey.indexOf("/") + 1, objectKey.lastIndexOf("/")));
+ try {
+ System.out.println(callback.getFile().toString());
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+ executor.execute(() -> {
+ try {
+ fileService.saveMarkFile(job.getWorkspaceId(), callback.getFile());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ executor.shutdown();
+ } catch (Exception e) {
+ log.error("方法执行有误==============: ", e);
+ throw e;
+ }
+
return fileService.saveFile(job.getWorkspaceId(), callback.getFile()) > 0;
}
/**
* Handles the highest priority message about media uploads.
+ *
* @param receiver
* @param headers
* @return
@@ -262,7 +281,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