zoujiajian 3 年之前
父節點
當前提交
bdf0cacd38

+ 2 - 3
netflix-dao/src/main/java/com/cyksj/model/views/BackgroundDataView.java

@@ -1,6 +1,5 @@
 package com.cyksj.model.views;
 
-import com.cyksj.model.entity.Account;
 import com.cyksj.model.entity.AppleOneData;
 import com.cyksj.model.entity.RealGoodsData;
 import com.cyksj.model.entity.StreamingAccountData;
@@ -46,9 +45,9 @@ public class BackgroundDataView {
 	private Integer totalExpiredAccountNum;
 
 	/**
-	 * 已到期主账号列表
+	 * 到期子账号总数
 	 */
-	private List<Account> expiredAccountList;
+	private Integer totalNumOfExpiredSubAccount;
 
 	/**
 	 * apple one数据

+ 2 - 2
netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -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());
 		}
 	}