From 6933411789b8ae1ee00d245cb859eceb05aed384 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 12 Jan 2026 19:40:04 +0900 Subject: [PATCH] spotless --- .../InferenceResultApiController.java | 22 +++---- .../inference/dto/InferenceResultDto.java | 66 ++++++++----------- .../core/InferenceResultCoreService.java | 3 +- .../postgres/entity/GpuMetricEntity.java | 1 - .../postgres/entity/SystemMetricEntity.java | 1 - .../MapSheetLearnRepositoryCustom.java | 2 +- .../MapSheetLearnRepositoryImpl.java | 56 ++++++++-------- 7 files changed, 71 insertions(+), 80 deletions(-) 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 afedbb4b..34771618 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -221,17 +221,17 @@ public class InferenceResultApiController { @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("/serverStatus") public ApiResponseDto> getInferenceServerStatusList() { 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 3941876f..164ae7d1 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 @@ -205,81 +205,69 @@ public class InferenceResultDto { public static class InferenceServerStatusDto { private String serverName; - @JsonIgnore - private float cpu_user; + @JsonIgnore private float cpu_user; @JsonIgnore private float cpu_system; @JsonIgnore private float memused; private Long kbmemused; private float gpuUtil; - //private String cpuStatusName; - //private String memStatusName; - //private String gpuStatusName; - //private float cpu_use_rate; - //private float gpu_use_rate; - //private float mem_use_rate; - public float getCpuUseRate() - { - return this.cpu_user+this.cpu_system; + // private String cpuStatusName; + // private String memStatusName; + // private String gpuStatusName; + // private float cpu_use_rate; + // private float gpu_use_rate; + // private float mem_use_rate; + + public float getCpuUseRate() { + return this.cpu_user + this.cpu_system; } - public String getServerStatus() - { + public String getServerStatus() { String enumId = "SAFETY"; - //if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; + // if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; return enumId; } - public String getServerStatusName() - { - //String enumId = "SAFETY"; - //if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; + public String getServerStatusName() { + // String enumId = "SAFETY"; + // if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; return ServerStatus.SAFETY.getText(); } - public String getCpuStatus() - { + public String getCpuStatus() { String enumId = "SAFETY"; - if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; + if (this.cpu_user + this.cpu_system >= 80) enumId = "CAUTION"; return enumId; } - public String getGpuStatus() - { + public String getGpuStatus() { String enumId = "SAFETY"; - if( this.gpuUtil >= 80 )enumId = "CAUTION"; + if (this.gpuUtil >= 80) enumId = "CAUTION"; return enumId; } - public String getMemStatus() - { + public String getMemStatus() { String enumId = "SAFETY"; - if( this.memused >= 80 )enumId = "CAUTION"; + if (this.memused >= 80) enumId = "CAUTION"; return enumId; } - public String getCpuStatusName() - { - if( this.cpu_user+this.cpu_system >= 80 )return ServerStatus.CAUTION.getText(); + public String getCpuStatusName() { + if (this.cpu_user + this.cpu_system >= 80) return ServerStatus.CAUTION.getText(); return ServerStatus.SAFETY.getText(); } - public String getGpuStatusName() - { - if( this.gpuUtil >= 80 )return ServerStatus.CAUTION.getText(); + public String getGpuStatusName() { + if (this.gpuUtil >= 80) return ServerStatus.CAUTION.getText(); return ServerStatus.SAFETY.getText(); } - public String getMemStatusName() - { - if( this.memused >= 80 )return ServerStatus.CAUTION.getText(); + public String getMemStatusName() { + if (this.memused >= 80) return ServerStatus.CAUTION.getText(); return ServerStatus.SAFETY.getText(); } - - } - @Getter @AllArgsConstructor public enum ServerStatus implements EnumType { 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 1d7710a1..934abadb 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 @@ -228,6 +228,7 @@ public class InferenceResultCoreService { entity.setStatus(status); } - public List getInferenceServerStatusList(){return mapSheetLearnRepository.getInferenceServerStatusList(); + public List getInferenceServerStatusList() { + return mapSheetLearnRepository.getInferenceServerStatusList(); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java index 55fee73d..23f74a52 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java @@ -44,5 +44,4 @@ public class GpuMetricEntity { @Column(name = "gpu_mem_total") private Float gpuMemTotal; - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java index eb072a3f..05e5bb02 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java @@ -55,5 +55,4 @@ public class SystemMetricEntity { @Column(name = "memused") private Float memused; - } 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 4d896aa3..860d7315 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 @@ -3,9 +3,9 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto; 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 { 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 79c7e827..aeaa4bb9 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 @@ -94,34 +94,38 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto BooleanBuilder builder = new BooleanBuilder(); - List latestIds = queryFactory - .select(systemMetricEntity.id1.max()) - .from(systemMetricEntity) - .groupBy(systemMetricEntity.serverName) - .fetch(); + List latestIds = + queryFactory + .select(systemMetricEntity.id1.max()) + .from(systemMetricEntity) + .groupBy(systemMetricEntity.serverName) + .fetch(); - List latestGpuIds = queryFactory - .select(gpuMetricEntity.id1.max()) - .from(gpuMetricEntity) - .groupBy(gpuMetricEntity.serverName) - .fetch(); + List latestGpuIds = + queryFactory + .select(gpuMetricEntity.id1.max()) + .from(gpuMetricEntity) + .groupBy(gpuMetricEntity.serverName) + .fetch(); - List 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.serverName.eq(systemMetricEntity.serverName)) - .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 - .orderBy(systemMetricEntity.serverName.asc()) - .limit(4) - .fetch(); + List 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.serverName.eq(systemMetricEntity.serverName)) + .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 + .orderBy(systemMetricEntity.serverName.asc()) + .limit(4) + .fetch(); return foundContent; }