From 48657ad662c1a21c8a0620553564fa15e26f07db Mon Sep 17 00:00:00 2001 From: Moon Date: Tue, 23 Dec 2025 13:04:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=81=EC=83=81=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/mapsheet/service/MapSheetMngService.java | 5 +++-- .../repository/mapsheet/MapSheetMngRepositoryImpl.java | 4 ++-- .../kamcoback/scheduler/MapSheetMngFileJobApiController.java | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java index 0fcf9706..2072a2ef 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java @@ -169,8 +169,6 @@ public class MapSheetMngService { mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy()); String referPath = filesDto.getFilePath(); uploadPath = Paths.get(referPath).getParent().toString() + "/" + errDto.getRefMapSheetNum(); - tfwTargetPath = Paths.get(uploadPath).resolve(tfwFile.getOriginalFilename()); - tifTargetPath = Paths.get(uploadPath).resolve(tifFile.getOriginalFilename()); } // 업로드 경로 확인(없으면 생성) @@ -178,6 +176,9 @@ public class MapSheetMngService { return new DmlReturn("fail", "CREATE FOLDER ERROR"); } + tfwTargetPath = Paths.get(uploadPath).resolve(tfwFile.getOriginalFilename()); + tifTargetPath = Paths.get(uploadPath).resolve(tifFile.getOriginalFilename()); + try { Files.move(tfwTmpSavePath, tfwTargetPath, StandardCopyOption.REPLACE_EXISTING); Files.move(tifTmpSavePath, tifTargetPath, StandardCopyOption.REPLACE_EXISTING); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index c06debf0..8ccb6094 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -369,7 +369,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) .as("map50kName"), Expressions.stringTemplate( - "concat({0},substring({1}, 6, 8))", + "concat({0},{1})", mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) .as("map5kName"), Expressions.stringTemplate( @@ -427,7 +427,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) .as("map50kName"), Expressions.stringTemplate( - "concat({0},substring({1}, 6, 8))", + "({0},{1})", mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum) .as("map5kName"), Expressions.stringTemplate( diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobApiController.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobApiController.java index 5865726a..3ddb6c1f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/MapSheetMngFileJobApiController.java @@ -39,7 +39,8 @@ public class MapSheetMngFileJobApiController { }) @PutMapping("/mng-sync-job") public ApiResponseDto mngSyncOnOff( - @RequestParam boolean jobStart, @RequestParam int pageSize) { + @RequestParam boolean jobStart, + @RequestParam int pageSize) { mapSheetMngFileJobController.setSchedulerEnabled(jobStart); mapSheetMngFileJobController.setMngSyncPageSize(pageSize);