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

2026-01-12 21:09:11 +09:00
parent 1225c90e32 b4ad2fb858
commit c17ab4b3d7
7 changed files with 97 additions and 96 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java
@@ -1,7 +1,6 @@
 package com.kamco.cd.kamcoback.inference;

 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
 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;
@@ -241,28 +240,26 @@ 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)
-    })
+      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) {
+      @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
@@ -214,17 +214,17 @@ public class InferenceResultDto {
    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) {
+        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;
@@ -247,18 +247,15 @@ public class InferenceResultDto {
    private String model3VerStatus = "PROCCESING";
    private String model4VerStatusName = "진행중";

-    public String getDetectOptionName()
-    {
-      if( this.detectOption.equals("EXCL") )return "추론제외";
+    public String getDetectOptionName() {
+      if (this.detectOption.equals("EXCL")) return "추론제외";
      return "이전 년도 도엽 사용";
    }

-    public String getMapSheetScopeName()
-    {
-      if( this.detectOption.equals("ALL") )return "전체";
+    public String getMapSheetScopeName() {
+      if (this.detectOption.equals("ALL")) return "전체";
      return "부분";
    }
-
  }

  @Getter
--- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
@@ -405,12 +405,13 @@ public class InferenceResultService {

  public InferenceStatusDetailDto getInferenceStatus(UUID uuid) {

-    List<InferenceServerStatusDto> servers = inferenceResultCoreService.getInferenceServerStatusList();
+    List<InferenceServerStatusDto> servers =
+        inferenceResultCoreService.getInferenceServerStatusList();

    String serverNames = "";
    for (InferenceServerStatusDto server : servers) {
-      if( serverNames.equals("") )serverNames = server.getServerName();
-      else serverNames = serverNames+","+server.getServerName();
+      if (serverNames.equals("")) serverNames = server.getServerName();
+      else serverNames = serverNames + "," + server.getServerName();
    }

    InferenceStatusDetailDto dto = inferenceResultCoreService.getInferenceStatus(uuid);
@@ -418,5 +419,4 @@ public class InferenceResultService {

    return dto;
  }
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java
@@ -134,7 +134,7 @@ public class ModelMngService {
  }

  public ModelUploadResDto uploadChunkModelFile(
-    UploadDto.UploadAddReq upAddReqDto, MultipartFile chunkFile) {
+      UploadDto.UploadAddReq upAddReqDto, MultipartFile chunkFile) {
    UploadDto.UploadRes upRes = uploadService.uploadChunk(upAddReqDto, chunkFile);

    ModelUploadResDto modelUploadResDto = new ModelUploadResDto();
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
@@ -260,7 +260,7 @@ public class InferenceResultCoreService {
    return inferenceBatchSheet;
  }

-  public InferenceStatusDetailDto getInferenceStatus(UUID uuid){
+  public InferenceStatusDetailDto getInferenceStatus(UUID uuid) {
    return mapSheetLearnRepository.getInferenceStatus(uuid);
  }
 }
--- 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
@@ -1,13 +1,12 @@
 package com.kamco.cd.kamcoback.postgres.repository.Inference;

-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
 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.postgres.entity.MapSheetLearnEntity;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.List;
 import org.springframework.data.domain.Page;

 public interface MapSheetLearnRepositoryCustom {
--- 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
@@ -2,11 +2,9 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference;

 import static com.kamco.cd.kamcoback.postgres.entity.QGpuMetricEntity.gpuMetricEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity;
-import static com.kamco.cd.kamcoback.postgres.entity.QModelMngEntity.modelMngEntity;
 import static com.kamco.cd.kamcoback.postgres.entity.QSystemMetricEntity.systemMetricEntity;

 import com.kamco.cd.kamcoback.common.utils.DateRange;
-import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
 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;
@@ -100,35 +98,42 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto

    BooleanBuilder builder = new BooleanBuilder();

-    List<Integer> latestIds = queryFactory
-      .select(systemMetricEntity.id1.max())
-      .from(systemMetricEntity)
-      .groupBy(systemMetricEntity.serverName)
-      .fetch();
+    List<Integer> latestIds =
+        queryFactory
+            .select(systemMetricEntity.id1.max())
+            .from(systemMetricEntity)
+            .groupBy(systemMetricEntity.serverName)
+            .fetch();

-    List<Integer> latestGpuIds = queryFactory
-      .select(gpuMetricEntity.id1.max())
-      .from(gpuMetricEntity)
-      .groupBy(gpuMetricEntity.serverName)
-      .fetch();
+    List<Integer> latestGpuIds =
+        queryFactory
+            .select(gpuMetricEntity.id1.max())
+            .from(gpuMetricEntity)
+            .groupBy(gpuMetricEntity.serverName)
+            .fetch();

-    List<InferenceServerStatusDto> foundContent = queryFactory
-      .select(Projections.constructor(
-        InferenceServerStatusDto.class,
-        systemMetricEntity.serverName,
-        systemMetricEntity.cpuUser,
-        systemMetricEntity.cpuSystem,
-        systemMetricEntity.memused,
-        systemMetricEntity.kbmemused,
-        gpuMetricEntity.gpuUtil
-      ))
-      .from(systemMetricEntity)
-      .leftJoin(gpuMetricEntity).on(gpuMetricEntity.id1.in(latestGpuIds)
-          .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)))
-      .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용
-      .orderBy(systemMetricEntity.serverName.asc())
-      .limit(4)
-      .fetch();
+    List<InferenceServerStatusDto> foundContent =
+        queryFactory
+            .select(
+                Projections.constructor(
+                    InferenceServerStatusDto.class,
+                    systemMetricEntity.serverName,
+                    systemMetricEntity.cpuUser,
+                    systemMetricEntity.cpuSystem,
+                    systemMetricEntity.memused,
+                    systemMetricEntity.kbmemused,
+                    gpuMetricEntity.gpuUtil))
+            .from(systemMetricEntity)
+            .leftJoin(gpuMetricEntity)
+            .on(
+                gpuMetricEntity
+                    .id1
+                    .in(latestGpuIds)
+                    .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)))
+            .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용
+            .orderBy(systemMetricEntity.serverName.asc())
+            .limit(4)
+            .fetch();

    return foundContent;
  }
@@ -142,29 +147,32 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
    QModelMngEntity m2Model = new QModelMngEntity("m2Model");
    QModelMngEntity m3Model = new QModelMngEntity("m3Model");

-    InferenceStatusDetailDto foundContent = queryFactory
-      .select(Projections.constructor(
-        InferenceStatusDetailDto.class,
-        mapSheetLearnEntity.title,
-        mapSheetLearnEntity.compareYyyy,
-        mapSheetLearnEntity.targetYyyy,
-        mapSheetLearnEntity.detectOption,
-        mapSheetLearnEntity.mapSheetScope,
-        mapSheetLearnEntity.inferStartDttm,
-        mapSheetLearnEntity.inferEndDttm,
-        mapSheetLearnEntity.detectingCnt,
-        m1Model.modelVer.as("model1Ver"),
-        m2Model.modelVer.as("model2Ver"),
-        m3Model.modelVer.as("model3Ver")
-      ))
-      .from(mapSheetLearnEntity)
-      .leftJoin(m1Model).on(m1Model.uuid.eq(mapSheetLearnEntity.m1ModelUuid))
-      .leftJoin(m2Model).on(m2Model.uuid.eq(mapSheetLearnEntity.m2ModelUuid))
-      .leftJoin(m3Model).on(m3Model.uuid.eq(mapSheetLearnEntity.m3ModelUuid))
-      .where(mapSheetLearnEntity.uuid.eq(uuid))
-      .fetchOne();
+    InferenceStatusDetailDto foundContent =
+        queryFactory
+            .select(
+                Projections.constructor(
+                    InferenceStatusDetailDto.class,
+                    mapSheetLearnEntity.title,
+                    mapSheetLearnEntity.compareYyyy,
+                    mapSheetLearnEntity.targetYyyy,
+                    mapSheetLearnEntity.detectOption,
+                    mapSheetLearnEntity.mapSheetScope,
+                    mapSheetLearnEntity.inferStartDttm,
+                    mapSheetLearnEntity.inferEndDttm,
+                    mapSheetLearnEntity.detectingCnt,
+                    m1Model.modelVer.as("model1Ver"),
+                    m2Model.modelVer.as("model2Ver"),
+                    m3Model.modelVer.as("model3Ver")))
+            .from(mapSheetLearnEntity)
+            .leftJoin(m1Model)
+            .on(m1Model.uuid.eq(mapSheetLearnEntity.m1ModelUuid))
+            .leftJoin(m2Model)
+            .on(m2Model.uuid.eq(mapSheetLearnEntity.m2ModelUuid))
+            .leftJoin(m3Model)
+            .on(m3Model.uuid.eq(mapSheetLearnEntity.m3ModelUuid))
+            .where(mapSheetLearnEntity.uuid.eq(uuid))
+            .fetchOne();

    return foundContent;
  }
-
 }