From 4ac3bcc175c751fc98a5893de687ce2e1bb6cac4 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 20 Jul 2026 11:17:24 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EB=A1=A0=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=86=8D=EB=8F=84=20=EB=8A=90=EB=A6=B0=20=ED=98=84=EC=83=81=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 | 7 +++---- .../MapSheetAnalDataInferenceGeomEntity.java | 3 +++ .../InferenceResultRepositoryImpl.java | 9 ++++++--- .../Inference/MapSheetLearnRepositoryImpl.java | 17 ++++++----------- 4 files changed, 18 insertions(+), 18 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 c61771d1..49b6a003 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 @@ -4,7 +4,6 @@ import com.kamco.cd.kamcoback.common.exception.CustomApiException; import com.kamco.cd.kamcoback.common.utils.UserUtil; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.AnalResultInfo; -import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.BboxPointDto; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Dashboard; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Geom; import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.InferenceBatchSheet; @@ -480,10 +479,10 @@ public class InferenceResultCoreService { log.info("get inference result info end time = {}", LocalDateTime.now()); // bbox, point 조회 log.info("get inference result info bbox start time = {}", LocalDateTime.now()); - BboxPointDto bboxPointDto = mapSheetLearnRepository.getBboxPoint(uuid); + // BboxPointDto bboxPointDto = mapSheetLearnRepository.getBboxPoint(uuid); log.info("get inference result info bbox end time = {}", LocalDateTime.now()); - resultInfo.setBboxGeom(bboxPointDto.getBboxGeom()); - resultInfo.setBboxCenterPoint(bboxPointDto.getBboxCenterPoint()); + resultInfo.setBboxGeom(null); + resultInfo.setBboxCenterPoint(null); return resultInfo; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java index 1877ec37..ac74f4b0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java @@ -162,6 +162,9 @@ public class MapSheetAnalDataInferenceGeomEntity { @Column(name = "lock_yn") private String lockYn; + @Column(name = "learn_id") + private Long learnId; + public InferenceDetailDto.DetailListEntity toEntity() { DetectionClassification classification = DetectionClassification.fromString(classBeforeCd); Clazzes comparedClazz = new Clazzes(classification, classBeforeProb); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java index 226ec131..7c66cab1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java @@ -161,7 +161,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC area, data_uid, created_dttm, - ref_map_sheet_num + ref_map_sheet_num, + learn_id ) SELECT x.result_uid, @@ -179,7 +180,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC x.area, x.data_uid, x.created_dttm, - x.ref_map_sheet_num + x.ref_map_sheet_num, + x.learn_id FROM ( SELECT r.uid AS result_uid, @@ -204,7 +206,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC r.area, msadi.data_uid, r.created_date AS created_dttm, - msadi.ref_map_sheet_num + msadi.ref_map_sheet_num, + msl.learn_id FROM inference_results_testing r JOIN tb_map_sheet_anal_inference msl ON r.batch_id IN ( 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 bdac5acd..c81bc9df 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 @@ -421,7 +421,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto } // 2) where 조건 - where.and(mapSheetAnalInferenceEntity.learnId.eq(analEntity.getId())); + // where.and(mapSheetAnalInferenceEntity.learnId.eq(analEntity.getId())); + where.and(mapSheetAnalDataInferenceGeomEntity.learnId.eq(analEntity.getId())); if (searchGeoReq.getTargetClass() != null && !searchGeoReq.getTargetClass().isBlank()) { where.and( @@ -492,11 +493,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto mapSheetAnalDataInferenceGeomEntity.resultUid), Expressions.constant(""), mapSheetAnalDataInferenceGeomEntity.fitState)) - .from(mapSheetAnalInferenceEntity) - .join(mapSheetAnalDataInferenceEntity) - .on(mapSheetAnalDataInferenceEntity.analUid.eq(mapSheetAnalInferenceEntity.id)) - .join(mapSheetAnalDataInferenceGeomEntity) - .on(mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id)) + .from(mapSheetAnalDataInferenceGeomEntity) .join(mapInkx5kEntity) .on(inkxIsNumeric.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.eq(inkxNoAsLong))) .where(where) @@ -536,11 +533,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto Long total = queryFactory .select(mapSheetAnalDataInferenceGeomEntity.geoUid.count()) - .from(mapSheetAnalInferenceEntity) - .join(mapSheetAnalDataInferenceEntity) - .on(mapSheetAnalDataInferenceEntity.analUid.eq(mapSheetAnalInferenceEntity.id)) - .join(mapSheetAnalDataInferenceGeomEntity) - .on(mapSheetAnalDataInferenceGeomEntity.dataUid.eq(mapSheetAnalDataInferenceEntity.id)) + .from(mapSheetAnalDataInferenceGeomEntity) + .join(mapInkx5kEntity) + .on(inkxIsNumeric.and(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.eq(inkxNoAsLong))) .where(where) .fetchOne();