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

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

Browse Source 
# 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:
teddy
2026-01-12 20:04:11 +09:00
parent 9022f05cc5 6933411789
commit d2f2f52dd2
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,42 +233,34 @@ public class InferenceResultDto {
public String getCpuStatus() { public String getCpuStatus() {
String enumId = "SAFETY"; String enumId = "SAFETY";
if (this.cpu_user + this.cpu_system >= 80) { if (this.cpu_user + this.cpu_system >= 80) enumId = "CAUTION";
enumId = "CAUTION";
}
return enumId; return enumId;
} }
public String getGpuStatus() { public String getGpuStatus() {
String enumId = "SAFETY"; String enumId = "SAFETY";
if (this.gpuUtil >= 80) { if (this.gpuUtil >= 80) enumId = "CAUTION";
enumId = "CAUTION";
}
return enumId; return enumId;
} }
public String getMemStatus() { public String getMemStatus() {
String enumId = "SAFETY"; String enumId = "SAFETY";
if (this.memused >= 80) { if (this.memused >= 80) enumId = "CAUTION";
enumId = "CAUTION";
}
return enumId; return enumId;
} }
public String getCpuStatusName() { public String getCpuStatusName() {
if (this.cpu_user + this.cpu_system >= 80) { if (this.cpu_user + this.cpu_system >= 80) return ServerStatus.CAUTION.getText();
return ServerStatus.CAUTION.getText();
}
return ServerStatus.SAFETY.getText(); return ServerStatus.SAFETY.getText();
} }
public String getGpuStatusName() { public String getGpuStatusName() {
if (this.gpuUtil >= 80) { if (this.gpuUtil >= 80) return ServerStatus.CAUTION.getText();
return ServerStatus.CAUTION.getText();
}
return ServerStatus.SAFETY.getText(); return ServerStatus.SAFETY.getText();
} }
public String getMemStatusName() {
if (this.memused >= 80) return ServerStatus.CAUTION.getText();
public String getMemStatusName() { public String getMemStatusName() {
if (this.memused >= 80) { if (this.memused >= 80) {
return ServerStatus.CAUTION.getText(); return ServerStatus.CAUTION.getText();

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

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