Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-04-08 c1915a7e947710572826a746e975e8d09516a0e7

 src/main/java/com/dji/sample/wayline/controller/WaylineFileController.java

@@ -3,13 +3,16 @@
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.common.util.MinioUrlUtils;
import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.wayline.model.dto.WaylineFileDTO;
import com.dji.sample.wayline.model.dto.WaylineFileUploadDTO;
import com.dji.sample.wayline.model.dto.WaylineListDTO;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.model.param.WaylineQueryParam;
import com.dji.sample.wayline.service.IWaylineFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -78,7 +81,7 @@

        try {
            URL url = waylineFileService.getObjectUrl(workspaceId, waylineId);
            response.sendRedirect(url.toString());
            response.sendRedirect(MinioUrlUtils.getUrl(url));

        } catch (IOException | SQLException e) {
            e.printStackTrace();
@@ -96,7 +99,7 @@
        } catch (SQLException e) {
            throw new RuntimeException(e);
        }
        return ResponseResult.success(url);
        return ResponseResult.success(MinioUrlUtils.getUrl(url));
    }

    /**
@@ -204,7 +207,19 @@

    @GetMapping("/{workspace_id}/waylines_list")
    @SysLogAnnotation(operModul = "航线库", operType = "查询", operDesc = "查询当前工作区航线库列表")
    public ResponseResult<List<WaylineListDTO>> waylineList(@PathVariable(name = "workspace_id") String workspaceId) {
        return ResponseResult.success(waylineFileService.waylineList(workspaceId)) ;
    public ResponseResult<List<WaylineListDTO>> waylineList(@PathVariable(name = "workspace_id") String workspaceId,String droneName) {
        return ResponseResult.success(waylineFileService.waylineList(workspaceId,droneName)) ;
    }

    @PutMapping("/{workspace_id}/wayline_update")
    public ResponseResult upWayline(@RequestParam String waylineId,@RequestParam String name){
        WaylineFileEntity entity=WaylineFileEntity
                .builder()
                .waylineId(waylineId)
                .name(name)
                .build();
        if(waylineFileService.updateWayline(entity)==0){
            return ResponseResult.error("更新失败");
        }else return ResponseResult.success();
    }
}