From 3eb37463a952fb69d586769ca660886b956cb016 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 12:24:40 +0800
Subject: [PATCH] 人物搜索 新加所有家族模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 200 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 174 insertions(+), 26 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
index 1a6014a..e8590d3 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -2,33 +2,25 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfPetMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfMasterService;
-import com.ruoyi.service.ZfPetService;
+import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.util.*;
import java.util.stream.Collectors;
import static com.ruoyi.constant.MenuAuthority.*;
@@ -43,7 +35,7 @@
*/
@Service
@Slf4j
-public class ZfPetServiceImpl extends ServiceImpl<ZfPetMapper, ZfPet> implements ZfPetService {
+public class ZfPetServiceImpl extends ServiceImpl<ZfPetMapper, ZfPet> implements ZfPetService,ModuleSearchable {
@Autowired
ZInfoUserService zInfoUserService;
@@ -53,9 +45,19 @@
@Autowired
ZfPetService zfPetService;
-
+
@Resource
ZAuthorityService zAuthorityService;
+
+ @Resource
+ ZfPetNoteService zfPetNoteService;
+
+ @Resource
+ ZfPetSharService zfPetSharService;
+
+ @Resource
+ ZfPetDownlService zfPetDownlService;
+
@Override
public AjaxResult selectDataList(ZfPet zfPet, Integer pageNum, Integer pageSize) {
// LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet);
@@ -67,12 +69,35 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
+
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(FAMILY_PET_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet, idList);
@@ -83,26 +108,26 @@
List<ZfPet> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
- List<ZfPet> dtoResult = markOwnData(familyId, beanRecords);
+ List<ZfPet> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
return AjaxResult.success(data);
}
- public List<ZfPet> markOwnData(Long familyId,List<ZfPet> beanRecords){
+ public List<ZfPet> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfPet> beanRecords){
return beanRecords.stream().peek(
bean -> {
- if (bean.getFamilyId() == familyId) {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
bean.setOwnData(1);
} else {
bean.setOwnData(0);
}
}
- ).collect(Collectors.toList());
+ ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
}
-
+
@Override
public List<ZfPet> selectByCondition(ZfPet zfPet) {
@@ -114,16 +139,33 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
+
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(FAMILY_PET_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
LambdaQueryWrapper<ZfPet> lambdaQueryWrapper = buildCondition(zfPet, idList);
List<ZfPet> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
- return markOwnData(familyId, beanRecords);
+ return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
}
@Override
@@ -192,6 +234,9 @@
}
}
+ @Resource
+ ZfLogService zfLogService;
+
@Override
public AjaxResult updateData(ZfPet zfPet) {
ZInfoUser myself = zInfoUserService.getMyself();
@@ -207,6 +252,13 @@
if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("榄呭疇");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
if(updateById(zfPet)){
return AjaxResult.success();
@@ -230,6 +282,13 @@
if (!familyIdList.contains(data.getFamilyId())){
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+ List<ZfPetNote> petNoteByPetId = zfPetNoteService.getPetNoteByPetId(data.getId());
+ if(petNoteByPetId.size() != 0)
+ if (!zfPetNoteService.removeBatchByIds(petNoteByPetId))
+ return AjaxResult.error();
+ }
+ if (! (zfPetDownlService.deleteData(ids) && zfPetSharService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
}
if (zfPetService.removeByIds(Arrays.asList(ids))) {
@@ -299,12 +358,14 @@
private LambdaQueryWrapper<ZfPet> buildCondition(ZfPet zfPet,List<Long> familyIdList) {
LambdaQueryWrapper<ZfPet> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfPet::getCreateTime);
- lqw.in(ZfPet::getFamilyId,familyIdList);
+ lqw.in(familyIdList != null, ZfPet::getFamilyId,familyIdList);
+ lqw.eq(zfPet.getId()!=null,ZfPet::getId,zfPet.getId());
lqw.like(StringUtils.isNotEmpty(zfPet.getIdNum()),ZfPet::getIdNum,zfPet.getIdNum());
lqw.like(StringUtils.isNotEmpty(zfPet.getSecurityCode()),ZfPet::getSecurityCode,zfPet.getSecurityCode());
lqw.like(StringUtils.isNotEmpty(zfPet.getType()),ZfPet::getType,zfPet.getType());
lqw.like(StringUtils.isNotEmpty(zfPet.getName()),ZfPet::getName,zfPet.getName());
- lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
+// lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
+ lqw.between(zfPet.getBirthStart()!=null && zfPet.getBirthEnd()!=null,ZfPet::getBirth,zfPet.getBirthStart(),zfPet.getBirthEnd());
lqw.like(zfPet.getSex()!=null,ZfPet::getSex,zfPet.getSex());
lqw.like(StringUtils.isNotEmpty(zfPet.getColor()),ZfPet::getColor,zfPet.getColor());
lqw.like(StringUtils.isNotEmpty(zfPet.getProperties()),ZfPet::getProperties,zfPet.getProperties());
@@ -314,6 +375,93 @@
lqw.like(StringUtils.isNotEmpty(zfPet.getDialect()),ZfPet::getDialect,zfPet.getDialect());
lqw.like(StringUtils.isNotEmpty(zfPet.getDisEatHabit()),ZfPet::getDisEatHabit,zfPet.getDisEatHabit());
lqw.like(StringUtils.isNotEmpty(zfPet.getDisLifeHabit()),ZfPet::getDisLifeHabit,zfPet.getDisLifeHabit());
- return lqw;
- }
-}
+
+
+ if (StringUtils.isNotEmpty(zfPet.getIsHide())) {
+
+ lqw.and(wrapper -> wrapper
+ .ne(ZfPet::getIsHide, "鏄�")
+ .or()
+ .isNull(ZfPet::getIsHide)
+ );
+ }
+ if (zfPet.getHasAttachment() != null && zfPet.getHasAttachment().equals("鏄�")) {
+ lqw.apply("url IS NOT NULL AND url != ''");
+ }
+// lqw.in(StringUtils.isNotEmpty(zfPet.getCompanionList()),zfPet::getCompanion,zfPet.getCompanionList());
+// if (zfPet.getYear() != 0) {
+// System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+zfPet.getYear());
+// lqw.apply("YEAR(happen_time) = {0}", zfPet.getYear());
+// }
+
+ if (CollectionUtils.isNotEmpty(zfPet.getCompanionList())) {
+ List<String> companionList = zfPet.getCompanionList();
+
+ // 娓呯悊鍜屽幓閲�
+ companionList = companionList.stream()
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .distinct()
+ .collect(Collectors.toList());
+
+ if (!companionList.isEmpty()) {
+ // 纭繚鎵�鏈夊弬涓庝汉閮藉湪companion瀛楁涓�
+ for (String companion : companionList) {
+ lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '锛�', ',')) > 0",
+ companion);
+ }
+ }
+ }
+
+ return lqw;}
+
+
+ @Override
+ public String getModuleCode() {
+ return "瀹犵墿";
+ }
+
+ @Override
+// @Cacheable(value = "economy_search", key = "T(String).format('2045_%s_%s_%s_%s',#companion != null ? #companion : 'null',#happenStartTime != null ? #happenStartTime.getTime() : 0,#happenEndTime != null ? #happenEndTime.getTime() : 0,#hasAttachment != null ? #hasAttachment : 'null')")
+ public List<?> search(String companion, Date happenStartTime,Date happenEndTime,String hasAttachment) {
+ ZfPet zfPet = new ZfPet();
+ zfPet.setCompanion(companion);
+
+
+ String[] split = companion.split(",");
+ List<String> list = Arrays.asList(split);
+
+ zfPet.setCompanionList(list);
+ zfPet.setHasAttachment(hasAttachment);
+ zfPet.setIsHide("鍚�");
+
+ System.out.println("[[[[[[[["+zfPet);
+
+ return dataList(zfPet);
+ }
+
+ public List<zfEventdto> dataList(ZfPet zfPet) {
+
+ LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet, null);
+
+ List<ZfPet> beanRecords = list(lqw);
+
+
+
+ return encapData(beanRecords);
+ }
+
+ public List<zfEventdto> encapData(List<ZfPet> lis)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(ZfPet obj : lis)
+ {
+ zfEventdto atd = new zfEventdto();
+ atd.setId(Math.toIntExact(Long.parseLong(obj.getId())));
+ atd.setModule("瀹犵墿");
+ atd.setName(obj.getCompanion());
+ atd.setCreateTime(obj.getCreateTime());
+ daoRes.add(atd);
+ }
+ return daoRes;
+ }}
--
Gitblit v1.9.1