From 71b835d37f725cff1f47b1f1b1e7d19a8910ea3f Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 26 Jan 2026 10:01:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=98=81=EA=B5=AC=EC=B6=94=EB=A1=A0?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=ED=95=B4=EB=8F=84=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=EC=97=90=20=ED=8F=AC=ED=95=A8=EB=90=A8=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 --- .../mapsheet/MapSheetMngRepositoryImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index 99cb8012..7fae7e68 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -388,7 +388,11 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport mapSheetMngHstEntity.syncCheckTifFileName)) .from(mapSheetMngHstEntity) .innerJoin(mapInkx5kEntity) - .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo)) + .on( + mapSheetMngHstEntity + .mapSheetNum + .eq(mapInkx5kEntity.mapidcdNo) + .and(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE))) .where(whereBuilder) .orderBy(mapSheetMngHstEntity.createdDate.desc()) .offset(pageable.getOffset()) @@ -400,7 +404,11 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport .select(mapSheetMngHstEntity.hstUid.count()) .from(mapSheetMngHstEntity) .innerJoin(mapInkx5kEntity) - .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo)) + .on( + mapSheetMngHstEntity + .mapSheetNum + .eq(mapInkx5kEntity.mapidcdNo) + .and(mapInkx5kEntity.useInference.eq(CommonUseStatus.USE))) .where(whereBuilder) .fetchOne(); From 4373237cc19f6baf17317103f77452678c70937a Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 26 Jan 2026 11:20:46 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=9D=98=20?= =?UTF-8?q?=ED=83=90=EC=A7=80=EA=B1=B4=EC=88=98=EC=99=80=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EC=9D=98=20=ED=83=90=EC=A7=80=EA=B1=B4=EC=88=98=20?= =?UTF-8?q?=EB=B6=88=EC=9D=BC=EC=B9=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/InferenceResultCoreService.java | 20 +++++++++++--- ...ferenceResultsTestingRepositoryCustom.java | 2 ++ ...InferenceResultsTestingRepositoryImpl.java | 26 ++++++++++++++++++- 3 files changed, 44 insertions(+), 4 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 38423c6c..1f0202c8 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 @@ -58,7 +58,7 @@ public class InferenceResultCoreService { private final MapInkx5kRepository mapInkx5kRepository; private final MapSheetLearn5kRepository mapSheetLearn5kRepository; private final InferenceResultRepository inferenceResultRepository; - private final InferenceResultsTestingRepository inferenceResultsTetingRepository; + private final InferenceResultsTestingRepository inferenceResultsTestingRepository; private final EntityManager entityManager; private final UserUtil userUtil; @@ -110,7 +110,8 @@ public class InferenceResultCoreService { mapSheetLearnEntity.setDetectOption(req.getDetectOption()); mapSheetLearnEntity.setCreatedUid(userUtil.getId()); mapSheetLearnEntity.setMapSheetCnt(mapSheetName); - mapSheetLearnEntity.setDetectingCnt((long) detectingCnt); + // 도엽건수가 아니라 실제 탐지건수(polygon), 추론 1분 배치에서 업데이트 + mapSheetLearnEntity.setDetectingCnt(0L); // 회차는 국유인 반영할때 update로 변경됨 // mapSheetLearnEntity.setStage( // mapSheetLearnRepository.getLearnStage(req.getCompareYyyy(), req.getTargetYyyy())); @@ -263,6 +264,14 @@ public class InferenceResultCoreService { applyModelUpdate(entity, request); } + List batchIds = new ArrayList<>(); + batchIds.add(entity.getM1ModelBatchId()); + batchIds.add(entity.getM2ModelBatchId()); + batchIds.add(entity.getM3ModelBatchId()); + + // testing 추론결과 테이블 조회하여 탐지 개수 업데이트 + Long testing = getInferenceResultCnt(batchIds); + // 공통 영역 업데이트 applyIfNotNull(request.getRunningModelType(), entity::setRunningModelType); applyIfNotNull(request.getInferStartDttm(), entity::setInferStartDttm); @@ -272,6 +281,7 @@ public class InferenceResultCoreService { applyIfNotNull(request.getDetectEndCnt(), entity::setDetectEndCnt); applyIfNotNull(request.getStatus(), entity::setStatus); applyIfNotNull(request.getUpdateUid(), entity::setUpdatedUid); + applyIfNotNull(testing, entity::setDetectingCnt); entity.setUpdatedDttm(ZonedDateTime.now()); } @@ -481,10 +491,14 @@ public class InferenceResultCoreService { */ public List getInferenceResults(List batchIds) { List list = - inferenceResultsTetingRepository.getInferenceResultList(batchIds); + inferenceResultsTestingRepository.getInferenceResultList(batchIds); return list.stream().map(InferenceResultsTestingDto.ShpDto::fromEntity).toList(); } + public Long getInferenceResultCnt(List batchIds) { + return inferenceResultsTestingRepository.getInferenceResultCnt(batchIds); + } + /** * uid 조회 * diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryCustom.java index 0e199f75..79326d61 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryCustom.java @@ -6,4 +6,6 @@ import java.util.List; public interface InferenceResultsTestingRepositoryCustom { List getInferenceResultList(List batchIds); + + Long getInferenceResultCnt(List batchIds); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryImpl.java index 03599071..2459d1c6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultsTestingRepositoryImpl.java @@ -20,7 +20,31 @@ public class InferenceResultsTestingRepositoryImpl return queryFactory .select(inferenceResultsTestingEntity) .from(inferenceResultsTestingEntity) - .where(inferenceResultsTestingEntity.batchId.in(batchIds)) + .where( + inferenceResultsTestingEntity + .batchId + .in(batchIds) + .and(inferenceResultsTestingEntity.afterC.isNotNull()) + .and(inferenceResultsTestingEntity.afterP.isNotNull())) .fetch(); } + + @Override + public Long getInferenceResultCnt(List batchIds) { + if (batchIds == null || batchIds.isEmpty()) { + return 0L; + } + + Long cnt = + queryFactory + .select(inferenceResultsTestingEntity.count()) + .from(inferenceResultsTestingEntity) + .where( + inferenceResultsTestingEntity.batchId.in(batchIds), + inferenceResultsTestingEntity.afterC.isNotNull(), + inferenceResultsTestingEntity.afterP.isNotNull()) + .fetchOne(); + + return cnt == null ? 0L : cnt; + } }