|
|
@@ -160,7 +160,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
BackgroundDataView dataView = (BackgroundDataView) accountHead;
|
|
|
backgroundDataView.setTotalNumOfWillExpireAccount(dataView.getTotalNumOfWillExpireAccount());
|
|
|
backgroundDataView.setTotalExpiredAccountNum(dataView.getTotalExpiredAccountNum());
|
|
|
- backgroundDataView.setExpiredAccountList(dataView.getExpiredAccountList());
|
|
|
+ backgroundDataView.setTotalNumOfExpiredSubAccount(dataView.getTotalNumOfExpiredSubAccount());
|
|
|
} else {
|
|
|
DateTime fiveDays = DateUtil.offsetDay(zero, 5);
|
|
|
//5天后将到期的主账号
|
|
|
@@ -169,9 +169,9 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
//已到期主账号
|
|
|
List<Account> expiredAccounts = Optional.ofNullable(accountService.list(Wrappers.lambdaQuery(Account.class).le(Account::getExpiryTime, now))).orElse(new ArrayList<>());
|
|
|
backgroundDataView.setTotalExpiredAccountNum(expiredAccounts.size());
|
|
|
- backgroundDataView.setExpiredAccountList(expiredAccounts);
|
|
|
//已到期子账号
|
|
|
List<GroupsRelation> expiredSubAccounts = Optional.ofNullable(groupsRelationMapper.selectList(Wrappers.lambdaQuery(GroupsRelation.class).le(GroupsRelation::getExpiryTime, now))).orElse(new ArrayList<>());
|
|
|
+ backgroundDataView.setTotalNumOfExpiredSubAccount(expiredSubAccounts.size());
|
|
|
redisService.set(RedisService.key.CACHE_HEAR_DATA_KEY.getNameFormat(zero.toString()), backgroundDataView, RedisService.key.CACHE_HEAR_DATA_KEY.getTimeout());
|
|
|
}
|
|
|
}
|