From c7db60cccc44e541fd4dc321d32a62a4f75bee85 Mon Sep 17 00:00:00 2001 From: teddy Date: Fri, 16 Jan 2026 17:38:37 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EB=A1=A0=EC=8B=A4=ED=96=89=ED=95=A0?= =?UTF-8?q?=EB=95=8C=20=ED=9A=8C=EC=B0=A8=20=EC=A0=80=EC=9E=A5=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/inference/dto/InferenceDetailDto.java | 1 + .../cd/kamcoback/inference/dto/InferenceResultDto.java | 3 +++ .../postgres/core/InferenceResultCoreService.java | 1 + .../cd/kamcoback/postgres/entity/MapSheetLearnEntity.java | 6 +++++- .../Inference/InferenceResultRepositoryImpl.java | 2 ++ .../scheduler/service/MapSheetInferenceJobService.java | 7 +------ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java index 2a22fe61..25ce3ec5 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java @@ -419,6 +419,7 @@ public class InferenceDetailDto { private UUID m1ModelUuid; private UUID m2ModelUuid; private UUID m3ModelUuid; + private String uid; } @Schema(name = "AnalResultInfo", description = "추론결과 기본정보") diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java index b8ea9831..9d579903 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java @@ -175,6 +175,9 @@ public class InferenceResultDto { @Schema(description = "기준년도") private Integer targetYyyy; + @Schema(description = "uid") + private String uid; + @Schema(description = "상태명") @JsonProperty("statusName") public String statusName() { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java index e3dd2482..75c40180 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java @@ -363,6 +363,7 @@ public class InferenceResultCoreService { inferenceBatchSheet.setM1ModelUuid(entity.getM1ModelUuid()); inferenceBatchSheet.setM2ModelUuid(entity.getM2ModelUuid()); inferenceBatchSheet.setM3ModelUuid(entity.getM3ModelUuid()); + inferenceBatchSheet.setUid(entity.getUid()); return inferenceBatchSheet; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java index d3e71756..99a79f95 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java @@ -186,6 +186,9 @@ public class MapSheetLearnEntity { @Column(name = "m3_failed_jobs", nullable = false) private int m3FailedJobs = 0; + @Column(name = "uid", nullable = false) + private String uid; + public InferenceResultDto.ResultList toDto() { return new InferenceResultDto.ResultList( this.uuid, @@ -199,6 +202,7 @@ public class MapSheetLearnEntity { this.applyYn, this.applyDttm, this.compareYyyy, - this.targetYyyy); + this.targetYyyy, + this.uid); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java index 99312b34..f6f02e28 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java @@ -283,6 +283,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC INNER JOIN tb_map_sheet_anal_data_inference_geom msadig ON msadi.data_uid = msadig.data_uid WHERE msai.anal_uid = :analUid + AND msadig.class_before_cd IS NOT NULL + AND msadig.class_after_cd IS NOT NULL GROUP BY msadig.compare_yyyy ,msadig.target_yyyy diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java index e1171e4c..949b4eac 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java @@ -222,7 +222,6 @@ public class MapSheetInferenceJobService { List resultList = inferenceResultCoreService.getInferenceResults(batchIds); String inferenceId = ""; - boolean first = true; StringBuilder sb = new StringBuilder(); for (InferenceResultsTestingDto.ShpDto dto : resultList) { @@ -233,12 +232,8 @@ public class MapSheetInferenceJobService { sb.append(","); } sb.append("\"").append(dto.getMapId()).append("\""); - - if (first) { - inferenceId = dto.getUid(); - first = false; - } } + inferenceId = sheet.getUid(); String mapIds = sb.toString(); String batchId = sheet.getM1BatchId() + "," + sheet.getM2BatchId() + "," + sheet.getM3BatchId();