Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107
This commit is contained in:
@@ -188,12 +188,19 @@ public class MapSheetMngService {
|
||||
|
||||
log.info("isFiveDigitNumber : " + isFiveDigitNumber);
|
||||
if (isFiveDigitNumber) {
|
||||
uploadPath = Paths.get(referPath).getParent().toString() + "/" + errDto.getRefMapSheetNum();
|
||||
uploadPath =
|
||||
Paths.get(referPath).getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum()
|
||||
+ "/"
|
||||
+ errDto.getUuid();
|
||||
} else {
|
||||
uploadPath =
|
||||
Paths.get(referPath).getParent().getParent().toString()
|
||||
+ "/"
|
||||
+ errDto.getRefMapSheetNum();
|
||||
+ errDto.getRefMapSheetNum()
|
||||
+ "/"
|
||||
+ errDto.getUuid();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -206,6 +213,7 @@ public class MapSheetMngService {
|
||||
tifTargetPath = Paths.get(uploadPath).resolve(tifFile);
|
||||
|
||||
log.info("tfwTargetPath : " + tfwTargetPath.toString());
|
||||
log.info("tifTargetPath : " + tifTargetPath.toString());
|
||||
if (!Files.exists(tifTargetPath)) {
|
||||
return new DmlReturn("fail", "TIF 파일이 정상적으로 업로드 되지 않았습니다. 확인해주세요.");
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ public class ErrorLogRepositoryImpl extends QuerydslRepositorySupport
|
||||
errorLogEntity.errorMessage.as("errorMessage"),
|
||||
errorLogEntity.stackTrace.as("errorDetail"),
|
||||
Expressions.stringTemplate(
|
||||
"to_char({0}, 'YYYY-MM-DD')", errorLogEntity.createdDate)))
|
||||
"to_char({0}, 'YYYY-MM-DD HH24:MI:SS.FF3')", errorLogEntity.createdDate)))
|
||||
.from(errorLogEntity)
|
||||
.leftJoin(auditLogEntity)
|
||||
.on(errorLogEntity.id.eq(auditLogEntity.errorLogUid))
|
||||
|
||||
Reference in New Issue
Block a user