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 a22ec3a7..823b02e5 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 @@ -10,6 +10,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.kamco.cd.kamcoback.common.enums.DetectionClassification; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState; import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity; @@ -492,6 +493,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd() : "") + .classificationName( + DetectionClassification.fromStrDesc( + mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd())) .probability( mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() @@ -503,6 +507,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd() : "") + .classificationName( + DetectionClassification.fromStrDesc( + mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd())) .probability( mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb() 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 f8de5211..187481ed 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 @@ -11,6 +11,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QPnuEntity.pnuEntity; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.kamco.cd.kamcoback.common.enums.DetectionClassification; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState; import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState; import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity; @@ -519,6 +520,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd() : "") + .classificationName( + DetectionClassification.fromStrDesc( + mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd())) .probability( mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() @@ -530,6 +534,9 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd() : "") + .classificationName( + DetectionClassification.fromStrDesc( + mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd())) .probability( mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterProb() 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 b9db4f5b..6fa9a217 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 @@ -373,9 +373,12 @@ public class TrainingDataLabelDto { @AllArgsConstructor public static class ClassificationInfo { - @Schema(description = "분류", example = "일반토지") + @Schema(description = "분류", example = "land") private String classification; + @Schema(description = "분류 한글명", example = "일반토지") + private String classificationName; + @Schema(description = "확률", example = "80.0") private Double probability; } 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 bf9f80e3..fba18b78 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 @@ -369,9 +369,12 @@ public class TrainingDataReviewDto { @AllArgsConstructor public static class ClassificationInfo { - @Schema(description = "분류", example = "일반토지") + @Schema(description = "분류", example = "land") private String classification; + @Schema(description = "분류한글명", example = "일반토지") + private String classificationName; + @Schema(description = "확률", example = "80.0") private Double probability; }