航线问题修复，水印格式修改，图斑图片加水印

rain

2024-05-22 b35dd737c03ee80d45753939ade49a59f556197f

 src/main/java/com/dji/sample/media/controller/FileController.java

@@ -1,16 +1,21 @@
package com.dji.sample.media.controller;

import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.media.model.MediaFileDTO;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.media.model.MediaFileQueryParam;
import com.dji.sample.media.service.IFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URL;

import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;

/**
 * @author sean
@@ -31,13 +36,35 @@
     * @return
     */
    @GetMapping("/{workspace_id}/files")
    public ResponseResult<PaginationData<MediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
    public ResponseResult<PaginationData<MediaFileEntity>> getFilesList(@RequestParam(defaultValue = "1") Long page,
                                                                     @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
                                                                     @PathVariable(name = "workspace_id") String workspaceId,
                                                                     MediaFileQueryParam mediaFileQueryParam) {
        PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
                                                                      MediaFileQueryParam mediaFileQueryParam) {
        PaginationData<MediaFileEntity> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,mediaFileQueryParam);
        return ResponseResult.success(filesList);
    }

    @GetMapping("/{workspace_id}/files/{job_id}")
    public ResponseResult findFilesList(@PathVariable(name = "workspace_id") String workspaceId,@PathVariable(name = "job_id") String jobId) {
        return ResponseResult.success(fileService.listMediaFileEntity(workspaceId,jobId));
    }

    @PostMapping("/{workspace_id}/updateFile")
    public ResponseResult updateFile(HttpServletRequest request, @PathVariable(name = "workspace_id") String workspaceId, @RequestBody MediaFileEntity mediaFileEntity) {
        CustomClaim claims = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
        mediaFileEntity.setUserId(claims.getId());
        return ResponseResult.success(fileService.updateMediaFile(workspaceId, mediaFileEntity));
    }
    @DeleteMapping("/{workspace_id}/deleteFile")

    public ResponseResult deleteFile(@PathVariable(name = "workspace_id") String workspaceId, @RequestParam String fileId) {
        int count=fileService.deleteMedia(workspaceId, fileId);
        if(count==0){
            return ResponseResult.error("删除失败");
        }
        return ResponseResult.success();
    }


    /**
     * Query the download address of the file according to the media file id,
@@ -57,4 +84,16 @@
            e.printStackTrace();
        }
    }
//    @PostMapping("/{workspace_id}/files/download")
//    public ResponseResult<String> waterMarkFile(){
//        //获取media实体信息
//
//        //对mediaUrl进行下载
//
//        //对图片进行水印
//
//        //将带有水印的图片存入本地
//
//        //将链接返回
//    }
}