inference_hard_coding
This commit is contained in:
@@ -47,7 +47,6 @@ public class MapSheetMngService {
|
||||
private final UploadService uploadService;
|
||||
private final UserUtil userUtil = new UserUtil();
|
||||
|
||||
|
||||
@Value("${file.root}")
|
||||
private String nfsRootDir;
|
||||
|
||||
@@ -74,8 +73,8 @@ public class MapSheetMngService {
|
||||
// List조회
|
||||
Page<YearEntity> years = mapSheetMngCoreService.getListMapListYYYYWithPaging(req);
|
||||
return years.map(YearEntity::getYyyy).getContent().stream()
|
||||
.sorted(Comparator.reverseOrder())
|
||||
.toList();
|
||||
.sorted(Comparator.reverseOrder())
|
||||
.toList();
|
||||
}
|
||||
|
||||
public MngDto findMapSheetMng(int mngYyyy) {
|
||||
@@ -113,7 +112,7 @@ public class MapSheetMngService {
|
||||
|
||||
@Transactional
|
||||
public DmlReturn uploadPair(
|
||||
MultipartFile tfwFile, String tifFile, Long hstUid, Long tifFileSize) {
|
||||
MultipartFile tfwFile, String tifFile, Long hstUid, Long tifFileSize) {
|
||||
|
||||
String tmpPath = syncTmpDir;
|
||||
|
||||
@@ -136,7 +135,7 @@ public class MapSheetMngService {
|
||||
return dmlReturn;
|
||||
}
|
||||
|
||||
//TODO 삭제?
|
||||
// TODO 삭제?
|
||||
MngDto mngDto = mapSheetMngCoreService.findMapSheetMng(errDto.getMngYyyy());
|
||||
|
||||
// 중복체크 -> 도엽50k/uuid 경로에 업로드 할 거라 overwrite 되지 않음
|
||||
@@ -183,27 +182,27 @@ public class MapSheetMngService {
|
||||
// 파일이 존재하지 않을 경우(0개) 해당년도 다른 파일경로로 참조
|
||||
if (uploadPath.isEmpty()) {
|
||||
MngFilesDto filesDto =
|
||||
mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
|
||||
mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
|
||||
String referPath = filesDto.getFilePath();
|
||||
Path path = Paths.get(referPath);
|
||||
boolean isFiveDigitNumber =
|
||||
path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
|
||||
path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
|
||||
|
||||
log.info("isFiveDigitNumber : " + isFiveDigitNumber);
|
||||
if (isFiveDigitNumber) {
|
||||
uploadPath =
|
||||
Paths.get(referPath).getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum()
|
||||
+ "/"
|
||||
+ errDto.getUuid();
|
||||
Paths.get(referPath).getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum()
|
||||
+ "/"
|
||||
+ errDto.getUuid();
|
||||
} else {
|
||||
uploadPath =
|
||||
Paths.get(referPath).getParent().getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum()
|
||||
+ "/"
|
||||
+ errDto.getUuid();
|
||||
Paths.get(referPath).getParent().getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum()
|
||||
+ "/"
|
||||
+ errDto.getUuid();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -230,7 +229,7 @@ public class MapSheetMngService {
|
||||
|
||||
// hst업데이트
|
||||
MapSheetMngDto.SyncCheckStateReqUpdateDto updReqSyncCheckState =
|
||||
new MapSheetMngDto.SyncCheckStateReqUpdateDto();
|
||||
new MapSheetMngDto.SyncCheckStateReqUpdateDto();
|
||||
updReqSyncCheckState.setHstUid(hstUid);
|
||||
updReqSyncCheckState.setFilePath(uploadPath);
|
||||
updReqSyncCheckState.setSyncCheckTfwFileName(tfwFile.getOriginalFilename());
|
||||
@@ -277,7 +276,7 @@ public class MapSheetMngService {
|
||||
DmlReturn dmlReturn = new DmlReturn("success", "정상처리되었습니다.");
|
||||
|
||||
MapSheetMngDto.SyncCheckStateReqUpdateDto reqDto =
|
||||
new MapSheetMngDto.SyncCheckStateReqUpdateDto();
|
||||
new MapSheetMngDto.SyncCheckStateReqUpdateDto();
|
||||
|
||||
for (Long uid : fileUids) {
|
||||
MapSheetMngDto.MngFilesDto dto = mapSheetMngCoreService.findByFileUidMapSheetFile(uid);
|
||||
@@ -344,13 +343,13 @@ public class MapSheetMngService {
|
||||
|
||||
log.info("[FIND_FOLDER] DIR : {}", dirPath);
|
||||
List<FIleChecker.Folder> folderList =
|
||||
FIleChecker.getFolderAll(dirPath, nfsRootDir).stream()
|
||||
.filter(dir -> dir.getIsValid().equals(true))
|
||||
.toList();
|
||||
FIleChecker.getFolderAll(dirPath, nfsRootDir).stream()
|
||||
.filter(dir -> dir.getIsValid().equals(true))
|
||||
.toList();
|
||||
|
||||
int folderTotCnt = folderList.size();
|
||||
int folderErrTotCnt =
|
||||
(int) folderList.stream().filter(dto -> dto.getIsValid().equals(false)).count();
|
||||
(int) folderList.stream().filter(dto -> dto.getIsValid().equals(false)).count();
|
||||
|
||||
return new FoldersDto(dirPath, folderTotCnt, folderErrTotCnt, folderList);
|
||||
}
|
||||
@@ -362,14 +361,14 @@ public class MapSheetMngService {
|
||||
int endPos = srchDto.getEndPos();
|
||||
|
||||
List<FIleChecker.Basic> files =
|
||||
FIleChecker.getFilesFromAllDepth(
|
||||
srchDto.getDirPath(),
|
||||
"*",
|
||||
srchDto.getExtension(),
|
||||
1,
|
||||
srchDto.getSortType(),
|
||||
startPos,
|
||||
endPos);
|
||||
FIleChecker.getFilesFromAllDepth(
|
||||
srchDto.getDirPath(),
|
||||
"*",
|
||||
srchDto.getExtension(),
|
||||
1,
|
||||
srchDto.getSortType(),
|
||||
startPos,
|
||||
endPos);
|
||||
|
||||
int fileListPos = 0;
|
||||
int fileTotCnt = files.size();
|
||||
@@ -386,18 +385,18 @@ public class MapSheetMngService {
|
||||
|
||||
List<MngDto> mngList = mapSheetMngCoreService.findMapSheetMngList();
|
||||
List<MngYyyyDto> yearList =
|
||||
mngList.stream()
|
||||
.filter(
|
||||
dto -> "DONE".equals(dto.getMngState()) || "TAKINGERROR".equals(dto.getMngState()))
|
||||
.map(dto -> new MngYyyyDto(dto.getMngYyyy(), dto.getMngPath()))
|
||||
.toList();
|
||||
mngList.stream()
|
||||
.filter(
|
||||
dto -> "DONE".equals(dto.getMngState()) || "TAKINGERROR".equals(dto.getMngState()))
|
||||
.map(dto -> new MngYyyyDto(dto.getMngYyyy(), dto.getMngPath()))
|
||||
.toList();
|
||||
|
||||
return yearList;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public ModelUploadResDto uploadChunkMapSheetFile(
|
||||
Long hstUid, UploadAddReq upAddReqDto, MultipartFile chunkFile) throws IOException {
|
||||
Long hstUid, UploadAddReq upAddReqDto, MultipartFile chunkFile) throws IOException {
|
||||
|
||||
ErrorDataDto errDto = mapSheetMngCoreService.findMapSheetError(hstUid);
|
||||
|
||||
@@ -411,20 +410,20 @@ public class MapSheetMngService {
|
||||
|
||||
if (uploadPath.isEmpty()) {
|
||||
MngFilesDto filesDto =
|
||||
mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
|
||||
mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
|
||||
String referPath = filesDto.getFilePath();
|
||||
Path path = Paths.get(referPath);
|
||||
boolean isFiveDigitNumber =
|
||||
path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
|
||||
path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
|
||||
|
||||
log.info("isFiveDigitNumber : " + isFiveDigitNumber);
|
||||
if (isFiveDigitNumber) {
|
||||
uploadPath = Paths.get(referPath).getParent().toString() + "/" + errDto.getRefMapSheetNum();
|
||||
} else {
|
||||
uploadPath =
|
||||
Paths.get(referPath).getParent().getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum();
|
||||
Paths.get(referPath).getParent().getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -447,7 +446,7 @@ public class MapSheetMngService {
|
||||
|
||||
// upload_id, uuid 를 update
|
||||
mapSheetMngCoreService.updateMapSheetMngHstUploadId(
|
||||
hstUid, upAddReqDto.getUuid(), upRes.getUploadId());
|
||||
hstUid, upAddReqDto.getUuid(), upRes.getUploadId());
|
||||
}
|
||||
|
||||
modelUploadResDto.setRes(upRes.getRes());
|
||||
|
||||
Reference in New Issue
Block a user