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

zqy

5 天以前 b02beccf4567068cb47a3f1181a00039456c872d

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

@@ -19,6 +19,7 @@

import javax.annotation.Resource;
import java.io.IOException;
import java.sql.SQLIntegrityConstraintViolationException;
import java.time.LocalDateTime;
import java.util.*;

@@ -41,25 +42,19 @@
    private ZfClanService zfClanService;

    @Resource
    private ZfClanManageService zfClanManageService;
    private ZfAncestorService zfAncestorService;


    private LambdaQueryWrapper<ZfClan> buildCondition(ZfClan zfClan) {
        LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfClan::getClanId);
        lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName())
                .like(zfClan.getAdminId() != null, ZfClan::getAdminId, zfClan.getAdminId())
                .like(zfClan.getMomId() != null, ZfClan::getDadId, zfClan.getDadId())
                .like(zfClan.getDadId() != null, ZfClan::getMomId, zfClan.getMomId());
        lqw.like(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
        return lqw;
    }

    private LambdaQueryWrapper<ZfClan> uniqueCondition(ZfClan zfClan){
        LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
        lqw.eq(!StringUtils.isEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
        lqw.eq(zfClan.getAdminId() !=null, ZfClan::getAdminId, zfClan.getAdminId());
        lqw.eq(zfClan.getDadId() !=null , ZfClan::getDadId, zfClan.getDadId());
        lqw.eq(zfClan.getMomId() !=null, ZfClan::getMomId, zfClan.getMomId());
        return lqw;
    }

@@ -80,36 +75,58 @@
    @Override
    public AjaxResult selectDataList(ZfClan zfClan, Integer pageNum, Integer pageSize) {
        LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
        List<ZfClan> beanRecords = list(lqw);

        List<ZfClanDate> zfClanDates=new ArrayList<>();

        System.out.println(beanRecords);
        for (ZfClan zfClan1: beanRecords) {
            ZfClanDate zfClanDate = new ZfClanDate();
            HashMap<Integer,String> adminName = new HashMap<>();
            adminName.put(zfClan1.getAdminId(),zInfoUserService.getById(zfClan1.getAdminId()).getNickName());
            zfClanDate.setAdminName(adminName);
            HashMap<Integer,String> momName = new HashMap<>();
            momName.put(zfClan1.getMomId(),zInfoUserService.getById(zfClan1.getMomId()).getNickName());
            zfClanDate.setMomName(momName);
            HashMap<Integer,String> dadName = new HashMap<>();
            dadName.put(zfClan1.getDadId(),zInfoUserService.getById(zfClan1.getDadId()).getNickName());
            zfClanDate.setDadName(dadName);
            zfClanDate.setClanId(zfClan1.getClanId());
            zfClanDate.setClanName(zfClan1.getClanName());
            zfClanDates.add(zfClanDate);
        Page<ZfClan> zfClanPage = new Page<>(pageNum, pageSize);
        Page<ZfClan> pageResult = page(zfClanPage, lqw);

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

        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
        return AjaxResult.success(data);    }

    @Override
    public AjaxResult selectData() {
        List<ZfClan> lis = this.list();
        return AjaxResult.success(lis);
    }

    @Override
    public AjaxResult selectDataList(ZfClan zfClan){
        LambdaQueryWrapper<ZfClan> lqw = buildCondition(zfClan);
        List<ZfClan> zfClans = list(lqw);
        List<ZfClan>  satisfyList = new ArrayList<>();
        for (ZfClan zfClan1: zfClans) {
            if (zfAncestorService.count(zfClan1.getClanId())){
               satisfyList.add(zfClan1);}
        }
        return AjaxResult.success(satisfyList);
    }

        return AjaxResult.success(zfClanDates);
    @Override
    public List<ZfClan> selectByCondition(ZfClan zfClan) {

}
        System.out.println("8008888//"+zfClan.getClanId());
        LambdaQueryWrapper<ZfClan> lambdaQueryWrapper = buildCondition(zfClan);
        lambdaQueryWrapper.eq(zfClan.getClanId()!=null,ZfClan::getClanId,zfClan.getClanId());

        return list(lambdaQueryWrapper);
    }

    @Override
    public List<ZfClan> selectByIds(Long[] ids) {
        List<ZfClan> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }

    @Override
    public AjaxResult addData(ZfClan zfClan) {
        LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
        List<ZfClan> list = list(lqw);


        if(list.size()>0){
            throw new RuntimeException("请勿新增重复家族");
@@ -131,10 +148,7 @@
//            esModel.setFid(familyId);
            esSer.insertTable(esModel);
//            System.out.println(esModel);
            zfClanManageService.addA(zfClan.getClanId(),zfClan.getDadId(),2);
            zfClanManageService.addA(zfClan.getClanId(),zfClan.getMomId(),2);
//            if (!zfClan.getDadId().equals(zfClan.getAdminId()) && !zfClan.getMomId().equals(zfClan.getAdminId()) )
            zfClanManageService.addA(zfClan.getClanId(),zfClan.getAdminId(),1);


            return AjaxResult.success();
        } else {
@@ -154,52 +168,73 @@
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("家族");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
//        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);

        LambdaQueryWrapper<ZfClan> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfClan::getClanId);
        lqw.eq(StringUtils.isNotEmpty(zfClan.getClanName()), ZfClan::getClanName, zfClan.getClanName());
        List<ZfClan> lis = this.list(lqw);
//        System.out.println("===================================="+meeting);
        if(updateById(zfClan)){
            //到数据库中查询对应的数据
            ZfClan dataById = getById(zfClan.getClanId());
        if(lis.size()>0)
        {
            return AjaxResult.success("家族名称不能重复！");

            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esSer.findByCtId(dataById.getClanId(), "家族");
//            System.out.println("===================================="+meeting);
            if (esResult == null){
                return AjaxResult.success();
            }

            //操作es修改数据
            EsModel newModel = new EsModel();
            if(zfClan.getClanName()!=null){
                newModel.setBy1(zfClan.getClanName());
            }else {
                newModel.setBy1(dataById.getClanName());
            }
//

            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
            updateRequest.doc(
                    "by1",newModel.getBy1()

            );

            try {
                restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
            } catch (IOException e) {
                throw new RuntimeException(e);
            }

            return AjaxResult.success();
        }else {
            return AjaxResult.error();
        }
        else
        {
            boolean res = updateById(zfClan);
            return AjaxResult.success();
        }

          //  if(res){

          //  }else {
          //      return AjaxResult.success("家族名称不能重复！");
          //  }



      //  return AjaxResult.success("家族名称不能重复！");
//            //到数据库中查询对应的数据
//            ZfClan dataById = getById(zfClan.getClanId());
//
//            //先到es中查询到对应那条数据在es的id
//            EsModel esResult = esSer.findByCtId(dataById.getClanId(), "家族");
////            System.out.println("===================================="+meeting);
//            if (esResult == null){
//                return AjaxResult.success();
//            }
//
//            //操作es修改数据
//            EsModel newModel = new EsModel();
//            if(zfClan.getClanName()!=null){
//                newModel.setBy1(zfClan.getClanName());
//            }else {
//                newModel.setBy1(dataById.getClanName());
//            }
////
//
//            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
//            updateRequest.doc(
//                    "by1",newModel.getBy1()
//
//            );

//            try {
//                restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
//            } catch (IOException e) {
//                throw new RuntimeException(e);
//            }


    }

    @Override
    public AjaxResult deleteData(Long ids) {
        List<ZfClan> zfClans = listByIds(Arrays.asList(ids));

        zfClanManageService.deleteMember(ids);
        zfAncestorService.deleteMember(ids);
        if (zfClanService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
@@ -216,6 +251,7 @@
            });



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