From f1f8753fbbb4af3eb7201fd056c63aee894e176a Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 26 Jan 2026 15:26:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?batchId=20list=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/InferenceResultCoreService.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java index edcdaf2c..9dda7e4c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java @@ -38,8 +38,10 @@ import jakarta.validation.constraints.NotNull; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.UUID; import java.util.function.Consumer; +import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.dao.DataAccessException; @@ -263,10 +265,12 @@ public class InferenceResultCoreService { applyModelUpdate(entity, request); } - List batchIds = new ArrayList<>(); - batchIds.add(entity.getM1ModelBatchId()); - batchIds.add(entity.getM2ModelBatchId()); - batchIds.add(entity.getM3ModelBatchId()); + List batchIds = + Stream.of( + entity.getM1ModelBatchId(), entity.getM2ModelBatchId(), entity.getM3ModelBatchId()) + .filter(Objects::nonNull) + .distinct() // 중복 방지 (선택) + .toList(); // testing 추론결과 테이블 조회하여 탐지 개수 업데이트 Long testing = getInferenceResultCnt(batchIds); @@ -509,10 +513,7 @@ public class InferenceResultCoreService { if (entity == null) { throw new CustomApiException("NOT_FOUND_DATA", HttpStatus.NOT_FOUND); } - // inferenceResultRepository - // .getInferenceUid(uuid) - // .orElseThrow(() -> new CustomApiException("NOT_FOUND_DATA", - // HttpStatus.NOT_FOUND)); + InferenceLearnDto dto = new InferenceLearnDto(); dto.setUid(entity.getUid()); dto.setM1ModelBatchId(entity.getM1ModelBatchId()); From 1ed4a1eeee096ecd12a46017ebcc8ddedab4753b Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 26 Jan 2026 15:33:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=B6=94=EB=A1=A0=20=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4=20inference=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20uuid=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java | 5 ++++- .../repository/Inference/MapSheetLearnRepositoryImpl.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java index 536a9f4e..60efb52c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java @@ -457,6 +457,7 @@ public class InferenceDetailDto { private String bboxGeom; private String bboxCenterPoint; + private UUID inferenceUuid; public AnalResultInfo( String analTitle, @@ -472,7 +473,8 @@ public class InferenceDetailDto { Integer stage, String subUid, Boolean applyYn, - ZonedDateTime applyDttm) { + ZonedDateTime applyDttm, + UUID inferenceUuid) { this.analTitle = analTitle; this.modelVer1 = modelVer1; this.modelVer2 = modelVer2; @@ -502,6 +504,7 @@ public class InferenceDetailDto { this.elapsedDuration = String.format("%02d:%02d:%02d", h, m, s); } + this.inferenceUuid = inferenceUuid; } @JsonProperty("bboxGeom") diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index 7a210a0f..1fea40a5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -328,7 +328,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto mapSheetLearnEntity.stage, Expressions.stringTemplate("substring({0} from 1 for 8)", mapSheetLearnEntity.uid), mapSheetLearnEntity.applyYn, - mapSheetLearnEntity.applyDttm)) + mapSheetLearnEntity.applyDttm, + mapSheetAnalInferenceEntity.uuid)) .from(mapSheetLearnEntity) .leftJoin(m1) .on(mapSheetLearnEntity.m1ModelUuid.eq(m1.uuid)) @@ -336,6 +337,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto .on(mapSheetLearnEntity.m2ModelUuid.eq(m2.uuid)) .leftJoin(m3) .on(mapSheetLearnEntity.m3ModelUuid.eq(m3.uuid)) + .leftJoin(mapSheetAnalInferenceEntity) + .on(mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id)) .where(mapSheetLearnEntity.uuid.eq(uuid)) .fetchOne(); }