Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo

CeDo

2021-06-10 af73409f431fb97eade82d34eff8c7b05e7fac92

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -175,6 +176,9 @@
    @Override
    public R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(Long id) {
        EldersAuthDO eldersAuthDO = eldersAuthDAO.selectById(id);
        if(eldersAuthDO == null){
            return R.fail("未查询到认证记录");
        }
        ComEldersAuthElderlyDetailsVO comEldersAuthElderlyDetailsVO = new ComEldersAuthElderlyDetailsVO();
        BeanUtils.copyProperties(eldersAuthDO, comEldersAuthElderlyDetailsVO);

@@ -193,16 +197,16 @@
    }

    @Override
    public R<SysConfVO> communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
    public R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        Long communityId = eldersAuthTypeQueryDTO.getCommunityId();
        List<SysConfDO> confDOList =
                sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCommunityId, communityId)
                        .orderByDesc(SysConfDO::getCreateAt));
                .orderByDesc(SysConfDO::getCreateAt));
        if(confDOList==null || confDOList.size()==0){
            SysConfDO sysConfDO = new SysConfDO();
            sysConfDO.setCode("ELDER_AUTH_TYPE");
            sysConfDO.setName("高龄认证类型");
            sysConfDO.setValue(1+"");//核验类型（1.视频认证 2.人脸核验）
            sysConfDO.setValue(2+"");//核验类型（1.视频认证 2.人脸核验）
            sysConfDO.setDescription("高龄认证默认添加的核验类型");
            sysConfDO.setCommunityId(communityId);
            sysConfDO.setCreateBy(eldersAuthTypeQueryDTO.getUserId());
@@ -218,7 +222,7 @@
            SysConfDO  latest = confDOList.get(0);
            SysConfVO sysConfVO = new SysConfVO();
            BeanUtils.copyProperties(latest, sysConfVO);
            return R.ok(sysConfVO);
            return R.ok(sysConfVO.getValue());
        }
        return R.ok();
    }
@@ -239,9 +243,14 @@
            eldersAuthDO.setCreateBy(authGetResultDTO.getUserId());
            eldersAuthDO.setCreateAt(new Date());
            eldersAuthDO.setSumitUserId(authGetResultDTO.getUserId());
            eldersAuthDO.setDomicile(this.baseMapper.selectDomicile(authUserDO.getIdCard()));
            String domicile = this.baseMapper.selectDomicile(eldersAuthDO.getIdCard());
            if(org.springframework.util.StringUtils.isEmpty(domicile)){
                domicile = "暂无";
            }
            eldersAuthDO.setDomicile(domicile);
            eldersAuthDO.setBirthDay(IdCard.birthDay(authUserDO.getIdCard()));
            eldersAuthDO.setFamilyUserId(authUserDO.getId());
            eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
            eldersAuthDO.setType(2);
            eldersAuthDO.setVerificationResult(authGetResultDTO.getVerificationResult());

@@ -250,7 +259,7 @@
            authUserDO.setIsAuth(ComEldersAuthUserDO.isAuth.yes);
            comEldersAuthUserMapper.updateById(authUserDO);

            return R.ok();
            return R.ok(eldersAuthDO.getId());
        }
        log.error("人脸核验新增认证记录失败，错误原因：未查询到老人记录，老人id：" + authGetResultDTO.getAuthUserId());
        return R.fail();
@@ -266,23 +275,27 @@
        //判断当前用户是否是高龄老人，如果是则将这个人新增到高龄老人的列表里
        SysUserVO userVO = this.eldersAuthDAO.getSysUserByUserId(authPageDTO.getUserId());
        if(userVO != null){
            //查询老人库是否存在当前用户信息
            ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()
                    .eq(ComEldersAuthElderlyDO::getIdCard,userVO.getIdCard()));

            if(authElderlyDO != null){
                ComEldersAuthUserDO authUserDO = new ComEldersAuthUserDO();
                authUserDO.setUserId(userVO.getUserId());
                authUserDO.setRelation(ComEldersAuthUserDO.relation.br);
                authUserDO.setName(userVO.getName());
                authUserDO.setIdCard(userVO.getIdCard());
                authUserDO.setCommunityId(authElderlyDO.getCommunityId());
                authUserDO.setBigAgeId(authElderlyDO.getId());
                comEldersAuthUserMapper.insert(authUserDO);
            //查询当前用户是否已存在用户关联中
            ComEldersAuthUserDO oldAuthUserDO = comEldersAuthUserMapper.selectOne(new QueryWrapper<ComEldersAuthUserDO>().lambda()
                    .eq(ComEldersAuthUserDO::getIdCard,userVO.getIdCard()));
            if(oldAuthUserDO == null){
                //查询老人库是否存在当前用户信息
                ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()
                        .eq(ComEldersAuthElderlyDO::getIdCard,userVO.getIdCard()));
                if(authElderlyDO != null){
                    ComEldersAuthUserDO authUserDO = new ComEldersAuthUserDO();
                    authUserDO.setUserId(userVO.getUserId());
                    authUserDO.setRelation(ComEldersAuthUserDO.relation.br);
                    authUserDO.setName(userVO.getName());
                    authUserDO.setIdCard(userVO.getIdCard());
                    authUserDO.setCommunityId(authElderlyDO.getCommunityId());
                    authUserDO.setBigAgeId(authElderlyDO.getId());
                    comEldersAuthUserMapper.insert(authUserDO);
                }
            }
        }

        IPage<ComElderAuthUserAppVO> authUserAppVOIPage = comEldersAuthUserMapper.findByPage(new Page(authPageDTO.getPageNum(),authPageDTO.getPageSize()));
        IPage<ComElderAuthUserAppVO> authUserAppVOIPage = comEldersAuthUserMapper.findByPage(new Page(authPageDTO.getPageNum(),authPageDTO.getPageSize()),authPageDTO.getUserId());
        if(!authUserAppVOIPage.getRecords().isEmpty()){
            authUserAppVOIPage.getRecords().forEach(authUser -> {

@@ -331,7 +344,7 @@
        authUserDO.setBigAgeId(authElderlyDO.getId());
        authUserDO.setName(authElderlyDO.getName());
        if(comEldersAuthUserMapper.insert(authUserDO) > 0){
            return R.ok();
            return R.ok(authUserDO.getId());
        }

        return R.fail("添加失败");