Merge branch 'test_elder_cedoo' into 'test'

罗元桥

2021-06-10 d1e6d70149eea36f4f50c7b4e6c7923b61eb8269

Merge branch 'test_elder_cedoo' into 'test'

Test elder cedoo

See merge request root/zhihuishequ!48

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java

@@ -65,7 +65,7 @@
     * @return  查询结果
     */
    @PostMapping("/page/auth")
    public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO){
    public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO) throws Exception{
        return eldersAuthService.pageEldersByApp(authPageDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java

@@ -90,7 +90,7 @@
     * @param authPageDTO   请求参数
     * @return  查询结果
     */
    R pageEldersByApp(ComEldersAuthPageDTO authPageDTO);
    R pageEldersByApp(ComEldersAuthPageDTO authPageDTO) throws Exception;

    /**
     * 添加高龄老人接口

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

@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
@@ -27,6 +28,7 @@
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +61,9 @@
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
    @Resource
    private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;

    @Value("${domain.aesKey:}")
    private String aesKey;

    /**
     * 新增高龄认证
@@ -293,13 +298,14 @@
     * @return  查询结果
     */
    @Override
    public R pageEldersByApp(ComEldersAuthPageDTO authPageDTO){
    public R pageEldersByApp(ComEldersAuthPageDTO authPageDTO) throws Exception{
        //判断当前用户是否是高龄老人，如果是则将这个人新增到高龄老人的列表里
        SysUserVO userVO = this.eldersAuthDAO.getSysUserByUserId(authPageDTO.getUserId());
        if(userVO != null){
            userVO.setIdCard(AESUtil.encrypt128(userVO.getIdCard(), aesKey));
            //查询当前用户是否已存在用户关联中
            ComEldersAuthUserDO oldAuthUserDO = comEldersAuthUserMapper.selectOne(new QueryWrapper<ComEldersAuthUserDO>().lambda()
                    .eq(ComEldersAuthUserDO::getIdCard,userVO.getIdCard()));
                    .eq(ComEldersAuthUserDO::getIdCard, userVO.getIdCard()));
            if(oldAuthUserDO == null){
                //查询老人库是否存在当前用户信息
                ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()