From f95968f0465e2332eea578785822c51719e9e10f Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期四, 08 八月 2024 11:19:17 +0800 Subject: [PATCH] 修改直播,分享bug --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 93 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 72 insertions(+), 21 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java index 1997d0c..29ee9cd 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; @@ -12,10 +10,7 @@ import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.domain.ZInfoUser; -import com.ruoyi.domain.ZfEvent; -import com.ruoyi.domain.ZfFamily; -import com.ruoyi.domain.ZfRelation; +import com.ruoyi.domain.*; import com.ruoyi.domain.dto.*; import com.ruoyi.mapper.ZInfoUserMapper; import com.ruoyi.service.ZInfoUserService; @@ -31,7 +26,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * <p> @@ -71,6 +65,52 @@ } @Override + public Boolean findByuid(Long uid, Long tfid) { + + + if(uid==null) + return false; + // System.out.println(tfid); + // System.out.println("00000000000---------------"); + ZInfoUser infu = this.getById(tfid); + if(infu==null) + return false; + if(infu.getFatherId()!=null && uid.equals(infu.getFatherId())) + return true; + if(infu.getMomId()!=null && uid.equals(infu.getMomId())) + return true; + return findByuid(uid, infu.getFatherId()) || findByuid(uid, infu.getMomId()); + } + + @Override + public List<ZInfoUser> selectByClanId(Integer clanId) { + ZInfoUser zInfoUser = new ZInfoUser(); + zInfoUser.setClanId(clanId); + LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser); + return list(lqw); + } + + @Override + public ZInfoUser getInfoBysysId(Long sysid) { + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZInfoUser::getSysId, sysid); + List<ZInfoUser> list = list(lqw); + if(list.size()>0) + return list.get(0); + else + return null; + } + + + @Override + public List<ZInfoUser> getDataBySex(Integer sex){ + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZInfoUser::getSex, sex); + List<ZInfoUser> list = list(lqw); + return list; + } + + @Override public AjaxResult getInfoByfid(Long fid) { LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getFamilyId, fid); @@ -101,6 +141,7 @@ lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex()); lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus()); lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth()); + lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId()); return lqw; } @@ -115,10 +156,13 @@ } @Override - public AjaxResult removeByUserName(List userName) { + public AjaxResult removeByUserName(List<String> userName) { LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); - lqw.in(ZInfoUser::getNickName, userName); - List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList()); + lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0))); + System.out.println(userName.get(0)); + List<ZInfoUser> beanRecords = list(lqw); + System.out.println("555555555555555555"+beanRecords); + List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());; removeByIds(ids); return AjaxResult.success("鍒犻櫎鎴愬姛"); } @@ -354,7 +398,8 @@ return people; }).collect(Collectors.toList()); -//System.out.println("--------------++++++++++++++++--------------"); +System.out.println("--------------++++++++++++++++--------------"); +System.out.println(result); return AjaxResult.success(result); } @@ -615,7 +660,7 @@ @Override public ZInfoUser getInfoById(Long userId) { - ZInfoUser user = getById(userId); + ZInfoUser user = getInfoBysysId(userId); if(user!=null) @@ -626,13 +671,13 @@ String roleName = zfRoleService.getById(user.getRoleId()).getName(); user.setRoleName(roleName); - System.out.println("dddddddddddddddddddd"); - System.out.println(familyId); - if(familyId!=-1) - { - String familyName = zfFamilyService.getById(familyId).getName(); - user.setFamilyName(familyName); - } +// System.out.println("dddddddddddddddddddd"); +// System.out.println(familyId); +// if(familyId!=null&&familyId!=-1) +// { +// String familyName = zfFamilyService.getById(familyId).getName(); +// user.setFamilyName(familyName); +// } } return user; } @@ -773,10 +818,13 @@ // ).collect(Collectors.toList()); List<ZInfoUser> collect = allPeopleList.stream().filter( - one -> ((one.getFamilyId()!=null && one.getFatherId() == people.getUserId()) || (one.getMomId()!=null&&one.getMomId() == people.getUserId())) && (people.getIsMyFamily() == 1) + + one -> (((one.getFamilyId()!=null && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1)) ).map( one -> { - if (depth == 1) { + System.out.println("++++++++++----0009999"); + System.out.println(one); + if (depth == 0) { one.setIdentity(people.getIdentity() + 1); //鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� Long spouseId = one.getSpouseId(); @@ -793,6 +841,9 @@ Long spouseId = one.getSpouseId(); if (spouseId != null) { ZInfoUser spouse = zInfoUserService.getById(spouseId); + // System.out.println(spouseId); + // System.out.println(spouse); + // System.out.println("0000))))))))))))))))"); spouse.setIdentity(people.getIdentity() + 1); one.setSpouse(spouse); } -- Gitblit v1.9.1