diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 529458f5b..17dbffd14 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -1122,6 +1122,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { int freeNum = 0; int occupiedNum = 0; int chargingNum = 0; + int hangingNum = 0; int faultNum = 0; for (ConnectorInfoVO connectorInfoVO : connectorInfoVOS) { @@ -1135,6 +1136,10 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { // 空闲 freeNum += 1; } + if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.OCCUPIED_RESERVED_LOCK.getValue())) { + // 预约锁定(挂起) + hangingNum += 1; + } if (StringUtils.equals(status, PileConnectorDataBaseStatusEnum.OCCUPIED_NOT_CHARGED.getValue())) { // 占用未充电 occupiedNum += 1; @@ -1148,8 +1153,13 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { faultNum += 1; } } + // 全部数量 + int totalNum = offlineNum + freeNum + occupiedNum + chargingNum + faultNum + hangingNum; + + map.put("totalNum", totalNum); map.put("offlineNum", offlineNum); map.put("freeNum", freeNum); + map.put("hangingNum", hangingNum); map.put("occupiedNum", occupiedNum); map.put("chargingNum", chargingNum); map.put("faultNum", faultNum);