CeDo
2021-06-10 6aeb6bec1c9c4c82ffe12c692ee50474f72001e2
add:加密解密脱敏
13个文件已修改
64 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthElderlyDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/elders/ComElderAuthUserAppVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthRecordsApi.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthElderlyDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthUserDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthDO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthElderlyDTO.java
@@ -2,6 +2,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,6 +23,7 @@
 * */
@Data
@ApiModel("查询高龄老人库请求参数")
@EncryptQueryClass
public class PageComEldersAuthElderlyDTO {
    @ApiModelProperty(value = "分页-当前页数,默认:1", example = "1", position = 1)
@@ -54,6 +57,7 @@
    @Length(max=50)
    @EncryptQuery
    @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
    private String idCard;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.dtos.community;
import com.google.common.base.CaseFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
 * */
@Data
@ApiModel("查询用户绑定老人关系请求参数")
@EncryptQueryClass
public class PageComEldersAuthUserDTO {
    @ApiModelProperty(value = "分页-当前页数,默认:1", example = "1", position = 1)
@@ -67,6 +70,7 @@
    @Length(max=50)
    @EncryptQuery
    @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
    private String idCard;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.dtos.community;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +24,7 @@
 * */
@Data
@ApiModel("查询高龄认证请求参数")
@EncryptQueryClass
public class PageEldersAuthDTO {
    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
@@ -61,6 +64,7 @@
    private Date updateAt;
    @Length(max=18)
    @EncryptQuery
    @ApiModelProperty(value = "身份证", hidden = false, example = "")
    private String idCard;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.dtos.community;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +18,7 @@
 * */
@Data
@ApiModel("高领老人分页查询条件")
@EncryptQueryClass
public class PageEldersAuthElderlyDTO {
    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
@@ -37,6 +40,7 @@
    private String name;
    @ApiModelProperty(value = "身份证号码")
    @EncryptQuery
    private String idCard;
    @ApiModelProperty(value = "人员类别",example = "1:80-89周岁;2:90-99周岁;3:100周岁(含)以上")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.dtos.community;
import com.google.common.base.CaseFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
 * */
@Data
@ApiModel("生存认证记录分页查询条件")
@EncryptQueryClass
public class PageEldersAuthRecordDTO {
    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
@@ -43,6 +46,7 @@
    @ApiModelProperty(value = "姓名", example = "妞妞")
    private String name;
    @EncryptQuery
    @ApiModelProperty(value = "身份证号码")
    private String idCard;
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.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,6 +27,7 @@
    private String name;
    @ApiModelProperty(value = "身份证号码")
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    private String idCard;
    @ApiModelProperty(value = "出生年月")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthRecordForCommunityVO.java
@@ -1,6 +1,10 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +20,7 @@
 * */
@Data
@ApiModel("高龄认证记录返回参数")
@EncryptQueryClass
public class ComEldersAuthRecordForCommunityVO {
    @ApiModelProperty(value = "ID")
@@ -36,6 +41,8 @@
    private Date updateAt;
    @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,5 +1,8 @@
package com.panzhihua.common.model.vos.elders;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,6 +18,7 @@
    private String name;
    @ApiModelProperty(value = "身份证")
    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
    private String idCard;
    @ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)")
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthRecordsApi.java
@@ -5,13 +5,11 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComEldersAuthElderlyExcelListen;
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthRecordExcelVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
@@ -67,7 +65,7 @@
     * @return
     */
    @PostMapping("/page")
    @ApiOperation(value = "生存认证记录", response = ComEldersAuthElderlyVO.class)
    @ApiOperation(value = "生存认证记录", response = ComEldersAuthRecordForCommunityVO.class)
    R query(@Validated @RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO){
        ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
        return communityService.pageQueryEldersAuthRecord(pageEldersAuthElderlyDTO);
@@ -131,6 +129,14 @@
        return communityService.setCommunityAuthType(this.getCommunityId(), type);
    }
    @GetMapping("/authtype")
    @ApiOperation(value = "查询社区认证方式", response = R.class)
    R communityAuthtype(){
        Long communityId = this.getCommunityId();
        EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO = new EldersAuthTypeQueryDTO();
        eldersAuthTypeQueryDTO.setCommunityId(communityId);
        return communityService.communityElderAuthType(eldersAuthTypeQueryDTO);
    }
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
@@ -217,6 +217,6 @@
            "ORDER BY e.${pageEldersAuthRecordDTO.sortColumns} ${pageEldersAuthRecordDTO.sortType}\n" +
            "</if> " +
            "</script>")
    List<ComEldersAuthRecordForCommunityVO> selectCommunityEldersRecordByPage(Page page, @Param("pageEldersAuthRecordDTO") PageEldersAuthRecordDTO pageEldersAuthRecordDTO);
    IPage<ComEldersAuthRecordForCommunityVO> selectCommunityEldersRecordByPage(Page page, @Param("pageEldersAuthRecordDTO") PageEldersAuthRecordDTO pageEldersAuthRecordDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthElderlyDO.java
@@ -1,6 +1,8 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;
import java.io.Serializable;
@@ -17,6 +19,7 @@
 * */
@Data
@TableName("com_elders_auth_elderly")
@EncryptDecryptClass
public class ComEldersAuthElderlyDO implements Serializable {
    private static final long serialVersionUID = 1L;
@@ -33,6 +36,7 @@
    /**
     * 身份证号码   列: id_card
     */
    @EncryptDecryptField
    private String idCard;
    /**
     * 出生年月   列: birthday
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthUserDO.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;
import java.io.Serializable;
@@ -19,6 +21,7 @@
 * */
@Data
@TableName("com_elders_auth_user")
@EncryptDecryptClass
public class ComEldersAuthUserDO implements Serializable {
    private static final long serialVersionUID = 1L;
@@ -47,6 +50,7 @@
    /**
     * 身份证号码   列: id_card
     */
    @EncryptDecryptField
    private String idCard;
    /**
     * 社区id   列: community_id
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/EldersAuthDO.java
@@ -2,6 +2,8 @@
import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import lombok.Data;
import java.io.Serializable;
@@ -19,6 +21,7 @@
 * */
@Data
@TableName("com_elders_auth")
@EncryptDecryptClass
public class EldersAuthDO implements Serializable {
    private static final long serialVersionUID = 1L;
@@ -47,6 +50,7 @@
    /**
     * 身份证   列: ID_CARD
     */
    @EncryptDecryptField
    private String idCard;
    /**
     * 认证人姓名   列: AUTH_USER_NAME