Merge branch 'test' into test_elder_cedoo

CeDo

2021-06-10 d991833be7b894f1eaee62c5c09032a68a9a2f5f

Merge branch 'test' into test_elder_cedoo

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java

@@ -54,7 +54,7 @@
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsBigAge())){
            eldersAuthElderlyExcelVO.setIsBigAge("是");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard()) || IdcardUtil.isvalidCard18(eldersAuthElderlyExcelVO.getIdCard())){
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard())){
            throw new ServiceException("身份证号错误");
        }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthRecordExcelListen.java

@@ -53,7 +53,7 @@
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsBigAge())){
            eldersAuthElderlyExcelVO.setIsBigAge("是");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard()) || IdcardUtil.isvalidCard18(eldersAuthElderlyExcelVO.getIdCard())){
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard())){
            throw new ServiceException("身份证号错误");
        }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyVO.java

@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
@@ -18,6 +20,7 @@
 * */
@Data
@ApiModel("高龄老人库返回参数")
@EncryptDecryptClass
public class ComEldersAuthElderlyVO {

    @ApiModelProperty(value = "主键id")
@@ -28,6 +31,7 @@

    @ApiModelProperty(value = "身份证号码")
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    @EncryptDecryptField
    private String idCard;

    @ApiModelProperty(value = "出生年月")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserAppVO.java

@@ -1,6 +1,7 @@
package com.panzhihua.common.model.vos.elders;

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
@@ -9,6 +10,7 @@

@Data
@ApiModel("高龄老人用户信息")
@EncryptDecryptClass
public class ComElderAuthUserAppVO {

    @ApiModelProperty(value = "老人id")
@@ -19,6 +21,7 @@

    @ApiModelProperty(value = "身份证")
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    @EncryptDecryptField
    private String idCard;

    @ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)")

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

@@ -335,7 +335,11 @@
                        }
                    }
                }
                try {
                authUser.setAge(IdcardUtil.getAgeByIdCard(authUser.getIdCard()));
                }catch (NullPointerException e){
                    log.error("获取用户年龄出错了:" + authUser.getIdCard());
                }
            });
        }
        return R.ok(authUserAppVOIPage);