人物搜索 新加所有家族模块

zqy

3 天以前 3eb37463a952fb69d586769ca660886b956cb016

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

@@ -2,6 +2,7 @@


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;
@@ -11,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -40,7 +42,7 @@
 */
@Slf4j
@Service
public class ZfEventServiceImpl extends ServiceImpl<ZfEventMapper, ZfEvent> implements ZfEventService {
public class ZfEventServiceImpl extends ServiceImpl<ZfEventMapper, ZfEvent> implements ZfEventService,ModuleSearchable {

    @Resource
    ZInfoUserService zInfoUserService;
@@ -66,12 +68,54 @@
        LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfEvent::getCreateTime);
        lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()), ZfEvent::getAddress, zfEvent.getAddress());
        lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople());
        lqw.like(!StringUtils.isEmpty(zfEvent.getTitle()), ZfEvent::getTitle, zfEvent.getTitle());
        lqw.like(!StringUtils.isEmpty(zfEvent.getRemark()), ZfEvent::getRemark, zfEvent.getRemark());
        lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime());
        lqw.in(ZfEvent::getFamilyId,familyIdList);
        lqw.in(familyIdList != null, ZfEvent::getFamilyId,familyIdList);
        lqw.between(zfEvent.getHappenStartTime() != null && zfEvent.getHappenEndTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenStartTime(), zfEvent.getHappenEndTime());

        if (StringUtils.isNotEmpty(zfEvent.getIsHide())) {

            lqw.and(wrapper -> wrapper
                .ne(ZfEvent::getIsHide, "是")
                .or()
                .isNull(ZfEvent::getIsHide)
            );
        }else {
                    lqw.like(!StringUtils.isEmpty(zfEvent.getPeople()), ZfEvent::getPeople, zfEvent.getPeople());

        }
        if (zfEvent.getHasAttachment() != null && zfEvent.getHasAttachment().equals("是")) {
            lqw.apply("url IS NOT NULL AND url != ''");
        }
//        lqw.in(StringUtils.isNotEmpty(ZfEvent.getCompanionList()),ZfEvent::getCompanion,ZfEvent.getCompanionList());
//        if (ZfEvent.getYear() != 0) {
//            System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+ZfEvent.getYear());
//            lqw.apply("YEAR(happen_time) = {0}", ZfEvent.getYear());
//        }

        if (CollectionUtils.isNotEmpty(zfEvent.getCompanionList())) {
            List<String> companionList = zfEvent.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(people, ' ', ''), '，', ',')) > 0",
                        companion);
                }
            }
        }
        lqw.eq(zfEvent.getHappenTime() != null, ZfEvent::getHappenTime, zfEvent.getHappenTime());
        System.out.println("查询条件: " + lqw.getCustomSqlSegment());

        return lqw;
    }

@@ -325,14 +369,13 @@
        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);
        System.out.println(myself.getUaid());

   //     System.out.println(myself.getUaid());
        List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
        if(!fms.isEmpty())
        {
            idList.addAll(fms);
        }
        System.out.println(idList.size());

//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -620,4 +663,56 @@
    }


    @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) {
        ZfEvent zfEvent = new ZfEvent();
        zfEvent.setPeople(companion);
        zfEvent.setHappenStartTime(happenStartTime);
        zfEvent.setHappenEndTime(happenEndTime);

        System.out.println("--------------"+companion+"-----------------");
        String[] split = companion.trim().replace(" ", "").replace("，", ",").split(",");
        List<String> list = Arrays.asList(split);

        zfEvent.setCompanionList(list);
        zfEvent.setHasAttachment(hasAttachment);
        zfEvent.setIsHide("否");

        System.out.println("[[[[[[[["+zfEvent);

        return dataList(zfEvent);
    }

    public List<zfEventdto> dataList(ZfEvent zfEvent) {

        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, null);

        List<ZfEvent> beanRecords = list(lqw);



        return encapData(beanRecords);
    }

    public List<zfEventdto> encapData(List<ZfEvent> lis)
    {
        List<zfEventdto> daoRes = new ArrayList<>() ;
        for(ZfEvent obj : lis)
        {
            zfEventdto atd = new zfEventdto();
            atd.setId(Math.toIntExact(obj.getId()));
            atd.setModule("家纪");
            atd.setName(obj.getPeople());
            atd.setCreateTime(obj.getCreateTime());
            daoRes.add(atd);
        }
        return daoRes;
    }

}