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 | 191 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 139 insertions(+), 52 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 314d72a..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) {
@@ -75,11 +76,50 @@
ZInfoUser infu = this.getById(tfid);
if(infu==null)
return false;
- if(infu.getFatherId()!=null && uid==infu.getFatherId())
+ if(infu.getFatherId()!=null && uid.equals(infu.getFatherId()))
return true;
- if(infu.getMomId()!=null && uid==infu.getMomId())
+ 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);
+ }
+
+
+// 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
@@ -91,6 +131,16 @@
return list.get(0);
else
return null;
+ }
+
+
+ @Override
+ 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;
}
@Override
@@ -123,7 +173,8 @@
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;
}
@@ -133,6 +184,7 @@
LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser);
List<ZInfoUser> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}", list);
+
return list;
}
@@ -334,9 +386,11 @@
* @return
*/
@Override
- public AjaxResult listWithTree(Integer depth) {
-
- List<ZInfoUser> allPeopleList = list();
+ public AjaxResult listWithTree(Integer depth, Integer clanId) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(clanId!=null, ZInfoUser::getClanId, clanId);
+ // List<ZfEvent> list = list(lqw);
+ List<ZInfoUser> allPeopleList = list(lqw);
List<ZInfoUser> result = null;
// try {
// result = allPeopleList.stream().filter(people -> people.getUserId()!=1&&(people.getFatherId() == 0||people.getMomId()==0))
@@ -379,9 +433,9 @@
// System.out.println(people);
return people;
}).collect(Collectors.toList());
-
-System.out.println("--------------++++++++++++++++--------------");
-System.out.println(result);
+//
+//System.out.println("--------------++++++++++++++++--------------");
+//System.out.println(result);
return AjaxResult.success(result);
}
@@ -396,17 +450,20 @@
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");
+
// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
try {
result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0)))
.map(people -> {
- if (depth > 1) {
+ if (depth >= 1) {
people.setIdentity(1);
people.setChildList(fillChildren2(people, allPeopleList, depth - 1));
}
@@ -416,6 +473,7 @@
throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
}
+ // System.out.println(result);
// result.stream().map(
// data->{
@@ -458,9 +516,11 @@
*/
@Override
public AjaxResult listGenealogy(Genealogy genealogy, Integer pageNum, Integer pageSize) {
+ userList.clear();
List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
recursionFindUser(treeList);
-
+ // System.out.println(userList);
+ // System.out.println("---------------");
List<Genealogy> allData = userList.stream().map(
zInfoUser -> {
Genealogy newGenealogy = new Genealogy();
@@ -476,10 +536,12 @@
spouseInfo.setSpouseName(zInfoUser.getNickName());
newGenealogy.setSpouseName(spouse.getNickName());
}
+ System.out.println(newGenealogy);
return newGenealogy;
}
).collect(Collectors.toList());
-
+ // System.out.println(allData);
+ // System.out.println("999999999988888888888++++++++++++++++++++++");
List<Genealogy> collect = allData.stream()
.distinct()
.filter((data)-> data.getIsMyFamily() == 1)
@@ -493,8 +555,10 @@
}
resultData.add(collect.get(i));
}
-
-
+ // System.out.println(resultData);
+ // System.out.println("999999999988888888888++++++++++++++++++++++");
+//
+//
//瀵箁esult鍋氫竴涓潯浠剁瓫閫�
Iterator<Genealogy> it = resultData.iterator();
while(it.hasNext()){
@@ -536,15 +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");
// for (Genealogy data : resultData) {
@@ -645,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;
}
@@ -699,7 +769,17 @@
public ZInfoUser getMyself() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return getById(userId);
+ // System.out.println(userId);
+ //System.out.println("-----------------++++++++9999++++++++++----------");
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setSysId(userId);
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zInfoUser.getSysId() != null, ZInfoUser::getSysId, zInfoUser.getSysId());
+ List<ZInfoUser> list = list(lqw);
+ if(!list.isEmpty())
+ return list.get(0);
+ else
+ return null;
}
@Override
@@ -707,6 +787,8 @@
return null;
}
+
+
private void recursionFindUser(List<ZInfoUser> treeList) {
@@ -751,13 +833,18 @@
}
@Override
- public AjaxResult listAllFamilyPeople() {
+ public AjaxResult listAllFamilyPeople(Integer clanId) {
// List<ZInfoUser> lis = list();
// for(ZInfoUser tm: lis)
// {
// System.out.println(tm.getRoleId());
// }
- List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+ LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getClanId, clanId);
+ List<ZInfoUser> lis = list(zInfoUserLambdaQueryWrapper);
+ List<ZInfoUser> collect = lis.stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+
+
return AjaxResult.success(collect);
}
@@ -793,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)
@@ -804,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鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥�
@@ -831,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;
}
@@ -856,9 +943,9 @@
// if(depth==layer)
// layer = layer + 1;
- System.out.println(depth);
+ // System.out.println(depth);
List<ZInfoUser> collect = allPeopleList.stream().filter(
- one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId())
+ one -> Objects.equals(one.getFatherId(), people.getUserId()) || Objects.equals(one.getMomId(),people.getUserId())
).map(
one -> {
if (depth == 1)
@@ -874,14 +961,14 @@
}
List<ZInfoUser> zinfo = fillChildren2(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;
}
--
Gitblit v1.9.1