Merge remote-tracking branch 'origin/feat/infer_dev_260107' into feat/infer_dev_260107

# Conflicts: # src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java # src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java
2026-01-12 21:13:22 +09:00
parent bf9ea206d1 50ea32c538
commit fd56d0e685
7 changed files with 178 additions and 9 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java
@@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.inference;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList;
 import com.kamco.cd.kamcoback.inference.service.InferenceResultService;
 import com.kamco.cd.kamcoback.mapsheet.service.MapSheetMngService;
@@ -23,6 +24,7 @@ import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -237,4 +239,28 @@ public class InferenceResultApiController {

    return ApiResponseDto.ok(inferenceResultService.getInferenceServerStatusList());
  }
+
+  @Operation(summary = "추론관리 진행현황 상세", description = "어드민 홈 > 추론관리 > 추론관리 > 진행현황 상세")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "검색 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Page.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @GetMapping("/status/{uuid}")
+  public ApiResponseDto<InferenceStatusDetailDto> getInferenceStatus(
+      @io.swagger.v3.oas.annotations.parameters.RequestBody(
+              description = "모델 삭제 요청 정보",
+              required = true)
+          @PathVariable
+          UUID uuid) {
+
+    return ApiResponseDto.ok(inferenceResultService.getInferenceStatus(uuid));
+  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
@@ -195,6 +195,69 @@ public class InferenceResultDto {
    private String mapSheetName;
  }

+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class InferenceStatusDetailDto {
+    private String title;
+    private Integer compareYyyy;
+    private Integer targetYyyy;
+    private String detectOption;
+    private String mapSheetScope;
+    @JsonFormatDttm private ZonedDateTime inferStartDttm;
+    @JsonFormatDttm private ZonedDateTime inferEndDttm;
+    private Long detectingCnt;
+
+    private String model1Ver;
+    private String model2Ver;
+    private String model3Ver;
+
+    public InferenceStatusDetailDto(
+        String title,
+        Integer compareYyyy,
+        Integer targetYyyy,
+        String detectOption,
+        String mapSheetScope,
+        ZonedDateTime inferStartDttm,
+        ZonedDateTime inferEndDttm,
+        Long detectingCnt,
+        String model1Ver,
+        String model2Ver,
+        String model3Ver) {
+      this.title = title;
+      this.compareYyyy = compareYyyy;
+      this.targetYyyy = targetYyyy;
+      this.detectOption = detectOption;
+      this.mapSheetScope = mapSheetScope;
+      this.inferStartDttm = inferStartDttm;
+      this.inferEndDttm = inferEndDttm;
+      this.detectingCnt = detectingCnt;
+      this.model1Ver = model1Ver;
+      this.model2Ver = model2Ver;
+      this.model3Ver = model3Ver;
+    }
+
+    private String usedServerName;
+    private Long detectingEndCnt = 7L;
+    private String model1VerStatus = "PROCCESING";
+    private String model1VerStatusName = "진행중";
+    private String model2VerStatus = "PROCCESING";
+    private String model2VerStatusName = "진행중";
+    private String model3VerStatus = "PROCCESING";
+    private String model4VerStatusName = "진행중";
+
+    public String getDetectOptionName() {
+      if (this.detectOption.equals("EXCL")) return "추론제외";
+      return "이전 년도 도엽 사용";
+    }
+
+    public String getMapSheetScopeName() {
+      if (this.detectOption.equals("ALL")) return "전체";
+      return "부분";
+    }
+  }
+
  @Getter
  @Setter
  @NoArgsConstructor
--- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
@@ -12,6 +12,7 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.DetectOption;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
+import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetNumDto;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope;
 import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList;
@@ -403,4 +404,21 @@ public class InferenceResultService {
  public List<InferenceServerStatusDto> getInferenceServerStatusList() {
    return inferenceResultCoreService.getInferenceServerStatusList();
  }
+
+  public InferenceStatusDetailDto getInferenceStatus(UUID uuid) {
+
+    List<InferenceServerStatusDto> servers =
+        inferenceResultCoreService.getInferenceServerStatusList();
+
+    String serverNames = "";
+    for (InferenceServerStatusDto server : servers) {
+      if (serverNames.equals("")) serverNames = server.getServerName();
+      else serverNames = serverNames + "," + server.getServerName();
+    }
+
+    InferenceStatusDetailDto dto = inferenceResultCoreService.getInferenceStatus(uuid);
+    dto.setUsedServerName(serverNames);
+
+    return dto;
+  }
 }