diff --git a/pbs/src/main/java/com/sdm/pbs/model/bo/HpcResouceInfo.java b/pbs/src/main/java/com/sdm/pbs/model/bo/HpcResouceInfo.java index d817759f..ef582688 100644 --- a/pbs/src/main/java/com/sdm/pbs/model/bo/HpcResouceInfo.java +++ b/pbs/src/main/java/com/sdm/pbs/model/bo/HpcResouceInfo.java @@ -9,6 +9,12 @@ import java.util.List; @Data public class HpcResouceInfo { + @Schema(description = "资源总数") + public int totalNodes; + + @Schema(description = "资源可用数") + public int freeNodes; + @Schema(description = "资源总核数") public int totalCores; diff --git a/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java b/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java index 0baab9e4..5969d98c 100644 --- a/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java +++ b/pbs/src/main/java/com/sdm/pbs/service/impl/IPbsHpcServiceImpl.java @@ -147,8 +147,10 @@ public class IPbsHpcServiceImpl implements IPbsService { int totalCores = 0; int usedCores = 0; int freeCoresSum = 0; + int totalNodes=0; + int freeNodes=0; List nodeInfos = new ArrayList<>(nodes.size()); - + totalNodes = nodes.size(); for (NodeList node : nodes) { if (node == null) { continue; @@ -166,6 +168,7 @@ public class IPbsHpcServiceImpl implements IPbsService { totalCores += max; usedCores += run; freeCoresSum += free; + freeNodes=freeNodes+1; } nodeInfos.add(info); } @@ -173,6 +176,8 @@ public class IPbsHpcServiceImpl implements IPbsService { result.setUsedCores(usedCores); result.setFreeCores(freeCoresSum); result.setNodeList(nodeInfos); + result.setTotalNodes(totalNodes); + result.setFreeNodes(freeNodes); return result; }