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/domain/dto/Genealogy.java | 17 ++++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 62 +++++++++++++++++++++++--------
zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java | 3 +
zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java | 2
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 16 ++++++++
5 files changed, 83 insertions(+), 17 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 095b1b3..b6e5d53 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/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;
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
index bd669b7..14bfbf6 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/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;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
index 94d2f3a..c1346f5 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
+++ b/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;
+
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java
index 4f1b7c8..cb508d6 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java
@@ -136,4 +136,4 @@
Map<Long,List<Long>> menuAconId = getByUserId(userId).stream().collect(Collectors.groupingBy(ZfShare::getSysMenuId,Collectors.mapping(ZfShare::getShareContent,Collectors.toList())));
return AjaxResult.success(all(menuAconId));
}
-}
+}
\ No newline at end of file
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 40ef5ab..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>
@@ -446,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 -> {
@@ -465,6 +467,25 @@
}
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("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
}
@@ -515,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();
@@ -532,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)
@@ -551,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()){
@@ -596,9 +619,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 +965,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(
--
Gitblit v1.9.1