|
@@ -41,18 +41,8 @@ public class HomePageServiceImpl implements IHomePageService {
|
|
List<BaseUserCollectAppVo> historyAppList = baseUserCollectMapper.queryHistoryAppBy(SecurityUser.getUserId());
|
|
List<BaseUserCollectAppVo> historyAppList = baseUserCollectMapper.queryHistoryAppBy(SecurityUser.getUserId());
|
|
|
|
|
|
// 获取精选应用 前4个
|
|
// 获取精选应用 前4个
|
|
- List<BaseUserSelectAppVo> carefulSelectAppList = baseUserCollectMapper.queryCarefulSelectAppBy(null, 4);
|
|
|
|
- // 以精选应用id为key,精选应用为value,生成一个map,并且去重
|
|
|
|
- Map<Long, BaseUserSelectAppVo> collect = carefulSelectAppList
|
|
|
|
- .stream()
|
|
|
|
- .collect(Collectors.toMap(BaseUserSelectAppVo::getAppId, Function.identity(), (k1, k2) -> k1));
|
|
|
|
|
|
+ List<BaseUserSelectAppVo> carefulSelectAppList = baseUserCollectMapper.queryCarefulSelectAppBy(SecurityUser.getUserId(), null,4);
|
|
|
|
|
|
- // 将map的id值转换为list
|
|
|
|
- List<Long> appIdList = new ArrayList<>(collect.keySet());
|
|
|
|
- List<BaseUserCollect> baseUserCollect = baseUserCollectMapper.queryCollectAppByUserIdAndAppId(SecurityUser.getUserId(), appIdList, BaseUserConst.COLLECT_APP);
|
|
|
|
- for (BaseUserCollect app : baseUserCollect){
|
|
|
|
- collect.get(app.getCollectId()).setIsCollect(app.getIsCollect());
|
|
|
|
- }
|
|
|
|
|
|
|
|
//生成数据返回给视图
|
|
//生成数据返回给视图
|
|
WebHomePageVo webHomePageVo = new WebHomePageVo();
|
|
WebHomePageVo webHomePageVo = new WebHomePageVo();
|
|
@@ -107,7 +97,7 @@ public class HomePageServiceImpl implements IHomePageService {
|
|
@Override
|
|
@Override
|
|
public List<BaseUserSelectAppVo> getMoreSelector(Long appId) {
|
|
public List<BaseUserSelectAppVo> getMoreSelector(Long appId) {
|
|
// 获取更多精选应用
|
|
// 获取更多精选应用
|
|
- List<BaseUserSelectAppVo> baseUserSelectAppVos = baseUserCollectMapper.queryCarefulSelectAppBy(appId, 10);
|
|
|
|
|
|
+ List<BaseUserSelectAppVo> baseUserSelectAppVos = baseUserCollectMapper.queryCarefulSelectAppBy(null, appId, 10);
|
|
|
|
|
|
// 以精选应用id未key,精选应用为value,生成一个map,并且去重
|
|
// 以精选应用id未key,精选应用为value,生成一个map,并且去重
|
|
Map<Long, BaseUserSelectAppVo> collect = baseUserSelectAppVos.stream().collect(Collectors.toMap(BaseUserSelectAppVo::getAppId, Function.identity(), (k1, k2) -> k1));
|
|
Map<Long, BaseUserSelectAppVo> collect = baseUserSelectAppVos.stream().collect(Collectors.toMap(BaseUserSelectAppVo::getAppId, Function.identity(), (k1, k2) -> k1));
|