1.排行榜修改
This commit is contained in:
@@ -20,7 +20,6 @@ import com.aliyuncs.profile.DefaultProfile;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.getui.push.v2.sdk.ApiHelper;
|
import com.getui.push.v2.sdk.ApiHelper;
|
||||||
import com.getui.push.v2.sdk.GtApiConfiguration;
|
import com.getui.push.v2.sdk.GtApiConfiguration;
|
||||||
@@ -34,6 +33,7 @@ import com.getui.push.v2.sdk.dto.req.message.android.GTNotification;
|
|||||||
import com.getui.push.v2.sdk.dto.req.message.ios.Alert;
|
import com.getui.push.v2.sdk.dto.req.message.ios.Alert;
|
||||||
import com.getui.push.v2.sdk.dto.req.message.ios.Aps;
|
import com.getui.push.v2.sdk.dto.req.message.ios.Aps;
|
||||||
import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO;
|
import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO;
|
||||||
|
import com.github.pagehelper.Page;
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.github.qcloudsms.SmsSingleSenderResult;
|
import com.github.qcloudsms.SmsSingleSenderResult;
|
||||||
@@ -1537,8 +1537,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|||||||
queryUserIdList = list(queryWrapper.select(UserEntity::getUserId)).stream().map(UserEntity::getUserId).collect(Collectors.toSet());
|
queryUserIdList = list(queryWrapper.select(UserEntity::getUserId)).stream().map(UserEntity::getUserId).collect(Collectors.toSet());
|
||||||
}
|
}
|
||||||
|
|
||||||
PageHelper.startPage(page,limit);
|
PageHelper.startPage(page, limit);
|
||||||
List<UserEntity> inviteList = baseMapper.selectInviteUserList(queryUserIdList);
|
List<UserEntity> inviteList = baseMapper.selectInviteUserList(queryUserIdList);
|
||||||
|
|
||||||
List<UserEntity> userInfoList = new ArrayList<>();
|
List<UserEntity> userInfoList = new ArrayList<>();
|
||||||
if (!inviteList.isEmpty()) {
|
if (!inviteList.isEmpty()) {
|
||||||
Map<String, Integer> countInfoMap = new HashMap<>();
|
Map<String, Integer> countInfoMap = new HashMap<>();
|
||||||
@@ -1562,6 +1563,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
userInfoList = userInfoList.stream()
|
||||||
|
.sorted((u1, u2) -> Integer.compare(u2.getCounts(), u1.getCounts())) // 按 counts 降序
|
||||||
|
.collect(Collectors.toList());
|
||||||
return Result.success().put("data", PageUtils.page(new PageInfo<>(userInfoList),true));
|
return Result.success().put("data", PageUtils.page(new PageInfo<>(userInfoList),true));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user