diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java index 0e65de75..9f339b70 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -84,14 +84,14 @@ public class InferenceResultApiController { mediaType = "application/json", schema = @Schema( - description = "진행 여부 (Y: 진행중, N: 없음)", - type = "string", - example = "N"))), + description = "진행 여부 (UUID 있으면 진행중)", + type = "UUID", + example = "44709877-2e27-4fc5-bacb-8e0328c69b64"))), @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content), @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) }) @GetMapping("/processing-yn") - public ApiResponseDto getProcessing() { + public ApiResponseDto getProcessing() { return ApiResponseDto.ok(inferenceResultService.getProcessing()); } 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 36525614..cccbfe71 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 @@ -460,5 +460,6 @@ public class InferenceResultDto { private ZonedDateTime modelStartDttm; private ZonedDateTime modelEndDttm; private Long updateUid; + private String runningModelType; } } 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 0a93ed6e..209205de 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 @@ -79,7 +79,7 @@ public class InferenceResultService { * * @return */ - public String getProcessing() { + public UUID getProcessing() { return inferenceResultCoreService.getProcessing(); } 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 fe12b417..5b1745e4 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 @@ -347,7 +347,7 @@ public class InferenceResultCoreService { * * @return */ - public String getProcessing() { + public UUID getProcessing() { return mapSheetLearnRepository.getProcessing(); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java index c26d52b4..074a868f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java @@ -24,5 +24,5 @@ public interface MapSheetLearnRepositoryCustom { InferenceStatusDetailDto getInferenceStatus(UUID uuid); - String getProcessing(); + UUID getProcessing(); } 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 e73dd1ef..4b04fbcc 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 @@ -232,16 +232,11 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto * * @return */ - public String getProcessing() { - Long processing = - queryFactory - .select(mapSheetLearnEntity.count()) - .from(mapSheetLearnEntity) - .where(mapSheetLearnEntity.status.eq("IN_PROGRESS")) - .fetchOne(); - if (Long.valueOf(0L).equals(processing)) { - return "N"; - } - return "Y"; + public UUID getProcessing() { + return queryFactory + .select(mapSheetLearnEntity.uuid) + .from(mapSheetLearnEntity) + .where(mapSheetLearnEntity.status.eq("IN_PROGRESS")) + .fetchOne(); } } 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 dcc834f9..db8d41f1 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 { @@ -176,7 +176,7 @@ public class MapSheetInferenceJobService { m.setCls_model_path( progressDto.getCdModelClsPath() + "/" + progressDto.getCdModelClsFileName()); m.setCls_model_version(progressDto.getClsModelVersion()); - m.setCd_model_type(inferenceType); + m.setCd_model_type(type); m.setPriority(progressDto.getPriority()); // 추론 다음모델 실행 @@ -188,6 +188,7 @@ public class MapSheetInferenceJobService { saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId()); saveInferenceAiDto.setType(type); saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now()); + saveInferenceAiDto.setRunningModelType(inferenceType); inferenceResultCoreService.update(saveInferenceAiDto); }