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

zqy

5 天以前 b02beccf4567068cb47a3f1181a00039456c872d

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

@@ -6,9 +6,7 @@
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.*;
@@ -17,7 +15,6 @@
import com.ruoyi.mapper.ZfCleanMapper;
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;
@@ -64,6 +61,12 @@
    
    @Resource
    RestHighLevelClient restHighLevelClient;

    @Resource
    ZfCleanShareService zfCleanShareService;

    @Resource
    ZfCleanDownloadService zfCleanDownloadService;

    private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
@@ -229,16 +232,34 @@
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        Long familyId = myself.getFamilyId();

        //查看父母的数据：
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            System.out.println("11111111111111111111");
            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(CLEAN_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<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, idList);
        List<ZfClean> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
    }

    @Override
@@ -269,10 +290,10 @@
//        }).collect(Collectors.toList());
//    }

    public List<ZfClean> markOwnData(Long familyId,List<ZfClean> beanRecords){
    public List<ZfClean> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfClean> 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);
@@ -299,12 +320,35 @@

        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        if(myself==null)
        {
            //   System.out.println("ssssss");
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        System.out.println("22222222222222222222");
        //查看父母的数据：
        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(CLEAN_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<ZfClean> lqw = buildCondition(zfClean, idList);
@@ -315,7 +359,7 @@

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

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

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
@@ -324,6 +368,9 @@
    @Override
    public AjaxResult addData(ZfClean zfClean) {


        if(zfClean.getKind()==null)
            zfClean.setKind(0);
//        String familyIds = listFamilyIds();
//        boolean flag = false;//判断当前用户的id是否有权加入当前家庭id的对象
//        if (familyIds.contains(",")) {
@@ -391,6 +438,7 @@
            esModel.setBy4(zfClean.getSuitable());
            esModel.setBy5("/family/zfClean");
            esModel.setRemark(zfClean.getRemark());
            esModel.setFid(familyId);
            //这里存储查询详情的路径
            esService.insertTable(esModel);
            
@@ -452,9 +500,10 @@
            throw new RuntimeException(e);
        }
        log.info("数据列表为：{}", dataList);

        for (ZfClean zfClean : dataList) {
            zfCleanService.addData(zfClean);
            if (zfClean.getMethod().length() != 0 && zfClean.getPlace().length() != 0 && zfClean.getSuitable().length() != 0) {
                zfCleanService.addData(zfClean);
            }
        }

        return AjaxResult.success("导入数据成功");
@@ -492,6 +541,10 @@

            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "保洁与收纳");

            if (esResult == null){
                return AjaxResult.success();
            }

            //操作es修改数据
            EsModel newModel = new EsModel();
@@ -566,17 +619,22 @@
        }

        List<ZfClean> zfCleans = listByIds(Arrays.asList(ids));

        if (! (zfCleanDownloadService.deleteData(ids) && zfCleanShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        if (zfCleanService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
            zfCleans.stream().forEach(zfClean -> {
                EsModel esModel = esService.findByCtId(zfClean.getId().intValue(), "保洁与收纳");
                DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                try {
                    restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
                } catch (IOException e) {
                    throw new RuntimeException(e);

                if (esModel != null){
                    DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                    try {
                        restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
                    } catch (IOException e) {
                        throw new RuntimeException(e);
                    }
                }
            });
            return AjaxResult.success();