用户修改姓名和电话同步修改uaid

zqy

5 天以前 b02beccf4567068cb47a3f1181a00039456c872d

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

@@ -57,6 +57,12 @@
    @Resource
    RestHighLevelClient restHighLevelClient;

    @Resource
    ZfContactShraServiceImpl zfContactShraService;

    @Resource
    ZfContactDownlService zfContactDownlService;


    private LambdaQueryWrapper<ZfContact> buildCondition(ZfContact zfContact,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfContact> lqw = new LambdaQueryWrapper<>();
@@ -208,16 +214,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.getInfoById(myself.getMomId()).getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CONTACT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        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<ZfContact> lambdaQueryWrapper = buildCondition(zfContact, idList);
        List<ZfContact> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
    }

    @Override
@@ -248,10 +271,10 @@
//        }).collect(Collectors.toList());
//    }

    public List<ZfContact> markOwnData(Long familyId,List<ZfContact> beanRecords){
    public List<ZfContact> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfContact> 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);
@@ -284,11 +307,29 @@
            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(CONTACT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        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<ZfContact> lqw = buildCondition(zfContact, idList);
@@ -299,7 +340,7 @@

        List<ZfContact> beanRecords = pageResult.getRecords();//得到查询出来的数据

        List<ZfContact> dtoResult = markOwnData(familyId, beanRecords);
        List<ZfContact> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
@@ -450,7 +491,7 @@
        log.info("数据列表为：{}", dataList);

        for (ZfContact zfContact : dataList) {
            zfContactService.addData(zfContact);
                zfContactService.addData(zfContact);
        }

        return AjaxResult.success("导入数据成功");
@@ -567,6 +608,9 @@

        List<ZfContact> zfContacts = listByIds(Arrays.asList(ids));

        if (! (zfContactDownlService.deleteData(ids) && zfContactShraService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        if (zfContactService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据