祖先修改&家谱生日搜索

zqy

2024-11-26 8a3d7199725a52b555d46daae5e95cef914c9ab3

祖先修改&家谱生日搜索

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java

@@ -176,12 +176,47 @@
     */
    @Log(title = "祖先", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ZfAncestor zfAncestor) {
    public AjaxResult edit(@RequestBody AncestorHelper ancestorHelper) {

        ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
        updateAncestor(zfAncestor);
        if (spouseSex.getId() != null)
        updateAncestor(spouseSex);
//        ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
//        updateAncestor(zfAncestor);
//        if (spouseSex.getId() != null)
//        updateAncestor(spouseSex);

        //修改sys_user表
        SysUser us = new SysUser();
        us.setNickName(ancestorHelper.getName());
        //   us.setStatus(String.valueOf(zfAncestor.getStatus()));
        us.setSex(String.valueOf(ancestorHelper.getSex()));
        us.setUserName(ancestorHelper.getName());
//        us.setClanId(ancestorHelper.getClanId());
        us.setUserId(ancestorHelper.getSysId());

        if (!userService.checkNickNameUnique(us)) {
            return error("修改祖先'" + us.getNickName() + "'失败，登录账号已存在");
        }
        userService.updateUser(us);


        //修改z_info_user表
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setSysId(us.getUserId());
        infoUser.setNickName(us.getNickName());
        infoUser.setOldName(us.getUserName());
        infoUser.setSex(Integer.parseInt(us.getSex()));
        ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(us.getUserId());
        infoUser.setUserId(infoBysysId.getUserId());

        zInfoUserService.saveOrUpdate(infoUser);

        //修改zf_ancestor表
        ZfAncestor zfAncestor = new ZfAncestor();
//        zfAncestor.setClanId(ancestorHelper.getClanId());
        zfAncestor.setName(ancestorHelper.getName());
        zfAncestor.setSex(ancestorHelper.getSex());
        zfAncestor.setSysId(ancestorHelper.getSysId());

        zfAncestorService.update(zfAncestor);

        return  AjaxResult.success();
    }
@@ -307,10 +342,6 @@
            zfAncestor1.setStatus(0);
            zfAncestor1.setSysId(usa.getUserId());
            zfAncestorService.addData(zfAncestor1);




        }
        else{
            //保存祖先管理员,也先保存到sys_user
@@ -351,7 +382,6 @@
            zfAncestor.setSysId(us.getUserId());

            zfAncestorService.addData(zfAncestor);


        }


 zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java

@@ -23,7 +23,7 @@

    AjaxResult deleteData(Integer clanId, Integer id);

    ZfAncestor update(ZfAncestor zfAncestor);
    AjaxResult update(ZfAncestor zfAncestor);

    ZfAncestor selectZfAncestor(ZfAncestor zfAncestor);


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

@@ -596,11 +596,13 @@
                }
            }

            if(genealogy.getBirth()!=null&&data.getBirth()!=null){
                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
                    it.remove();
                    continue;
            if(genealogy.getBirth()!=null){
                if(data.getBirth()!=null) {
                    if (data.getBirth().compareTo(genealogy.getBirth()) != 0) {
                        it.remove();
                    }
                }
                else it.remove();
            }
        }


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

@@ -17,6 +17,7 @@
import com.ruoyi.mapper.ZfAncestorMapper;
import com.ruoyi.service.*;
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.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@

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

@Service
@@ -45,6 +47,9 @@

    @Resource
    private  ZfClanService zfClanService;

    @Resource
    ZfLogService zfLogService;


    private LambdaQueryWrapper<ZfAncestor> buildCondition(ZfAncestor zfAncestor) {
@@ -274,35 +279,90 @@
    }

    @Override
    public ZfAncestor update(ZfAncestor zfAncestor) {
        LambdaQueryWrapper<ZfAncestor> lqw = uniqueCondition(zfAncestor);
        List<ZfAncestor> list = list(lqw);
    public AjaxResult update(ZfAncestor zfAncestor) {
//        LambdaQueryWrapper<ZfAncestor> lqw = uniqueCondition(zfAncestor);
//        List<ZfAncestor> list = list(lqw);
//        System.out.println(list);
        ZInfoUser updateDate =zInfoUserService.getInfoBysysId(zfAncestor.getSysId());
        ZfAncestor zfAncestor1 = new ZfAncestor();
        ZfAncestor zfAncestor2 = new ZfAncestor();
        zfAncestor1.setId(list.get(0).getId());
        zfAncestor1.setName(zfAncestor.getName());
        System.out.println(updateDate);
        if (zfAncestor.getSex() != null){
        if(updateDate.getSpouseId() != null && updateDate.getSpouseId() != 0){
            Long spouseId=updateDate.getSpouseId();
            if (zInfoUserService.getById(spouseId).getSex().equals(zfAncestor.getSex())){
//        ZInfoUser updateDate =zInfoUserService.getInfoBysysId(zfAncestor.getSysId());
//        ZfAncestor zfAncestor1 = new ZfAncestor();
//        ZfAncestor zfAncestor2 = new ZfAncestor();
//        zfAncestor1.setId(list.get(0).getId());
//        zfAncestor1.setName(zfAncestor.getName());
//        System.out.println(updateDate);
//        if (zfAncestor.getSex() != null){
//        if(updateDate.getSpouseId() != null && updateDate.getSpouseId() != 0){
//            Long spouseId=updateDate.getSpouseId();
//            if (zInfoUserService.getById(spouseId).getSex().equals(zfAncestor.getSex())){
//
//                Long spouseSysId = zInfoUserService.getById(spouseId).getSysId();
//                zfAncestor2.setSysId(spouseSysId);
//                Integer spId = list(uniqueCondition(zfAncestor2)).get(0).getId();
//                zfAncestor2.setId(spId);
//                zfAncestor2.setSex(zfAncestor.getSex() == 0? 1: 0);
//                System.out.println(zfAncestor2);
//                zfAncestorService.updateById(zfAncestor2);
//            }}
//            zfAncestor1.setSex(zfAncestor.getSex());}
////        System.out.println("1841vdndigrrr"+zfAncestor1);
//
//            zfAncestorService.updateById(zfAncestor1);

                Long spouseSysId = zInfoUserService.getById(spouseId).getSysId();
                zfAncestor2.setSysId(spouseSysId);
                Integer spId = list(uniqueCondition(zfAncestor2)).get(0).getId();
                zfAncestor2.setId(spId);
                zfAncestor2.setSex(zfAncestor.getSex() == 0? 1: 0);
                System.out.println(zfAncestor2);
                zfAncestorService.updateById(zfAncestor2);
            }}
            zfAncestor1.setSex(zfAncestor.getSex());}
//        System.out.println("1841vdndigrrr"+zfAncestor1);
        //操作后加入日志
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("家族修改");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);
        System.out.println("===================================="+zfAncestor);

            zfAncestorService.updateById(zfAncestor1);
        LambdaQueryWrapper<ZfAncestor> lqw = uniqueCondition(zfAncestor);
        ZfAncestor zfAncestorList = list(lqw).get(0);
        zfAncestor.setId(zfAncestorList.getId());
        System.out.println(zfAncestorList);
        if(updateById(zfAncestor)){
            //到数据库中查询对应的数据
            ZfAncestor dataById = getById(zfAncestor.getId());
            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esSer.findByCtId(dataById.getId(), "家族");
            if (esResult == null){
                return AjaxResult.success();
            }
            System.out.println("-------------------------"+zfAncestor);
            //操作es修改数据
            EsModel newModel = new EsModel();
//            System.out.println(meeting);
//            System.out.println("=============="+meeting.getConnPhone());
            if(zfAncestor.getSex() != null){
                newModel.setBy8(zfAncestor.getSex());
            }else {
                newModel.setBy8(dataById.getSex());
            }

        return zfAncestor2;
            if(zfAncestor.getName() != null){
                newModel.setBy2(zfAncestor.getName());
            }else {
                newModel.setBy2(dataById.getName());
            }



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

            );

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

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

    @Override