From f18944226f95b8d9837222f0f91c3dc587f5ca4e Mon Sep 17 00:00:00 2001 From: Moon Date: Tue, 23 Dec 2025 17:15:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=B2=84=EB=9D=BC=EC=9D=B4=ED=8A=B8?= =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapsheet/MapSheetMngApiController.java | 5 +++-- .../mapsheet/service/MapSheetMngService.java | 22 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java index 36e4ea89..f71eb3fb 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java @@ -175,8 +175,9 @@ public class MapSheetMngApiController { public ApiResponseDto uploadPair( @RequestPart("tfw") MultipartFile tfwFile, @RequestPart("tif") MultipartFile tifFile, - @RequestParam(value = "hstUid", required = false) Long hstUid) { - return ApiResponseDto.createOK(mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid)); + @RequestParam(value = "hstUid", required = false) Long hstUid, + @RequestParam(value = "overwrite", required = false) boolean overwrite) { + return ApiResponseDto.createOK(mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid, overwrite)); } @Operation(summary = "영상관리 > 파일조회", description = "영상관리 > 파일조회") 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 2072a2ef..2518388b 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 @@ -74,12 +74,13 @@ public class MapSheetMngService { } @Transactional - public DmlReturn uploadPair(MultipartFile tfwFile, MultipartFile tifFile, Long hstUid) { + public DmlReturn uploadPair(MultipartFile tfwFile, MultipartFile tifFile, Long hstUid, Boolean overwrite) { String rootPath = fileConfig.getRootSyncDir(); String tmpPath = fileConfig.getTmpSyncDir(); ErrorDataDto errDto = mapSheetMngCoreService.findMapSheetError(hstUid); + if (errDto == null) { return new DmlReturn("fail", "NO hstUid Data"); } @@ -125,14 +126,19 @@ public class MapSheetMngService { .filter(dto -> dto.getExtension().toString().equals("tif")) .count(); - if (tfwCnt > 0 || tifCnt > 0) { - String tfwtifMsg = ""; - if (tfwCnt > 0) tfwtifMsg = tfwFile.getOriginalFilename(); - if (tifCnt > 0) { - if (tfwCnt > 0) tfwtifMsg = "," + tifFile.getOriginalFilename(); - else tfwtifMsg = tifFile.getOriginalFilename(); + if( !overwrite ) { + if (tfwCnt > 0 || tifCnt > 0) { + String tfwtifMsg = ""; + if (tfwCnt > 0) + tfwtifMsg = tfwFile.getOriginalFilename(); + if (tifCnt > 0) { + if (tfwCnt > 0) + tfwtifMsg = "," + tifFile.getOriginalFilename(); + else + tfwtifMsg = tifFile.getOriginalFilename(); + } + return new DmlReturn("duplicate", tfwtifMsg); } - return new DmlReturn("duplicate", tfwtifMsg); } File directory = new File(tmpPath);