修改水印部分信息，添加图斑图片审核，大屏图斑图片添加水印

rain

2024-05-30 c00662a72ca1582c064a2bd76aa92fd22fbfedc6

 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
@@ -125,13 +126,13 @@
    /**
     * 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
@@ -215,7 +217,7 @@
                        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