From 299bc0b401bbf53b632e2a57950616dd47fd6f7d Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Thu, 22 Jan 2026 10:54:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EB=A7=81=20=ED=88=B4=20d?= =?UTF-8?q?etail=20=EC=97=90=20=EC=83=81=ED=83=9C=EA=B0=92=20=EB=AA=85?= =?UTF-8?q?=EC=B9=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trainingdata/TrainingDataLabelRepositoryImpl.java | 2 +- .../cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java | 2 +- 2 files changed, 2 insertions(+), 2 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 712dc1d8..88ec9b59 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 @@ -591,7 +591,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport .afterCogUrl(afterCogUrl) .mapBox(mapBbox) .learnGeometries(learnDataList) // learnGeometry -> learnGeometries - .labelState(assignment.toDto().getWorkState()) + .workState(assignment.toDto().getWorkState()) .build(); } catch (Exception e) { 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 65cdbb36..3f940ccd 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 @@ -328,7 +328,7 @@ public class TrainingDataLabelDto { private List learnGeometries; @Schema(description = "라벨 상태") - private String labelState; + private String workState; } @Schema(name = "ChangeDetectionInfo", description = "변화탐지정보") From f3c625d89bff10f32b7a31d51ab8953e8bc8f2e1 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Thu, 22 Jan 2026 11:26:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EB=A7=81=20=EB=8C=80?= =?UTF-8?q?=EC=83=81=20=EC=A1=B0=EA=B1=B4=20pnu=20=EC=9E=88=EC=9D=84=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EB=A1=9C=EB=A7=8C=20=EC=88=98=EC=A0=95,=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=97=90=20=EC=B6=94=EB=A1=A0=20uid=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/label/dto/LabelWorkDto.java | 3 +++ .../label/LabelAllocateRepositoryImpl.java | 21 +++++++++++++------ .../label/LabelWorkRepositoryImpl.java | 17 ++++++++++++--- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java index 03280382..9659cac2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java @@ -62,6 +62,9 @@ public class LabelWorkDto { private Long inspectorRemainCnt; private ZonedDateTime projectCloseDttm; + private String resultUid; + private String subUid; + @JsonProperty("detectYear") public String getDetectYear() { if (compareYyyy == null || targetYyyy == null) { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java index 0bf68180..fd9631b6 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java @@ -381,8 +381,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(analEntity.getCompareYyyy()), mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(analEntity.getTargetYyyy()), mapSheetAnalDataInferenceGeomEntity.stage.eq(analEntity.getStage()), - mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L), - mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()) + mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() + // mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L) + // mapSheetAnalDataInferenceGeomEntity.passYn.isFalse() //TODO: + // 추후 라벨링 대상 조건 수정하기 + ) .fetchOne(); } @@ -552,8 +555,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto mapSheetAnalDataInferenceGeomEntity.dataUid)) .where( mapSheetAnalInferenceEntity.uuid.eq(targetUuid), - mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L), - mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()) + mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() + // mapSheetAnalDataInferenceGeomEntity.pnu.gt(0L), + // mapSheetAnalDataInferenceGeomEntity.passYn.isFalse() //TODO: 추후 라벨링 + // 대상 조건 수정하기 + ) .fetchOne(); } @@ -734,8 +740,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto mapSheetAnalInferenceEntity.targetYyyy.eq( mapSheetAnalDataInferenceGeomEntity.targetYyyy), mapSheetAnalInferenceEntity.stage.eq(mapSheetAnalDataInferenceGeomEntity.stage), - mapSheetAnalDataInferenceGeomEntity.pnu.gt(0), - mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()) + mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull() + // mapSheetAnalDataInferenceGeomEntity.pnu.gt(0), + // mapSheetAnalDataInferenceGeomEntity.passYn.isFalse() //TODO: 추후 라벨링 대상 조건 + // 수정하기 + ) .where(mapSheetAnalInferenceEntity.id.eq(analEntity.getId())) .groupBy( mapSheetAnalInferenceEntity.analTitle, diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java index 664a5ccc..61261062 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java @@ -1,5 +1,7 @@ package com.kamco.cd.kamcoback.postgres.repository.label; +import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; + import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState; import com.kamco.cd.kamcoback.label.dto.LabelWorkDto; @@ -141,7 +143,10 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { .and( mapSheetAnalDataInferenceGeomEntity.pnu .isNotNull()) // TODO: 이노팸 연동 후 0 이상이라고 해야할 듯 - .and(mapSheetAnalDataInferenceGeomEntity.passYn.eq(Boolean.FALSE))) + // + // .and(mapSheetAnalDataInferenceGeomEntity.passYn.eq(Boolean.FALSE)) //TODO: 추후 + // 라벨링 대상 조건 수정하기 + ) .then(1L) .otherwise(0L) .sum(); @@ -225,12 +230,17 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { new CaseBuilder() .when(mapSheetAnalInferenceEntity.inspectionClosedYn.eq("Y")) .then(mapSheetAnalInferenceEntity.updatedDttm) - .otherwise((ZonedDateTime) null))) + .otherwise((ZonedDateTime) null), + mapSheetLearnEntity.uid, + Expressions.stringTemplate( + "substring({0} from 1 for 8)", mapSheetLearnEntity.uid))) .from(mapSheetAnalInferenceEntity) .innerJoin(mapSheetAnalDataInferenceEntity) .on(whereSubDataBuilder) .innerJoin(mapSheetAnalDataInferenceGeomEntity) .on(whereSubBuilder) + .leftJoin(mapSheetLearnEntity) + .on(mapSheetAnalInferenceEntity.learnId.eq(mapSheetLearnEntity.id)) .where(whereBuilder) .groupBy( mapSheetAnalInferenceEntity.uuid, @@ -239,7 +249,8 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom { mapSheetAnalInferenceEntity.stage, mapSheetAnalInferenceEntity.createdDttm, mapSheetAnalInferenceEntity.analState, - mapSheetAnalInferenceEntity.id) + mapSheetAnalInferenceEntity.id, + mapSheetLearnEntity.uid) .orderBy( mapSheetAnalInferenceEntity.targetYyyy.desc(), mapSheetAnalInferenceEntity.compareYyyy.desc(),