From 405458b042fecfe0dc0e9cae9c856fc42fb3e7a6 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期二, 14 一月 2025 16:41:25 +0800 Subject: [PATCH] 修改了个人记事本bug --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 125 +++++++++++++++++++++++++++-------------- 1 files changed, 83 insertions(+), 42 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 0e3a51b..35f8603 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 @@ -13,10 +13,7 @@ import com.ruoyi.domain.*; import com.ruoyi.domain.dto.*; import com.ruoyi.mapper.ZInfoUserMapper; -import com.ruoyi.service.ZInfoUserService; -import com.ruoyi.service.ZfFamilyService; -import com.ruoyi.service.ZfRelationService; -import com.ruoyi.service.ZfRoleService; +import com.ruoyi.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +23,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; - /** * <p> * 鏈嶅姟瀹炵幇绫� @@ -48,8 +44,13 @@ @Resource private ZfFamilyService zfFamilyService; + @Resource private ZfRoleService zfRoleService; + + @Resource + private ZfClanService zfClanService; + @Override public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) { @@ -90,6 +91,37 @@ return list(lqw); } + +// public List<ZInfoUser> selectByNickName(String nickName){ +// ZInfoUser zInfoUser = new ZInfoUser(); +// zInfoUser.setNickName(nickName); +// LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser); +// return list(lqw); +// } + + @Override + public AjaxResult findUserNameAClan(List<String> nickNames) + { + List<ZfShareOther> shareOtherClans = new ArrayList<>(); + for (String nickName:nickNames) { + ZInfoUser zInfoUser = new ZInfoUser(); + zInfoUser.setNickName(nickName); + + LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser); + List<ZInfoUser> zInfoUsers = list(lqw); + + + for (ZInfoUser zInfoUser1: zInfoUsers) { + ZfShareOther shareOtherClan = new ZfShareOther(); + shareOtherClan.setUserName(zInfoUser1.getNickName()); + shareOtherClan.setUserId(zInfoUser1.getUserId().intValue()); + shareOtherClan.setClanId(zInfoUser1.getClanId()); + shareOtherClan.setClanName(zfClanService.getById(zInfoUser1.getClanId()).getClanName()); + shareOtherClans.add(shareOtherClan); + }} + return AjaxResult.success(shareOtherClans); + } + @Override public ZInfoUser getInfoBysysId(Long sysid) { LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); @@ -103,9 +135,10 @@ @Override - public List<ZInfoUser> getDataBySex(Integer sex){ + public List<ZInfoUser> getDataBySex(Integer sex, Integer clanId){ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); lqw.eq(ZInfoUser::getSex, sex); + lqw.eq(ZInfoUser::getClanId, clanId); List<ZInfoUser> list = list(lqw); return list; } @@ -140,7 +173,7 @@ lqw.like(StringUtils.isNotEmpty(zInfoUser.getUnit()), ZInfoUser::getUnit, zInfoUser.getUnit()); 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.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth()); lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId()); return lqw; @@ -151,6 +184,7 @@ LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser); List<ZInfoUser> list = list(lambdaQueryWrapper); log.info("杩斿洖鐨勬暟鎹负:{}", list); + return list; } @@ -416,13 +450,13 @@ ZInfoUser zInfoUser = new ZInfoUser(); BeanUtils.copyProperties(genealogy, zInfoUser); LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); - lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex()); - lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName()); +// lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex()); +// lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName()); // lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth()); lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId()); List<ZInfoUser> allPeopleList = list(lqw); - System.out.println(allPeopleList); - System.out.println("============z=============zzzzzzzzzzzzzzzzzzz"); + // System.out.println(allPeopleList); + //System.out.println("============z=============zzzzzzzzzzzzzzzzzzz"); // List<ZInfoUser> allPeopleList = list(); List<ZInfoUser> result = null; @@ -439,7 +473,7 @@ throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�"); } - System.out.println(result); + // System.out.println(result); // result.stream().map( // data->{ @@ -486,7 +520,7 @@ List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data"); recursionFindUser(treeList); // System.out.println(userList); - System.out.println("---------------"); + // System.out.println("---------------"); List<Genealogy> allData = userList.stream().map( zInfoUser -> { Genealogy newGenealogy = new Genealogy(); @@ -506,8 +540,8 @@ return newGenealogy; } ).collect(Collectors.toList()); - System.out.println(allData); - System.out.println("999999999988888888888++++++++++++++++++++++"); + // System.out.println(allData); + // System.out.println("999999999988888888888++++++++++++++++++++++"); List<Genealogy> collect = allData.stream() .distinct() .filter((data)-> data.getIsMyFamily() == 1) @@ -521,8 +555,8 @@ } resultData.add(collect.get(i)); } - System.out.println(resultData); - System.out.println("999999999988888888888++++++++++++++++++++++"); + // System.out.println(resultData); + // System.out.println("999999999988888888888++++++++++++++++++++++"); // // //瀵箁esult鍋氫竴涓潯浠剁瓫閫� @@ -566,16 +600,18 @@ } if(genealogy.getBirth()!=null){ - if(data.getBirth().compareTo(genealogy.getBirth())!=0){ - it.remove(); - continue; + if(data.getBirth()!=null) { + if (data.getBirth().compareTo(genealogy.getBirth()) != 0) { + it.remove(); + } } + else it.remove(); } } - System.out.println(resultData); + // System.out.println(resultData); - System.out.println("================++++++++++++++66666666666666666999999999"); + // System.out.println("================++++++++++++++66666666666666666999999999"); // for (Genealogy data : resultData) { @@ -676,22 +712,25 @@ ZInfoUser user = getInfoBysysId(userId); - if(user!=null) - { - Long familyId = user.getFamilyId(); - // System.out.println("dddddddddddddddddddd"); + if(user==null) { + //鍒╃敤userId鏌ヨ + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZInfoUser::getUserId, userId); + List<ZInfoUser> list = list(lqw); + if(list.size()>0) + user = list.get(0); + else + return null; - String roleName = zfRoleService.getById(user.getRoleId()).getName(); - - user.setRoleName(roleName); -// System.out.println("dddddddddddddddddddd"); -// System.out.println(familyId); -// if(familyId!=null&&familyId!=-1) -// { -// String familyName = zfFamilyService.getById(familyId).getName(); -// user.setFamilyName(familyName); -// } } + + Long familyId = user.getFamilyId(); + // System.out.println("dddddddddddddddddddd"); + if(user.getRoleId()==null) + user.setRoleId(3L); + String roleName = zfRoleService.getById(user.getRoleId()).getName(); + + user.setRoleName(roleName); return user; } @@ -748,6 +787,8 @@ return null; } + + private void recursionFindUser(List<ZInfoUser> treeList) { @@ -839,7 +880,7 @@ // if(depth==layer) // layer = layer + 1; - System.out.println(depth); + // System.out.println(depth); // List<ZInfoUser> myFamilyPeopleList = allPeopleList.stream().filter( // one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1) @@ -850,8 +891,8 @@ one -> (((one.getFamilyId()!=null && Objects.equals(one.getFatherId(), people.getUserId())) || (one.getMomId()!=null&& one.getMomId().equals(people.getUserId()))) && (one.getIsMyFamily() == 1)) ).map( one -> { - System.out.println("++++++++++----0009999"); - System.out.println(one); + // System.out.println("++++++++++----0009999"); + // System.out.println(one); if (depth == 0) { one.setIdentity(people.getIdentity() + 1); //鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� @@ -877,14 +918,14 @@ } List<ZInfoUser> zinfo = fillChildren(one, allPeopleList, depth - 1); one.setChildList(zinfo); - System.out.println(one); + // System.out.println(one); return one; } //return one; } ).collect(Collectors.toList()); - System.out.println(collect); + // System.out.println(collect); return collect; } @@ -902,7 +943,7 @@ // if(depth==layer) // layer = layer + 1; - System.out.println(depth); + // System.out.println(depth); List<ZInfoUser> collect = allPeopleList.stream().filter( one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId()) ).map( -- Gitblit v1.9.1