[KC-103] 추론 실행 배치 수정

src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java

@@ -233,7 +233,9 @@ public class InferenceResultCoreService {
             .getInferenceResultByUuid(request.getUuid())
             .orElseThrow(() -> new EntityNotFoundException());
 
-    if (request.getType().equals("M1")) {
+    if (request.getType() != null) {
+      switch (request.getType()) {
+        case "M1" -> {
           if (request.getBatchId() != null) {
             entity.setM1ModelBatchId(request.getBatchId());
           }
@@ -245,8 +247,8 @@ public class InferenceResultCoreService {
           if (request.getModelEndDttm() != null) {
             entity.setM1ModelEndDttm(request.getModelEndDttm());
           }
-
-    } else if (request.getType().equals("M2")) {
+        }
+        case "M2" -> {
           if (request.getBatchId() != null) {
             entity.setM2ModelBatchId(request.getBatchId());
           }
@@ -258,8 +260,8 @@ public class InferenceResultCoreService {
           if (request.getModelEndDttm() != null) {
             entity.setM2ModelEndDttm(request.getModelEndDttm());
           }
-
-    } else if (request.getType().equals("M3")) {
+        }
+        case "M3" -> {
           if (request.getBatchId() != null) {
             entity.setM3ModelBatchId(request.getBatchId());
           }
@@ -272,6 +274,12 @@ public class InferenceResultCoreService {
             entity.setM3ModelEndDttm(request.getModelEndDttm());
           }
         }
+      }
+    }
+
+    if (request.getRunningModelType() != null) {
+      entity.setRunningModelType(request.getRunningModelType());
+    }
 
     if (request.getInferStartDttm() != null) {
       entity.setInferStartDttm(request.getInferStartDttm());
@@ -293,10 +301,6 @@ public class InferenceResultCoreService {
       entity.setDetectEndCnt(request.getDetectEndCnt());
     }
 
-    if (request.getType() != null) {
-      entity.setRunningModelType(request.getType());
-    }
-
     if (request.getStatus() != null) {
       entity.setStatus(request.getStatus());
     }

src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java

@@ -48,7 +48,9 @@ public class MapSheetInferenceJobService {
   @Value("${inference.url}")
   private String inferenceUrl;
 
-  /** 추론 진행 배치 1분 */
+  /**
+   * 추론 진행 배치 1분
+   */
   @Scheduled(fixedDelay = 60_000)
   @Transactional
   public void runBatch() {
@@ -134,7 +136,6 @@ public class MapSheetInferenceJobService {
         saveInferenceAiDto.setUuid(batchSheet.getUuid());
         saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
         saveInferenceAiDto.setDetectEndCnt((long) (completedJobs + failedJobs));
-        saveInferenceAiDto.setType(batchSheet.getRunningModelType());
         inferenceResultCoreService.update(saveInferenceAiDto);
       }
 
@@ -176,7 +177,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());
 
     // 추론 다음모델 실행
@@ -188,7 +189,7 @@ public class MapSheetInferenceJobService {
     saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
     saveInferenceAiDto.setType(type);
     saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now());
-    saveInferenceAiDto.setRunningModelType(inferenceType);
+    saveInferenceAiDto.setRunningModelType(type);
     inferenceResultCoreService.update(saveInferenceAiDto);
   }
 
@@ -229,7 +230,8 @@ public class MapSheetInferenceJobService {
 
     try {
       List<Map<String, Object>> list =
-          om.readValue(body, new TypeReference<List<Map<String, Object>>>() {});
+        om.readValue(body, new TypeReference<List<Map<String, Object>>>() {
+        });
 
       Integer batchIdInt = (Integer) list.get(0).get("batch_id");
       batchId = batchIdInt.longValue();