MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat/infer_dev_260107' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/infer_dev_260107

Browse Source
This commit is contained in:
Moon
2026-01-15 14:30:33 +09:00
parent f46d15ef09 6f14dbfc0f
commit 901c2d7d11
6 changed files with 90 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java
View File

@@ -772,34 +772,47 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
public TrainingDataLabelDto.CogImageResponse getCogImageUrl(
String mapSheetNum, Integer beforeYear, Integer afterYear) {
try {
// beforeYear COG URL 조회
String beforeCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(beforeYear))
.fetchFirst();
// 최소 하나의 년도는 제공되어야 함
if (beforeYear == null && afterYear == null) {
throw new IllegalArgumentException("At least one year parameter (beforeYear or afterYear) must be provided");
}
// afterYear COG URL 조회
String afterCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(afterYear))
.fetchFirst();
String beforeCogUrl = null;
String afterCogUrl = null;
if (beforeCogUrl == null && afterCogUrl == null) {
// beforeYear가 제공된 경우 COG URL 조회
if (beforeYear != null) {
beforeCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(beforeYear))
.fetchFirst();
}
// afterYear가 제공된 경우 COG URL 조회
if (afterYear != null) {
afterCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(afterYear))
.fetchFirst();
}
// 제공된 년도에 대해 하나도 찾지 못한 경우에만 예외 발생
if ((beforeYear != null && beforeCogUrl == null) && (afterYear != null && afterCogUrl == null)) {
throw new RuntimeException(
"COG images not found for mapSheetNum: "
+ mapSheetNum
+ ", years: "
+ beforeYear
+ ", "
+ afterYear);
+ (beforeYear != null ? beforeYear : "")
+ (beforeYear != null && afterYear != null ? ", " : "")
+ (afterYear != null ? afterYear : ""));
}
return TrainingDataLabelDto.CogImageResponse.builder()
@@ -817,9 +830,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
"Failed to get COG image URLs for mapSheetNum: "
+ mapSheetNum
+ ", years: "
+ beforeYear
+ ", "
+ afterYear,
+ (beforeYear != null ? beforeYear : "")
+ (beforeYear != null && afterYear != null ? ", " : "")
+ (afterYear != null ? afterYear : ""),
e);
}
}

63
src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java
View File

@@ -776,34 +776,47 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
public TrainingDataReviewDto.CogImageResponse getCogImageUrl(
String mapSheetNum, Integer beforeYear, Integer afterYear) {
try {
// beforeYear COG URL 조회
String beforeCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(beforeYear))
.fetchFirst();
// 최소 하나의 년도는 제공되어야 함
if (beforeYear == null && afterYear == null) {
throw new IllegalArgumentException("At least one year parameter (beforeYear or afterYear) must be provided");
}
// afterYear COG URL 조회
String afterCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(afterYear))
.fetchFirst();
String beforeCogUrl = null;
String afterCogUrl = null;
if (beforeCogUrl == null && afterCogUrl == null) {
// beforeYear가 제공된 경우 COG URL 조회
if (beforeYear != null) {
beforeCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(beforeYear))
.fetchFirst();
}
// afterYear가 제공된 경우 COG URL 조회
if (afterYear != null) {
afterCogUrl =
queryFactory
.select(
Expressions.stringTemplate(
"{0} || {1}", imageryEntity.cogMiddlePath, imageryEntity.cogFilename))
.from(imageryEntity)
.where(imageryEntity.scene5k.eq(mapSheetNum), imageryEntity.year.eq(afterYear))
.fetchFirst();
}
// 제공된 년도에 대해 하나도 찾지 못한 경우에만 예외 발생
if ((beforeYear != null && beforeCogUrl == null) && (afterYear != null && afterCogUrl == null)) {
throw new RuntimeException(
"COG images not found for mapSheetNum: "
+ mapSheetNum
+ ", years: "
+ beforeYear
+ ", "
+ afterYear);
+ (beforeYear != null ? beforeYear : "")
+ (beforeYear != null && afterYear != null ? ", " : "")
+ (afterYear != null ? afterYear : ""));
}
return TrainingDataReviewDto.CogImageResponse.builder()
@@ -821,9 +834,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport
"Failed to get COG image URLs for mapSheetNum: "
+ mapSheetNum
+ ", years: "
+ beforeYear
+ ", "
+ afterYear,
+ (beforeYear != null ? beforeYear : "")
+ (beforeYear != null && afterYear != null ? ", " : "")
+ (afterYear != null ? afterYear : ""),
e);
}
}