From f8b80fc0032e15e67e7a9ca4fe644e7147f90c70 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 19 十一月 2024 20:20:50 +0800
Subject: [PATCH] 删除隐私模块的期限范围时间

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |  143 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 103 insertions(+), 40 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..e8d1f8d 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
@@ -26,6 +26,7 @@
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -47,6 +48,7 @@
 
     @Resource
     private ZfFamilyService zfFamilyService;
+
 
     @Resource
     private ZfRoleService zfRoleService;
@@ -90,6 +92,34 @@
         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 findInfoUserNameAClan(String nickName)
+    {
+        ZInfoUser zInfoUser = new ZInfoUser();
+        zInfoUser.setNickName(nickName);
+
+        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+        List<ZInfoUser> zInfoUsers = list(lqw);
+        List<ShareOtherClan> shareOtherClans = new ArrayList<>();
+
+        for (ZInfoUser zInfoUser1: zInfoUsers) {
+            ShareOtherClan shareOtherClan = new ShareOtherClan();
+            shareOtherClan.setNickName(zInfoUser1.getNickName());
+            shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
+            shareOtherClan.setClanId(zInfoUser1.getClanId());
+            shareOtherClans.add(shareOtherClan);
+        }
+        return AjaxResult.success(shareOtherClans);
+    }
+
     @Override
     public ZInfoUser getInfoBysysId(Long sysid) {
         LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
@@ -103,9 +133,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;
     }
@@ -416,16 +447,17 @@
         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.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
+//        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
+//        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
+//        lqw.between(zInfoUser.getHappenStartTime() != null && zInfoUser.getHappenEndTime() != null, ZInfoUser::getBirth, zInfoUser.getHappenStartTime(),zInfoUser.getHappenEndTime());
         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;
+//        if (depth != null){
         try {
             result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0)))
                     .map(people -> {
@@ -435,11 +467,30 @@
                         }
                         return people;
                     }).collect(Collectors.toList());
+
+//            if(zInfoUser.getSex() != null) {
+//                System.out.println("/////////////"+result);
+//                result = result.stream().filter(i -> i.getSex().equals(zInfoUser.getSex())).collect(Collectors.toList());
+//            }
+//            if(zInfoUser.getNickName() != null){
+//                System.out.println("/////////////"+result);
+//                result = result.stream().filter(i -> i.getNickName().equals(zInfoUser.getNickName())).collect(Collectors.toList());
+//            }
+////            List<Date> dates = allPeopleList.stream().
+//            if(zInfoUser.getHappenEndTime() != null && zInfoUser.getHappenStartTime() != null){
+//                result = result.stream().filter(a -> a.getBirth().before(zInfoUser.getHappenEndTime())).collect(Collectors.toList());
+//                Long result1 = result.stream().filter(a -> a.getBirth().after(zInfoUser.getHappenStartTime())).count();
+//                System.out.println("9999999999999999999999");
+//                System.out.println(result1);
+//            }
+//            System.out.println("9999999999999999999999");
+//            System.out.println(result);
+
         } catch (NullPointerException e) {
             throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
         }
 
-        System.out.println(result);
+       // System.out.println(result);
 
 //        result.stream().map(
 //                data->{
@@ -485,8 +536,11 @@
         userList.clear();
         List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
         recursionFindUser(treeList);
-      //  System.out.println(userList);
-        System.out.println("---------------");
+
+//        System.out.println("555555555555555555555555555555555555555555555555555555555555");
+
+//        System.out.println(userList);
+//        System.out.println("---------------");
         List<Genealogy> allData = userList.stream().map(
                 zInfoUser -> {
                     Genealogy newGenealogy = new Genealogy();
@@ -502,12 +556,11 @@
                         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++++++++++++++++++++++");
+//        System.out.println(allData);
+//        System.out.println("999999999988888888888++++++++++++++++++++++");
         List<Genealogy> collect = allData.stream()
                 .distinct()
                 .filter((data)-> data.getIsMyFamily() == 1)
@@ -521,14 +574,14 @@
             }
             resultData.add(collect.get(i));
         }
-        System.out.println(resultData);
-        System.out.println("999999999988888888888++++++++++++++++++++++");
+//        System.out.println(resultData);
+//        System.out.println("999999999988888888888++++++++++++++++++++++");
 //
 //
         //瀵箁esult鍋氫竴涓潯浠剁瓫閫�
-        Iterator<Genealogy> it = resultData.iterator();
-        while(it.hasNext()){
-            Genealogy data = it.next();
+        Iterator<Genealogy> it = resultData.iterator(); //杩唬鍣� 浠巒ull寮�濮�
+        while(it.hasNext()){ //鍒ゆ柇涓嬩竴涓寚閽堟寚鍚戝厓绱犳槸鍚︿负绌�
+            Genealogy data = it.next(); //璺冲埌涓嬩竴涓厓绱�
 
             if(genealogy.getIdentity()!=null){
                 if(data.getIdentity()!=genealogy.getIdentity()){
@@ -566,16 +619,22 @@
             }
 
             if(genealogy.getBirth()!=null){
-                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
+                if(data.getBirth().compareTo(genealogy.getBirth())!=0){  //姣旇緝
                     it.remove();
                     continue;
                 }
             }
+            if(genealogy.getHappenEndTime() != null && genealogy.getHappenStartTime() != null ){
+                if (data.getBirth() == null) {it.remove(); continue;}
+                if(data.getBirth().before(genealogy.getHappenStartTime()) || data.getBirth().after(genealogy.getHappenEndTime())){
+                    it.remove();
+                }
+            }
         }
 
-       System.out.println(resultData);
+   //    System.out.println(resultData);
 
-        System.out.println("================++++++++++++++66666666666666666999999999");
+      //  System.out.println("================++++++++++++++66666666666666666999999999");
 
 
 //        for (Genealogy data : resultData) {
@@ -676,22 +735,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;
     }
 
@@ -839,7 +901,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 +912,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 +939,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 +964,8 @@
         // 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