clunt
/
RuoYi
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

推荐 用户接口问题修复

This commit is contained in:
kuang.yife 2024-02-19 16:18:40 +08:00
parent 2a0c46100a
commit bf46395558
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java
View File

@ -95,7 +95,16 @@ public class TbUserSingleAppController {
public Result<PageInfo<TbUserSingle>> recommend(@RequestBody TbUserSingle tbUserSingle, public Result<PageInfo<TbUserSingle>> recommend(@RequestBody TbUserSingle tbUserSingle,
@RequestParam("pageNum") int pageNum, @RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize) { @RequestParam("pageSize") int pageSize) {
PageHelper.startPage(pageNum, pageSize); // 获取当前登陆人信息
TbUserSingle userSingle = tbUserSingleService.lambdaQuery().eq(TbUserSingle::getUserId, tbUserSingle.getUserId()).one();
Long notExcludeSex = tbUserSingle.getSex();
// 查询当前人的不喜欢列表
List<TbUserBlock> tbUserBlocks = tbUserBlockService.lambdaQuery()
.eq(TbUserBlock::getTbUserId, userSingle.getUserId()).list();
List<Long> blockIds = tbUserBlocks.stream().map(TbUserBlock::getBlockUserId).collect(Collectors.toList());
// -- 参数设置成null
tbUserSingle.setUserId(null);
// 18 // 18
if(tbUserSingle.getAgeStart() != null){ if(tbUserSingle.getAgeStart() != null){
Calendar calendar = DateUtil.calendar(new Date()); Calendar calendar = DateUtil.calendar(new Date());
@ -110,13 +119,23 @@ public class TbUserSingleAppController {
// 1994 // 1994
tbUserSingle.setBirthdayStart(calendar.getTime()); tbUserSingle.setBirthdayStart(calendar.getTime());
} }
PageHelper.startPage(pageNum, pageSize);
List<TbUserSingle> list = tbUserSingleService.selectTbUserSingleList(tbUserSingle); List<TbUserSingle> list = tbUserSingleService.selectTbUserSingleList(tbUserSingle);
list = list.stream().filter(x->!blockIds.contains(x.getUserId())).collect(Collectors.toList());
list.forEach(model->{ list.forEach(model->{
if(model.getBirthday() != null){ if(model.getBirthday() != null){
model.setAge(DateUtil.ageOfNow(model.getBirthday())); model.setAge(DateUtil.ageOfNow(model.getBirthday()));
} }
model.setMatchSay(tbMatchSingleSayService.lambdaQuery().eq(TbMatchSingleSay::getSingleId, model.getId()).one()); model.setMatchSay(tbMatchSingleSayService.lambdaQuery().eq(TbMatchSingleSay::getSingleId, model.getId()).one());
model.setTbUserImgList(tbUserImgService.lambdaQuery().eq(TbUserImg::getUserId, model.getUserId()).list()); model.setTbUserImgList(tbUserImgService.lambdaQuery().eq(TbUserImg::getUserId, model.getUserId()).list());
// 填充是否已经关注
if(ObjectUtil.isNotEmpty(userSingle)){
long count = tbUserFollowService.lambdaQuery().eq(TbUserFollow::getFollowUserId, model.getUserId())
.eq(TbUserFollow::getUserId, userSingle.getUserId()).count();
if(count > 0){
model.setIsLike(true);
}
}
}); });
return Result.success(PageInfo.of(list)); return Result.success(PageInfo.of(list));
} }
@ -129,14 +148,10 @@ public class TbUserSingleAppController {
public Result<PageInfo<TbUserSingle>> recommendForSingle(@RequestBody UserSingleRecommendReq recommendReq, public Result<PageInfo<TbUserSingle>> recommendForSingle(@RequestBody UserSingleRecommendReq recommendReq,
@RequestParam("pageNum") int pageNum, @RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize) { @RequestParam("pageSize") int pageSize) {
Long notExcludeSex = null;
// 获取当前登陆人信息 // 获取当前登陆人信息
TbUserSingle userSingle = tbUserSingleService.lambdaQuery().eq(TbUserSingle::getUserId, recommendReq.getUserId()).one(); TbUserSingle userSingle = tbUserSingleService.lambdaQuery().eq(TbUserSingle::getUserId, recommendReq.getUserId()).one();
if(userSingle != null){ Long notExcludeSex = recommendReq.getSex();
notExcludeSex = userSingle.getSex();
}else {
notExcludeSex = recommendReq.getSex();
}
// 查询当前人的不喜欢列表 // 查询当前人的不喜欢列表
List<TbUserBlock> tbUserBlocks = tbUserBlockService.lambdaQuery() List<TbUserBlock> tbUserBlocks = tbUserBlockService.lambdaQuery()
.eq(TbUserBlock::getTbUserId, userSingle.getUserId()).list(); .eq(TbUserBlock::getTbUserId, userSingle.getUserId()).list();