diff --git a/src/main/java/com/kamco/cd/training/dataset/DatasetClsApiController.java b/src/main/java/com/kamco/cd/training/dataset/DatasetClsApiController.java index 3ab4816..d9aca3c 100644 --- a/src/main/java/com/kamco/cd/training/dataset/DatasetClsApiController.java +++ b/src/main/java/com/kamco/cd/training/dataset/DatasetClsApiController.java @@ -236,21 +236,11 @@ public class DatasetClsApiController { return ApiResponseDto.okObject(datasetClsService.insertDataset(addReq)); } - @Operation(summary = "객체별 파일 Path 조회", description = "파일 Path 조회") + @Operation(summary = "분류데이터셋 객체별 파일 Path 조회", description = "파일 Path 조회") @GetMapping("/files") - public ResponseEntity getFile(@RequestParam UUID uuid, @RequestParam String pathType) - throws Exception { + public ResponseEntity getFile(@RequestParam UUID uuid) throws Exception { - String path = datasetClsService.getFilePathByUUIDPathType(uuid, pathType); - return datasetClsService.getFilePathByFile(path); - } - - @Operation(summary = "객체별 파일 Path 조회", description = "파일 Path 조회") - @GetMapping("/files-to86") - public ResponseEntity getFileTo86( - @RequestParam UUID uuid, @RequestParam String pathType) throws Exception { - - String path = datasetClsService.getFilePathByUUIDPathType(uuid, pathType); + String path = datasetClsService.getFilePathByUUIDPathTif(uuid); return datasetClsService.getFilePathByFile(path); } diff --git a/src/main/java/com/kamco/cd/training/dataset/service/DatasetClsService.java b/src/main/java/com/kamco/cd/training/dataset/service/DatasetClsService.java index 407563e..a0fcd56 100644 --- a/src/main/java/com/kamco/cd/training/dataset/service/DatasetClsService.java +++ b/src/main/java/com/kamco/cd/training/dataset/service/DatasetClsService.java @@ -818,4 +818,8 @@ public class DatasetClsService { "이미 등록된 회차 데이터 파일입니다. 확인 부탁드립니다."); } } + + public String getFilePathByUUIDPathTif(UUID uuid) { + return datasetClsCoreService.getFilePathByUUIDPathTif(uuid); + } } diff --git a/src/main/java/com/kamco/cd/training/postgres/core/DatasetClsCoreService.java b/src/main/java/com/kamco/cd/training/postgres/core/DatasetClsCoreService.java index c2d4c08..437447f 100644 --- a/src/main/java/com/kamco/cd/training/postgres/core/DatasetClsCoreService.java +++ b/src/main/java/com/kamco/cd/training/postgres/core/DatasetClsCoreService.java @@ -275,4 +275,8 @@ public class DatasetClsCoreService public void insertDatasetClsObj(DatasetObjDto.DatasetClsObjRegDto objRegDto) { datasetClsRepository.insertDatasetClsObj(objRegDto); } + + public String getFilePathByUUIDPathTif(UUID uuid) { + return datasetClsRepository.getFilePathByUUIDPathType(uuid); + } } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryCustom.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryCustom.java index 5deb299..ef20dd2 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryCustom.java @@ -43,4 +43,6 @@ public interface DatasetClsRepositoryCustom { Page searchDatasetClsObjectList(DatasetClsObjDto.ClsSearchReq searchReq); void insertDatasetClsObj(DatasetObjDto.DatasetClsObjRegDto objRegDto); + + String getFilePathByUUIDPathType(UUID uuid); } diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryImpl.java index 7a5df7c..5c22814 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetClsRepositoryImpl.java @@ -656,4 +656,13 @@ public class DatasetClsRepositoryImpl implements DatasetClsRepositoryCustom { throw new RuntimeException(e); } } + + @Override + public String getFilePathByUUIDPathType(UUID uuid) { + return queryFactory + .select(datasetClsObjEntity.tifImgPath) + .from(datasetClsObjEntity) + .where(datasetClsObjEntity.uuid.eq(uuid)) + .fetchOne(); + } }