MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spotless

Browse Source
This commit is contained in:
Gina(박가연)
2026-01-12 19:40:04 +09:00
parent ededc512d6
commit 6933411789
7 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
View File

@@ -205,81 +205,69 @@ public class InferenceResultDto {
public static class InferenceServerStatusDto { public static class InferenceServerStatusDto {
private String serverName; private String serverName;
@JsonIgnore @JsonIgnore private float cpu_user;
private float cpu_user;
@JsonIgnore private float cpu_system; @JsonIgnore private float cpu_system;
@JsonIgnore private float memused; @JsonIgnore private float memused;
private Long kbmemused; private Long kbmemused;
private float gpuUtil; 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() // private String cpuStatusName;
{ // private String memStatusName;
return this.cpu_user+this.cpu_system; // 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"; 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; return enumId;
} }
public String getServerStatusName() public String getServerStatusName() {
{ // String enumId = "SAFETY";
//String enumId = "SAFETY"; // if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION";
//if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION";
return ServerStatus.SAFETY.getText(); return ServerStatus.SAFETY.getText();
} }
public String getCpuStatus() public String getCpuStatus() {
{
String enumId = "SAFETY"; 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; return enumId;
} }
public String getGpuStatus() public String getGpuStatus() {
{
String enumId = "SAFETY"; String enumId = "SAFETY";
if( this.gpuUtil >= 80 )enumId = "CAUTION"; if (this.gpuUtil >= 80) enumId = "CAUTION";
return enumId; return enumId;
} }
public String getMemStatus() public String getMemStatus() {
{
String enumId = "SAFETY"; String enumId = "SAFETY";
if( this.memused >= 80 )enumId = "CAUTION"; if (this.memused >= 80) enumId = "CAUTION";
return enumId; return enumId;
} }
public String getCpuStatusName() public String getCpuStatusName() {
{ if (this.cpu_user + this.cpu_system >= 80) return ServerStatus.CAUTION.getText();
if( this.cpu_user+this.cpu_system >= 80 )return ServerStatus.CAUTION.getText();
return ServerStatus.SAFETY.getText(); return ServerStatus.SAFETY.getText();
} }
public String getGpuStatusName() public String getGpuStatusName() {
{ if (this.gpuUtil >= 80) return ServerStatus.CAUTION.getText();
if( this.gpuUtil >= 80 )return ServerStatus.CAUTION.getText();
return ServerStatus.SAFETY.getText(); return ServerStatus.SAFETY.getText();
} }
public String getMemStatusName() public String getMemStatusName() {
{ if (this.memused >= 80) return ServerStatus.CAUTION.getText();
if( this.memused >= 80 )return ServerStatus.CAUTION.getText();
return ServerStatus.SAFETY.getText(); return ServerStatus.SAFETY.getText();
} }
} }
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum ServerStatus implements EnumType { public enum ServerStatus implements EnumType {

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

@@ -228,6 +228,7 @@ public class InferenceResultCoreService {
entity.setStatus(status); entity.setStatus(status);
} }
public List<InferenceServerStatusDto> getInferenceServerStatusList(){return mapSheetLearnRepository.getInferenceServerStatusList(); public List<InferenceServerStatusDto> getInferenceServerStatusList() {
return mapSheetLearnRepository.getInferenceServerStatusList();
} }
} }

1
src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java
View File

@@ -44,5 +44,4 @@ public class GpuMetricEntity {
@Column(name = "gpu_mem_total") @Column(name = "gpu_mem_total")
private Float gpuMemTotal; private Float gpuMemTotal;
} }

1
src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java
View File

@@ -55,5 +55,4 @@ public class SystemMetricEntity {
@Column(name = "memused") @Column(name = "memused")
private Float memused; private Float memused;
} }

2
src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java
View File

@@ -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;
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity; import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity;
import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.List;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
public interface MapSheetLearnRepositoryCustom { public interface MapSheetLearnRepositoryCustom {

18
src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java
View File

@@ -94,30 +94,34 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
BooleanBuilder builder = new BooleanBuilder(); BooleanBuilder builder = new BooleanBuilder();
List<Integer> latestIds = queryFactory List<Integer> latestIds =
queryFactory
.select(systemMetricEntity.id1.max()) .select(systemMetricEntity.id1.max())
.from(systemMetricEntity) .from(systemMetricEntity)
.groupBy(systemMetricEntity.serverName) .groupBy(systemMetricEntity.serverName)
.fetch(); .fetch();
List<Integer> latestGpuIds = queryFactory List<Integer> latestGpuIds =
queryFactory
.select(gpuMetricEntity.id1.max()) .select(gpuMetricEntity.id1.max())
.from(gpuMetricEntity) .from(gpuMetricEntity)
.groupBy(gpuMetricEntity.serverName) .groupBy(gpuMetricEntity.serverName)
.fetch(); .fetch();
List<InferenceServerStatusDto> foundContent = queryFactory List<InferenceServerStatusDto> foundContent =
.select(Projections.constructor( queryFactory
.select(
Projections.constructor(
InferenceServerStatusDto.class, InferenceServerStatusDto.class,
systemMetricEntity.serverName, systemMetricEntity.serverName,
systemMetricEntity.cpuUser, systemMetricEntity.cpuUser,
systemMetricEntity.cpuSystem, systemMetricEntity.cpuSystem,
systemMetricEntity.memused, systemMetricEntity.memused,
systemMetricEntity.kbmemused, systemMetricEntity.kbmemused,
gpuMetricEntity.gpuUtil gpuMetricEntity.gpuUtil))
))
.from(systemMetricEntity) .from(systemMetricEntity)
.leftJoin(gpuMetricEntity).on(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)) .leftJoin(gpuMetricEntity)
.on(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName))
.where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용
.orderBy(systemMetricEntity.serverName.asc()) .orderBy(systemMetricEntity.serverName.asc())
.limit(4) .limit(4)