shp 파일 geosjon 등록추가, 파일다운로드 파일명 오류 수정

src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java

@@ -25,10 +25,11 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.io.FileSystemResource;
@@ -45,7 +46,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.util.UriUtils;
 
 @Tag(name = "추론관리", description = "추론관리 API")
 @RequestMapping("/api/inference")
@@ -423,30 +423,32 @@ public class InferenceResultApiController {
       throws IOException {
 
     String path;
+    String uid;
     try {
-      path = String.valueOf(inferenceResultService.shpDownloadPath(uuid));
+      Map<String, Object> map = inferenceResultService.shpDownloadPath(uuid);
+      path = String.valueOf(map.get("path"));
+      uid = String.valueOf(map.get("uid"));
     } catch (CustomApiException e) {
-      // 데이터 없음 등  404
       return ResponseEntity.status(e.getStatus()).build();
     }
 
     Path zipPath = Path.of(path);
-    FileSystemResource resource = new FileSystemResource(zipPath);
 
-    if (!resource.exists() || !resource.isReadable()) {
+    if (!Files.exists(zipPath) || !Files.isReadable(zipPath)) {
       return ResponseEntity.notFound().build();
     }
 
-    String filename = zipPath.getFileName().toString();
-    String encodedFilename = UriUtils.encode(filename, StandardCharsets.UTF_8);
+    FileSystemResource resource = new FileSystemResource(zipPath);
+
+    String filename = uid + ".zip";
+
+    long fileSize = Files.size(zipPath);
 
     return ResponseEntity.ok()
         .contentType(MediaType.APPLICATION_OCTET_STREAM)
-        .header(
-            HttpHeaders.CONTENT_DISPOSITION,
-            "attachment; filename=\"" + filename + "\"; filename*=UTF-8''" + encodedFilename)
-        .contentLength(resource.contentLength())
-        .body((Resource) resource);
+        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
+        .contentLength(fileSize)
+        .body(resource);
   }
 
   @Operation(summary = "shp 파일 다운로드 이력", description = "추론관리 분석결과 shp 파일 다운로드 이력")

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java

@@ -41,6 +41,7 @@ import jakarta.validation.constraints.NotNull;
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -578,11 +579,16 @@ public class InferenceResultService {
    * @param uuid
    * @return
    */
-  public Path shpDownloadPath(UUID uuid) {
+  public Map<String, Object> shpDownloadPath(UUID uuid) {
     InferenceLearnDto dto = inferenceResultCoreService.getInferenceUid(uuid);
     String uid = dto.getUid();
+    Path path = Path.of(datasetDir).resolve(uid).resolve("merge").resolve(uid + ".zip");
 
-    return Path.of(datasetDir).resolve(uid).resolve("merge").resolve(uid + ".zip");
+    Map<String, Object> downloadMap = new HashMap<>();
+    downloadMap.put("uid", uid);
+    downloadMap.put("path", path);
+
+    return downloadMap;
   }
 
   /**