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

rain

2024-07-30 d81fdeef2ad2f7ecc548cebad6ab15455bf3da27

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

@@ -230,14 +230,14 @@
    public ResponseResult importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,
                                        HttpServletRequest request, MultipartFile file,
                                        @RequestParam(required = false) String patchesId,
                                        @RequestParam(defaultValue = "1") String isTemp
                                        @RequestParam(defaultValue = "1",required = false) String isTemp
    ) {
        if (Objects.isNull(file)) {
            return ResponseResult.error("未上传文件");
        }
        CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
        String creator = customClaim.getUsername();
        String back = waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, isTemp);
        String back = waylineFileService.importKmzFile(file, workspaceId, creator, patchesId,isTemp);
        if (back != null) {
            return ResponseResult.error(back);
        }