From 5377294e6e7df6330e2c84419a43c7bb3552834a Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 6 Feb 2026 16:32:46 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=9C=A0=EC=9D=B8=20=EB=B0=B0?= =?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95,=20=EB=9D=BC=EB=B2=A8=EB=A7=81?= =?UTF-8?q?=ED=88=B4=20=EC=A0=81=ED=95=A9=EC=97=AC=EB=B6=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/GukYuinStbltJobCoreService.java | 1 + .../TrainingDataLabelRepositoryImpl.java | 17 +++++++++++------ .../TrainingDataReviewRepositoryImpl.java | 17 +++++++++++------ .../service/GukYuinApiStbltJobService.java | 5 +---- .../trainingdata/dto/TrainingDataLabelDto.java | 8 ++++++-- .../trainingdata/dto/TrainingDataReviewDto.java | 8 ++++++-- 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java index afa20728..5ad81687 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java @@ -69,6 +69,7 @@ public class GukYuinStbltJobCoreService { } } + @Transactional public void updateGukYuinObjectStbltYn(String resultUid, StbltResult stbResult) { gukYuinStbltRepository.updateGukYuinObjectStbltYn(resultUid, stbResult); } 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 4f295ab6..a22ec3a7 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 @@ -524,12 +524,17 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport .build(); var inspectionResultInfo = - InspectionResultInfo.builder() - .verificationResult(convertInspectState(assignment.toDto().getInspectState())) - .inappropriateReason("") - // .memo(assignment.toDto().getInspectMemo() != null ? - // assignment.toDto().getInspectMemo() : "") - .build(); + queryFactory + .select( + Projections.constructor( + InspectionResultInfo.class, + mapSheetAnalDataInferenceGeomEntity.fitState, + mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt)) + .from(mapSheetAnalDataInferenceGeomEntity) + .where( + mapSheetAnalDataInferenceGeomEntity.geoUid.eq( + mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid())) + .fetchOne(); // 6. Geometry를 GeoJSON으로 변환 InferenceDataGeometry inferData = 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 8296a683..f8de5211 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 @@ -24,7 +24,6 @@ import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.DetailRes; import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.GeoFeatureRequest.Properties; import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InferenceDataGeometry; import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InferenceDataGeometry.InferenceProperties; -import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.InspectionResultInfo; import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.LearnDataGeometry; import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.LearnDataGeometry.LearnProperties; import com.kamco.cd.kamcoback.trainingdata.dto.TrainingDataReviewDto.ReviewGeometryInfo; @@ -553,11 +552,17 @@ public class TrainingDataReviewRepositoryImpl extends QuerydslRepositorySupport .build(); var inspectionResultInfo = - InspectionResultInfo.builder() - .verificationResult(convertInspectState(assignment.toDto().getInspectState())) - .inappropriateReason("") - .memo("") - .build(); + queryFactory + .select( + Projections.constructor( + TrainingDataReviewDto.InspectionResultInfo.class, + mapSheetAnalDataInferenceGeomEntity.fitState, + mapSheetAnalDataInferenceGeomEntity.fitStateCmmnt)) + .from(mapSheetAnalDataInferenceGeomEntity) + .where( + mapSheetAnalDataInferenceGeomEntity.geoUid.eq( + mapSheetAnalDataInferenceGeomEntityEntity.getGeoUid())) + .fetchOne(); // 6. Geometry를 GeoJSON으로 변환 InferenceDataGeometry inferData = diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java index 4d83240f..dadd1797 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/GukYuinApiStbltJobService.java @@ -105,10 +105,7 @@ public class GukYuinApiStbltJobService { fitYn, selected.getIncyCd(), selected.getIncyRsnCont()); })); - resultMap.forEach( - (resultUid, StbltResult) -> { - gukYuinStbltJobCoreService.updateGukYuinObjectStbltYn(resultUid, StbltResult); - }); + resultMap.forEach(gukYuinStbltJobCoreService::updateGukYuinObjectStbltYn); } catch (Exception e) { log.error("[GUKYUIN] failed uid={}", dto.getChnDtctMstId(), 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 a74445dc..b9db4f5b 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 @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode; 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.geometry.GeometryDeserializer; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -382,9 +383,7 @@ public class TrainingDataLabelDto { @Schema(name = "InspectionResultInfo", description = "실태조사결과정보") @Getter @Setter - @Builder @NoArgsConstructor - @AllArgsConstructor public static class InspectionResultInfo { @Schema(description = "검증결과 (미확인/제외/완료)", example = "미확인") @@ -395,6 +394,11 @@ public class TrainingDataLabelDto { @Schema(description = "메모") private String memo; + + public InspectionResultInfo(String verificationResult, String inappropriateReason) { + this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText(); + this.inappropriateReason = inappropriateReason; + } } @Schema(name = "SummaryRes", description = "작업 통계 응답") 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 851a96ff..bf9f80e3 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 @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode; 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.geometry.GeometryDeserializer; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -378,9 +379,7 @@ public class TrainingDataReviewDto { @Schema(name = "InspectionResultInfo", description = "실태조사결과정보") @Getter @Setter - @Builder @NoArgsConstructor - @AllArgsConstructor public static class InspectionResultInfo { @Schema(description = "검증결과 (미확인/제외/완료)", example = "미확인") @@ -391,6 +390,11 @@ public class TrainingDataReviewDto { @Schema(description = "메모") private String memo; + + public InspectionResultInfo(String verificationResult, String inappropriateReason) { + this.verificationResult = ImageryFitStatus.fromCode(verificationResult).getText(); + this.inappropriateReason = inappropriateReason; + } } @Schema(name = "SummaryRes", description = "작업 통계 응답")