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

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
This commit is contained in:
2026-01-12 20:04:11 +09:00
2 changed files with 9 additions and 15 deletions

View File

@@ -233,42 +233,34 @@ public class InferenceResultDto {
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() {
String enumId = "SAFETY";
if (this.gpuUtil >= 80) {
enumId = "CAUTION";
}
if (this.gpuUtil >= 80) enumId = "CAUTION";
return enumId;
}
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();
}
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();
}
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();

View File

@@ -238,5 +238,7 @@ public class InferenceResultCoreService {
.getInferenceResultByStatus(status)
.orElseThrow(() -> new EntityNotFoundException(status));
return entity.getBatchId();
public List<InferenceServerStatusDto> getInferenceServerStatusList() {
return mapSheetLearnRepository.getInferenceServerStatusList();
}
}