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

zqy

5 天以前 b02beccf4567068cb47a3f1181a00039456c872d

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

@@ -1,30 +1,23 @@
package com.ruoyi.service.impl;


import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.EsModel;
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.domain.*;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.service.*;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -60,6 +53,12 @@
    //加入到es中
    @Resource
    private EsService esSer;

    @Resource
    private ZfEventDownloadService zfEventDownloadService;

    @Resource
    private ZfEventShareService zfEventShareService;

    @Resource
    private RestHighLevelClient restHighLevelClient;
@@ -214,17 +213,45 @@
//        String secondFamilyIds = listSecondFamilyIds();
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        System.out.println("================");

        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(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());


        //根据uaid查询相同名字下别的家庭里自己的数据
     //   Long fmid;
        System.out.println(myself.getUaid());

        List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
        if(!fms.isEmpty())
        {
            System.out.println("[[[[[[[[[[[}}}}}}}}}}}}}}}}}}");
            idList.addAll(fms);
        }
        //加上自己家庭的id
        idList.add(familyId);
        System.out.println(authority);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);

        LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent, idList);
        List<ZfEvent> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
    }

    @Override
@@ -237,10 +264,10 @@
        return list;
    }

    public List<ZfEvent> markOwnData(Long familyId,List<ZfEvent> beanRecords){
    public List<ZfEvent> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfEvent> 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);
@@ -277,11 +304,34 @@
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        System.out.println("++++++++++++++++");
        System.out.println(familyId);
        System.out.println(myself.getFatherId());
        System.out.println(zInfoUserService.getInfoById(myself.getFatherId()));
        //查看父母的数据：
        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(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);
   //     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);
        }

//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -292,7 +342,9 @@

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

        List<ZfEvent> dtoResult = markOwnData(familyId, beanRecords);
        System.out.println(beanRecords);
        System.out.println(beanRecords.size());
        List<ZfEvent> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
@@ -540,9 +592,11 @@
        }

        List<ZfEvent> zfEvents = listByIds(Arrays.asList(ids));
        if (! (zfEventDownloadService.deleteData(ids) && zfEventShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }

        if (zfEventService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
            zfEvents.stream().forEach(zfEvent -> {
                EsModel esModel = esSer.findByCtId(zfEvent.getId(), "家大事记");
@@ -556,6 +610,7 @@
                }
            });


            return AjaxResult.success();
        }else {
            return AjaxResult.error();