|
@@ -52,7 +52,7 @@ public class VppDashboardServiceImpl implements VppDashboardService {
|
|
|
int assignedLicenses = (int) vppLicenseCodeList.stream().filter(c -> c.getValidFlag().equals(LicenseCodeStatusEnum.ASSIGNED.code()) || c.getValidFlag().equals(LicenseCodeStatusEnum.ACTIVE.code())).count();
|
|
|
// 可分配
|
|
|
int availableLicenses = (int) vppLicenseCodeList.stream().filter(c -> c.getValidFlag().equals(LicenseCodeStatusEnum.UNASSIGNED.code()) || c.getValidFlag().equals(LicenseCodeStatusEnum.CANCELED.code())).count();
|
|
|
- List<LicenseCodes> collect = vppLicenseCodeList.stream().filter(c -> !c.getValidFlag().equals(LicenseCodeStatusEnum.Refunded.code())).collect(Collectors.toList());
|
|
|
+ List<LicenseCodes> collect = vppLicenseCodeList.stream().filter(c -> !c.getValidFlag().equals(LicenseCodeStatusEnum.Refunded.code())&& !c.getValidFlag().equals(LicenseCodeStatusEnum.EXPIRED.code())).collect(Collectors.toList());
|
|
|
// 已激活
|
|
|
int activatedDevices = collect.stream().mapToInt(o -> Objects.isNull(o.getUsedTimes()) ? 0 : o.getUsedTimes()).sum();
|
|
|
|