From 23a096a600312dd2f0423b8223ad3e7c5de6c819 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Thu, 29 Jan 2026 16:23:13 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EB=A7=81=20=ED=88=B4=20pnu?= =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=20list=20string=EC=9C=BC=EB=A1=9C=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 --- .../TrainingDataLabelRepositoryImpl.java | 14 ++++++++--- .../TrainingDataReviewRepositoryImpl.java | 14 ++++++++--- .../service/TrainingDataReviewJobService.java | 25 ------------------- .../dto/TrainingDataLabelDto.java | 2 +- .../dto/TrainingDataReviewDto.java | 2 +- 5 files changed, 22 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java index 88ec9b59..4f295ab6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java @@ -6,6 +6,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapInkx5kEntity.mapInkx5kE import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnDataGeomEntity.mapSheetLearnDataGeomEntity; +import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -466,6 +467,14 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport } // 5. DTO 생성 + // pnu list 조회 + List pnuList = + queryFactory + .select(pnuEntity.pnu) + .from(pnuEntity) + .where(pnuEntity.geo.geoUid.eq(mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid())) + .fetch(); + var changeDetectionInfo = ChangeDetectionInfo.builder() .mapSheetInfo(mapSheetEntity != null ? mapSheetEntity.getMapidNm() : "") @@ -507,10 +516,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataInferenceGeomEntityEntity.getCdProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getCdProb() : 0.0) - .pnu( - mapSheetAnalDataInferenceGeomEntityEntity.getPnu() != null - ? mapSheetAnalDataInferenceGeomEntityEntity.getPnu() - : 0L) + .pnu(pnuList) .mapSheetNum( mapSheetAnalDataInferenceGeomEntityEntity.getMapSheetNum() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getMapSheetNum() diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java index b1875485..8296a683 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataReviewRepositoryImpl.java @@ -7,6 +7,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceG import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnDataGeomEntity.mapSheetLearnDataGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity; +import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -494,6 +495,14 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport } // 5. DTO 생성 + // pnu list 조회 + List pnuList = + queryFactory + .select(pnuEntity.pnu) + .from(pnuEntity) + .where(pnuEntity.geo.geoUid.eq(mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid())) + .fetch(); + var changeDetectionInfo = ChangeDetectionInfo.builder() .mapSheetInfo(mapSheetEntity != null ? mapSheetEntity.getMapidNm() : "") @@ -535,10 +544,7 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataInferenceGeomEntityEntity.getCdProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getCdProb() : 0.0) - .pnu( - mapSheetAnalDataInferenceGeomEntityEntity.getPnu() != null - ? mapSheetAnalDataInferenceGeomEntityEntity.getPnu() - : 0L) + .pnu(pnuList) .mapSheetNum( mapSheetAnalDataInferenceGeomEntityEntity.getMapSheetNum() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getMapSheetNum() diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/TrainingDataReviewJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/TrainingDataReviewJobService.java index c69947e9..7cdca731 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/TrainingDataReviewJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/TrainingDataReviewJobService.java @@ -125,31 +125,6 @@ public class TrainingDataReviewJobService { return result; } - // 라벨러 완료,SKIP 시 호출 -> 미사용 - @Transactional - public void assignRealtime(String assignmentUid) { - Tasks task = trainingDataReviewJobCoreService.findAssignmentTask(assignmentUid); - Long analUid = task.getAnalUid(); - - // pending 계산 - List pendings = - trainingDataReviewJobCoreService.findInspectorPendingByRound(analUid); - - if (pendings.isEmpty()) { - return; - } - - List order = pendings.stream().map(InspectorPendingDto::getInspectorUid).toList(); - - trainingDataReviewJobCoreService.lockInspectors(analUid, order); - - trainingDataReviewJobCoreService.assignReviewer(task.getAssignmentUid(), order.getFirst()); - - List geomUids = new ArrayList<>(); - geomUids.add(task.getInferenceUid()); - trainingDataReviewJobCoreService.updateGeomUidTestState(geomUids); - } - @Transactional @Scheduled(cron = "0 0 2 * * *") public void exportGeojsonLabelingGeom() { diff --git a/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java b/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java index 3f940ccd..a74445dc 100644 --- a/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java @@ -358,7 +358,7 @@ public class TrainingDataLabelDto { private Double detectionAccuracy; @Schema(description = "PNU (필지고유번호)", example = "36221202306020") - private Long pnu; + private List pnu; @Schema(description = "도엽번호 (map_sheet_num)", example = "34602057") private Long mapSheetNum; diff --git a/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataReviewDto.java b/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataReviewDto.java index d3026009..851a96ff 100644 --- a/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataReviewDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataReviewDto.java @@ -351,7 +351,7 @@ public class TrainingDataReviewDto { private Double detectionAccuracy; @Schema(description = "PNU (필지고유번호)", example = "36221202306020") - private Long pnu; + private List pnu; @Schema(description = "도엽번호 (map_sheet_num)", example = "34602057") private Long mapSheetNum;