MVPTeam/kamco-cd-api
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107

Browse Source
This commit is contained in:
teddy
2026-01-27 21:32:03 +09:00
parent 56adcc8181 3445329d48
commit 4e3789b5ce
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
View File

@@ -182,12 +182,19 @@ public class MapSheetMngService {
MngFilesDto filesDto = MngFilesDto filesDto =
mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy()); mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
String referPath = filesDto.getFilePath(); String referPath = filesDto.getFilePath();
uploadPath = Path path = Paths.get(referPath);
Paths.get(referPath).getParent().getParent().toString() boolean isFiveDigitNumber =
+ "/" path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
+ errDto.getRefMapSheetNum()
+ "/" log.info("isFiveDigitNumber : " + isFiveDigitNumber);
+ errDto.getUuid(); if (isFiveDigitNumber) {
uploadPath = Paths.get(referPath).getParent().toString() + "/" + errDto.getRefMapSheetNum();
} else {
uploadPath =
Paths.get(referPath).getParent().getParent().toString()
+ "/"
+ errDto.getRefMapSheetNum();
}
} }
// 업로드 경로 확인(없으면 생성) // 업로드 경로 확인(없으면 생성)
@@ -198,6 +205,7 @@ public class MapSheetMngService {
tfwTargetPath = Paths.get(uploadPath).resolve(tfwFile.getOriginalFilename()); tfwTargetPath = Paths.get(uploadPath).resolve(tfwFile.getOriginalFilename());
tifTargetPath = Paths.get(uploadPath).resolve(tifFile); tifTargetPath = Paths.get(uploadPath).resolve(tifFile);
log.info("tfwTargetPath : " + tfwTargetPath.toString());
if (!Files.exists(tifTargetPath)) { if (!Files.exists(tifTargetPath)) {
return new DmlReturn("fail", "TIF 파일이 정상적으로 업로드 되지 않았습니다. 확인해주세요."); return new DmlReturn("fail", "TIF 파일이 정상적으로 업로드 되지 않았습니다. 확인해주세요.");
} }
@@ -390,10 +398,19 @@ public class MapSheetMngService {
MngFilesDto filesDto = MngFilesDto filesDto =
mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy()); mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
String referPath = filesDto.getFilePath(); String referPath = filesDto.getFilePath();
uploadPath = Path path = Paths.get(referPath);
Paths.get(referPath).getParent().getParent().toString() boolean isFiveDigitNumber =
+ "/" path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
+ errDto.getRefMapSheetNum();
log.info("isFiveDigitNumber : " + isFiveDigitNumber);
if (isFiveDigitNumber) {
uploadPath = Paths.get(referPath).getParent().toString() + "/" + errDto.getRefMapSheetNum();
} else {
uploadPath =
Paths.get(referPath).getParent().getParent().toString()
+ "/"
+ errDto.getRefMapSheetNum();
}
} }
upAddReqDto.setFinalPath(uploadPath + "/"); upAddReqDto.setFinalPath(uploadPath + "/");