again

zqy

2024-11-18 252b80a521ff9db4b449fd616962d1354e7c9fcc

again

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -5,8 +5,10 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
import org.apache.ibatis.type.JdbcType;

import java.io.Serializable;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -249,6 +251,20 @@
    @TableField(exist = false)
    private List<ZInfoUser> childList;

    /**
     * 开始时间  生日
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
    private Date happenStartTime;

    /**
     * 结束时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
    private Date happenEndTime;



}

 zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java

@@ -106,6 +106,9 @@
     */
    private String url;

    /**
     * 时间
     */
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date happenStartTime;
@@ -114,6 +117,18 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date happenEndTime;


    /**
     * 期限
     */
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date vHappenStartTime;

    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date vHappenEndTime;

    /**
     * 分享人
     */

 zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java

@@ -1,8 +1,10 @@
package com.ruoyi.domain.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import org.apache.ibatis.type.JdbcType;

import java.io.Serializable;
import java.util.Date;
@@ -54,4 +56,19 @@

    private Genealogy spouse;

    /**
     * 开始时间  生日
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
    private Date happenStartTime;

    /**
     * 结束时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
    private Date happenEndTime;


}

 zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java

 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>
@@ -446,9 +447,9 @@
        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);
@@ -456,6 +457,7 @@

//        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 -> {
@@ -465,6 +467,7 @@
                        }
                        return people;
                    }).collect(Collectors.toList());
//
        } catch (NullPointerException e) {
            throw new RuntimeException("您在加入成员的时候没有指定该成员的父亲或者母亲");
        }
@@ -532,12 +535,9 @@
                        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)
@@ -556,9 +556,9 @@
//
//
        //对result做一个条件筛选
        Iterator<Genealogy> it = resultData.iterator();
        while(it.hasNext()){
            Genealogy data = it.next();
        Iterator<Genealogy> it = resultData.iterator(); //迭代器 从null开始
        while(it.hasNext()){ //判断下一个指针指向元素是否为空
            Genealogy data = it.next(); //跳到下一个元素

            if(genealogy.getIdentity()!=null){
                if(data.getIdentity()!=genealogy.getIdentity()){
@@ -596,9 +596,15 @@
            }

            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();
                }
            }
        }
@@ -936,6 +942,7 @@

        // layer = layer + 1;
       // System.out.println(depth);

        List<ZInfoUser> collect = allPeopleList.stream().filter(
                one ->  Objects.equals(one.getFatherId(), people.getUserId()) ||  Objects.equals(one.getMomId(),people.getUserId())
        ).map(

 zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java

@@ -65,6 +65,7 @@
                .eq(zSecret.getIsPrivate()!=null,ZSecret::getIsPrivate,zSecret.getIsPrivate())
                .eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace())
                .between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime())
                .between(zSecret.getVHappenStartTime() != null && zSecret.getVHappenEndTime() != null, ZSecret::getValidityDate, zSecret.getVHappenStartTime(), zSecret.getVHappenEndTime())
                .orderByDesc(ZSecret::getCreateTime);
        return lqw;
    }