diff --git a/src/main/java/com/kamco/cd/kamcoback/common/enums/DetectionClassification.java b/src/main/java/com/kamco/cd/kamcoback/common/enums/DetectionClassification.java index 1d5e44b3..a95a13e8 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/enums/DetectionClassification.java +++ b/src/main/java/com/kamco/cd/kamcoback/common/enums/DetectionClassification.java @@ -1,5 +1,6 @@ package com.kamco.cd.kamcoback.common.enums; +import com.kamco.cd.kamcoback.common.utils.HeaderUtil; import lombok.AllArgsConstructor; import lombok.Getter; @@ -51,6 +52,6 @@ public enum DetectionClassification { */ public static String fromStrDesc(String text) { DetectionClassification dtf = fromString(text); - return dtf.getDesc(); + return HeaderUtil.isEnglishRequest() ? dtf.getId() : dtf.getDesc(); } } 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 15173730..26eaa653 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 @@ -508,7 +508,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport : "") .classificationName( DetectionClassification.fromStrDesc( - mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd())) + mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd())) .probability( mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() 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 794fa8b1..bc59742f 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 @@ -534,7 +534,7 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport : "") .classificationName( DetectionClassification.fromStrDesc( - mapSheetAnalDataInferenceGeomEntityEntity.getClassAfterCd())) + mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeCd())) .probability( mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() != null ? mapSheetAnalDataInferenceGeomEntityEntity.getClassBeforeProb() 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 6fa9a217..1c7404ed 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 @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.node.ObjectNode; import com.kamco.cd.kamcoback.common.enums.ImageryFitStatus; +import com.kamco.cd.kamcoback.common.utils.HeaderUtil; import com.kamco.cd.kamcoback.common.utils.geometry.GeometryDeserializer; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -399,7 +400,10 @@ public class TrainingDataLabelDto { private String memo; public InspectionResultInfo(String verificationResult, String inappropriateReason) { - this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText(); + this.verificationResult = + HeaderUtil.isEnglishRequest() + ? ImageryFitStatus.fromCode(verificationResult).getTextEn() + : ImageryFitStatus.fromCode(verificationResult).getText(); this.inappropriateReason = inappropriateReason; } }