From c3e3d2889c07203a26743825d52e6f76cb219f79 Mon Sep 17 00:00:00 2001 From: teddy Date: Tue, 13 Jan 2026 14:41:29 +0900 Subject: [PATCH] =?UTF-8?q?[KC-103]=20=EC=B6=94=EB=A1=A0=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=EB=B0=B0=EC=B9=98=20=EC=98=A4=EB=A5=98=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 --- .../inference/dto/InferenceProgressDto.java | 4 ++-- .../inference/dto/InferenceSendDto.java | 2 +- .../service/InferenceResultService.java | 2 +- .../MapSheetLearnRepositoryImpl.java | 3 ++- .../service/MapSheetInferenceJobService.java | 19 +++++++++++++++++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceProgressDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceProgressDto.java index b3d6edae..05c3346e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceProgressDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceProgressDto.java @@ -19,7 +19,7 @@ public class InferenceProgressDto { private String cdModelClsPath; private String cdModelClsFileName; private String clsModelVersion; - private Integer priority; + private Double priority; public InferenceProgressDto( InferenceProgressDto.pred_requests_areas pred_requests_areas, @@ -31,7 +31,7 @@ public class InferenceProgressDto { String cdModelClsPath, String cdModelClsFileName, String clsModelVersion, - Integer priority) { + Double priority) { this.pred_requests_areas = pred_requests_areas; this.modelVersion = modelVersion; this.cdModelPath = cdModelPath; diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java index 83ca870e..bb09413f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java @@ -18,7 +18,7 @@ public class InferenceSendDto { private String cls_model_path; private String cls_model_version; private String cd_model_type; - private Integer priority; + private Double priority; @Getter @Setter diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index 28ba6963..0a93ed6e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -326,7 +326,7 @@ public class InferenceResultService { sendDto.setCls_model_path(cdClsModelPath); sendDto.setCls_model_version(modelInfo.getModelVer()); sendDto.setCd_model_type(modelType); - sendDto.setPriority(modelInfo.getPriority().intValue()); + sendDto.setPriority(modelInfo.getPriority()); return sendDto; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index 93e4b1df..e73dd1ef 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -217,7 +217,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto model.cdModelConfigFileName.as("cdModelConfigFileName"), model.clsModelPath, model.clsModelFileName, - model.clsModelVersion)) + model.clsModelVersion, + model.priority)) .from(mapSheetLearnEntity) .join(model) .on(model.uuid.eq(modelUuid)) 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 f9017e3f..dcc834f9 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 @@ -54,7 +54,7 @@ public class MapSheetInferenceJobService { public void runBatch() { if ("local".equalsIgnoreCase(profile)) { - return; + // return; } try { @@ -149,6 +149,16 @@ public class MapSheetInferenceJobService { InferenceProgressDto progressDto = inferenceResultCoreService.getInferenceAiResultById(id, type, modelUuid); + String inferenceType = ""; + + if (type.equals("M1")) { + inferenceType = "G1"; + } else if (type.equals("M2")) { + inferenceType = "G2"; + } else if (type.equals("M3")) { + inferenceType = "G3"; + } + pred_requests_areas predRequestsAreas = new pred_requests_areas(); predRequestsAreas.setInput1_year(progressDto.getPred_requests_areas().getInput1_year()); predRequestsAreas.setInput2_year(progressDto.getPred_requests_areas().getInput2_year()); @@ -158,6 +168,7 @@ public class MapSheetInferenceJobService { progressDto.getPred_requests_areas().getInput2_scene_path()); InferenceSendDto m = new InferenceSendDto(); + m.setPred_requests_areas(predRequestsAreas); m.setModel_version(progressDto.getModelVersion()); m.setCd_model_path(progressDto.getCdModelPath() + "/" + progressDto.getCdModelFileName()); m.setCd_model_config( @@ -165,7 +176,7 @@ public class MapSheetInferenceJobService { m.setCls_model_path( progressDto.getCdModelClsPath() + "/" + progressDto.getCdModelClsFileName()); m.setCls_model_version(progressDto.getClsModelVersion()); - m.setCd_model_type(type); + m.setCd_model_type(inferenceType); m.setPriority(progressDto.getPriority()); // 추론 다음모델 실행 @@ -195,6 +206,10 @@ public class MapSheetInferenceJobService { // TODO 추후 삭제 if ("local".equals(profile)) { + if (dto.getPred_requests_areas() == null) { + dto.setPred_requests_areas(new InferenceSendDto.pred_requests_areas()); + } + dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson"); dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson"); }