Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107

src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java

@@ -62,6 +62,10 @@ public class LabelWorkDto {
     private Long inspectorRemainCnt;
     private ZonedDateTime projectCloseDttm;
 
+    private String resultUid;
+    private String subUid;
+    private UUID learnUuid;
+
     @JsonProperty("detectYear")
     public String getDetectYear() {
       if (compareYyyy == null || targetYyyy == null) {

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.pnu.isNotNull()
-                  mapSheetAnalDataInferenceGeomEntity.passYn.isFalse())
+                  //                  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.pnu.isNotNull()
-                  mapSheetAnalDataInferenceGeomEntity.passYn.isFalse())
+                  //            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.pnu.isNotNull()
-            mapSheetAnalDataInferenceGeomEntity.passYn.isFalse())
+            //        mapSheetAnalDataInferenceGeomEntity.pnu.gt(0),
+            //        mapSheetAnalDataInferenceGeomEntity.passYn.isFalse()    //TODO: 추후 라벨링 대상 조건
+            // 수정하기
+            )
         .where(mapSheetAnalInferenceEntity.id.eq(analEntity.getId()))
         .groupBy(
             mapSheetAnalInferenceEntity.analTitle,

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,18 @@ 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),
+                    mapSheetLearnEntity.uuid))
             .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 +250,9 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                 mapSheetAnalInferenceEntity.stage,
                 mapSheetAnalInferenceEntity.createdDttm,
                 mapSheetAnalInferenceEntity.analState,
-                mapSheetAnalInferenceEntity.id)
+                mapSheetAnalInferenceEntity.id,
+                mapSheetLearnEntity.uid,
+                mapSheetLearnEntity.uuid)
             .orderBy(
                 mapSheetAnalInferenceEntity.targetYyyy.desc(),
                 mapSheetAnalInferenceEntity.compareYyyy.desc(),

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) {

src/main/java/com/kamco/cd/kamcoback/trainingdata/dto/TrainingDataLabelDto.java

@@ -328,7 +328,7 @@ public class TrainingDataLabelDto {
     private List<LearnDataGeometry> learnGeometries;
 
     @Schema(description = "라벨 상태")
-    private String labelState;
+    private String workState;
   }
 
   @Schema(name = "ChangeDetectionInfo", description = "변화탐지정보")