Merge branch 'test'

CeDo

2021-06-15 1d21a9673d47a186bd189d9cceaa6e2ea17d293d

Merge branch 'test'

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

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

@@ -1,12 +1,23 @@
package com.panzhihua.applets.api;


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
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.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.TencentUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -15,8 +26,6 @@
import com.panzhihua.common.model.vos.IPageVO;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;

/**
 *
@@ -32,6 +41,8 @@

    @Resource
    private CommunityService eldersAuthService;
    @Resource
    private UserService userService;

    /**
     * 分页查找
@@ -39,7 +50,7 @@
     * @return 查找结果
     */
    @PostMapping("/page")
    @ApiOperation(value = "查询高龄认证", response = EldersAuthVO.class)
    @ApiOperation(value = "查询高龄认证@已过期", response = EldersAuthVO.class)
    R query(@Validated @RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        ClazzUtils.setIfStringIsEmpty(pageEldersAuthDTO);
        pageEldersAuthDTO.setSumitUserId(this.getUserId());
@@ -52,14 +63,14 @@
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询高龄认证详细信息", response = EldersAuthDetailsVO.class)
    @ApiOperation(value = "查询高龄认证详细信息@已过期", response = EldersAuthDetailsVO.class)
    R<EldersAuthDetailsVO> details(@PathVariable("id") Long id){
        return eldersAuthService.eldersAuthDetails(id);
    }


    @GetMapping("/family")
    @ApiOperation(value = "我的家庭成员", response = R.class)
    @ApiOperation(value = "我的家庭成员@已过期", response = R.class)
    R<IPageVO<ComMngFamilyInfoVO>> family(){
        return eldersAuthService.getMyfamilyElders(getUserId());
    }
@@ -67,14 +78,144 @@

    /**
     * 新增高龄认证
     * @param {classNameFirstLower}AddDTO 添加高龄认证传递对象
     * @param eldersAuthAddByFamilyDTO 添加高龄认证传递对象
     * @return 新增结果
     */
    @PostMapping("/addByFamily")
    @ApiOperation(value = "通过家庭成员新增高龄认证", response = R.class)
    @ApiOperation(value = "新增高龄认证", response = R.class)
    R addByFamily(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
        eldersAuthAddByFamilyDTO.setSumitUserId(getUserId());
        eldersAuthAddByFamilyDTO.setUserId(getUserId());
        return eldersAuthService.addByFamilyUser(eldersAuthAddByFamilyDTO);
    }

    @GetMapping("/authtype")
    @ApiOperation(value = "查询社区认证方式", response = R.class)
    R communityAuthtype(){
        Long communityId = this.getCommunityId();
        EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO = new EldersAuthTypeQueryDTO();
        eldersAuthTypeQueryDTO.setCommunityId(communityId);
        return eldersAuthService.communityElderAuthType(eldersAuthTypeQueryDTO);
    }


    @PostMapping("/getEidToken")
    @ApiOperation(value = "高龄认证获取EidToken接口")
    public R getEidToken(@RequestParam("authUserId") Long authUserId){
        if(authUserId == null){
            return R.fail("参数错误");
        }

        R isOk = eldersAuthService.getEldersAuthUserByApp(authUserId);
        if(R.isOk(isOk)){
            ComElderAuthUserDetailVO authUserDetailVO = JSONObject.parseObject(JSONObject.toJSONString(isOk.getData()), ComElderAuthUserDetailVO.class);
            //获取EidToken接口
            String result = TencentUtils.getEidToken(authUserDetailVO.getName(),authUserDetailVO.getIdCard());
            return R.ok(result);
        }else{
            log.error("查询老人信息失败，错误信息：" + isOk.getMsg());
            return R.fail("查询老人信息失败");
        }
    }

    @PostMapping("/getEidResult")
    @ApiOperation(value = "高龄认证获取核验结果接口")
    public R getEidResult(@Validated @RequestBody ComEldersAuthGetResultDTO authGetResultDTO){

        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        authGetResultDTO.setUserId(loginUserInfo.getUserId());

        String result = TencentUtils.getEidResult(authGetResultDTO.getEidToken());
        JSONObject object = JSON.parseObject(result);
        if(object == null){
            return R.fail("核验失败");
        }

        JSONObject textObject = object.getJSONObject("Text");

        String code = textObject.getString("ErrCode");
        if(!code.equals("0")){
            log.error("人脸核验失败，错误原因：" + textObject.toJSONString());
            return R.fail("核验失败");
        }

        authGetResultDTO.setVerificationResult(object.toJSONString());
        return eldersAuthService.addEldersAuthByApp(authGetResultDTO);
    }

    @PostMapping("/page/old")
    @ApiOperation(value = "高龄认证分页接口",response = ComElderAuthUserAppVO.class)
    public R pageElders(@RequestBody ComEldersAuthPageDTO authPageDTO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        authPageDTO.setUserId(loginUserInfo.getUserId());
        authPageDTO.setCommunityId(loginUserInfo.getCommunityId());
        return eldersAuthService.pageEldersByApp(authPageDTO);
    }

    @PostMapping("/add")
    @ApiOperation(value = "高龄认证添加老人接口")
    public R addElders(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        authUserAddAppDTO.setUserId(loginUserInfo.getUserId());
        authUserAddAppDTO.setCommunityId(loginUserInfo.getCommunityId());
        return eldersAuthService.addEldersByApp(authUserAddAppDTO);
    }

    @PostMapping("/edit")
    @ApiOperation(value = "高龄认证修改老人接口")
    public R editElders(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        authUserAddAppDTO.setUserId(loginUserInfo.getUserId());
        authUserAddAppDTO.setCommunityId(loginUserInfo.getCommunityId());
        return eldersAuthService.editEldersByApp(authUserAddAppDTO);
    }

    /**
     * 分页查找
     * @param pageComEldersRecordsDTO 查找高龄认证记录
     * @return 查找结果
     */
    @PostMapping("/records")
    @ApiOperation(value = "生存认证记录", response = EldersAuthVO.class)
    R query(@Validated @RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO){
        ClazzUtils.setIfStringIsEmpty(pageComEldersRecordsDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageComEldersRecordsDTO.setOperUserId(loginUserInfoVO.getUserId());
        pageComEldersRecordsDTO.setOperUserName(loginUserInfoVO.getNickName());
        return eldersAuthService.queryEldersRecord(pageComEldersRecordsDTO);
    }

    /**
     * 查询高龄老人库详细信息
     * @param id 高龄老人库 id
     * @return 查找结果
     */
    @GetMapping("/records/{id}")
    @ApiOperation(value = "认证详情详细信息")
    R<ComEldersAuthElderlyDetailsVO> detail(@PathVariable("id") Long id){
        return eldersAuthService.comEldersAuthElderlyDetails(id);
    }

    @GetMapping("/no/tips")
    @ApiOperation(value = "高龄认证不再显示提示")
    public R noTips(){
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        if(loginUserInfoVO == null){
            return R.fail("请先登录");
        }
        return userService.noTips(loginUserInfoVO.getUserId());
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/pom.xml

@@ -14,6 +14,12 @@
    <packaging>jar</packaging>

    <dependencies>

        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-core</artifactId>
            <version>4.0.7</version>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context</artifactId>
@@ -131,6 +137,21 @@
            <version>1.9</version>
        </dependency>

        <dependency>
            <groupId>com.tencentcloudapi</groupId>
            <artifactId>tencentcloud-sdk-java</artifactId>
            <!-- go to https://search.maven.org/search?q=tencentcloud-sdk-java and get the latest version. -->
            <!-- 请到https://search.maven.org/search?q=tencentcloud-sdk-java查询所有版本，最新版本如下 -->
            <version>3.1.286</version>
        </dependency>


        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-core</artifactId>
            <version>4.0.7</version>
        </dependency>

    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -90,7 +90,7 @@
    /**
     * 令牌有效期（分钟）
     */
    public final static long _EXPIRE = 720;
    public final static long TOKEN_EXPIRE = 720;

    /**
     * 参数管理 cache key

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EldersAuthLevelEnum.java

New file
@@ -0,0 +1,38 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * 房屋租售状态
 * 
 * @author huanghongfa
 */
@Getter
public enum EldersAuthLevelEnum
{
    ELDER80_89(1,"80_89周岁"),
    ELDER90_99(2,"90_99周岁"),
    ELDER9100_(3,"100周岁(含)以上"),
    ;
    private final int level;
    private final String info;

    EldersAuthLevelEnum(int level, String info)
    {
        this.level = level;
        this.info = info;
    }

    public static int getCode(int age){

        if(80 <= age && age <= 89){
            return ELDER80_89.getLevel();
        }else if(90 <= age && age <= 99){
           return  ELDER90_99.getLevel();
        }else if(100 <= age){
            return ELDER9100_.getLevel();
        }
        return 0;
    }

}

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

New file
@@ -0,0 +1,113 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.enums.EldersAuthLevelEnum;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;

import java.util.*;
import java.util.stream.Collectors;

/**
 * @description: 高龄老人导入监听
 * @author: xyh
 * @date: 2021/3/11 13:26
 */
@Slf4j
public class ComEldersAuthElderlyExcelListen extends AnalysisEventListener<EldersAuthElderlyExcelVO> {

    private CommunityService communityService;

    private Long communityId;

    private Long createBy;

    public ComEldersAuthElderlyExcelListen(CommunityService communityService, Long communityId, Long createBy){
        this.communityService = communityService;
        this.communityId = communityId;
        this.createBy = createBy;
    }


    private static final int BATCH_COUNT = 3000;
    private List<EldersAuthElderlyExcelVO> list = new ArrayList<>();

    /**
     * @author cedoo
     * @Description:找出list中的重复数据
     * @param datas
     * @return
     */
    public static <T> List<T> findRepeat(Collection<T> datas) {
        if (datas instanceof Set) {
            return new ArrayList<>();
        }
        HashSet<T> set = new HashSet<T>();
        List<T> repeatEles = new ArrayList<T>();
        for (T t : datas) {
            if (set.contains(t)) {
                if(!repeatEles.contains(t)) {
                    repeatEles.add(t);
                }
            } else {
                set.add(t);
            }
        }
        return repeatEles;
    }

    @Override
    public void invoke(EldersAuthElderlyExcelVO eldersAuthElderlyExcelVO, AnalysisContext analysisContext) {
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getName())){
            throw new ServiceException("姓名不可为空");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsExist())){
            eldersAuthElderlyExcelVO.setIsExist("是");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsBigAge())){
            eldersAuthElderlyExcelVO.setIsBigAge("是");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard())){
            throw new ServiceException("身份证号错误");
        }

        eldersAuthElderlyExcelVO.setBirthday(DateUtils.getDateStringYMD(IdcardUtil.getBirthDate(eldersAuthElderlyExcelVO.getIdCard())));
        eldersAuthElderlyExcelVO.setLevel(EldersAuthLevelEnum.getCode(IdcardUtil.getAgeByIdCard(eldersAuthElderlyExcelVO.getIdCard())));
        list.add(eldersAuthElderlyExcelVO);
        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
        if(list.size() >= BATCH_COUNT){
            doAfterAllAnalysed(analysisContext);
            list.clear();
        }

    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
        //去重
        List<String>  idcardList = new ArrayList<>();
        list.forEach(voInList -> {
            idcardList.add(voInList.getIdCard());
        });
        List<String> repeatList = findRepeat(idcardList);
        if(repeatList!=null && repeatList.size()>0){
            String repeatedId = StringUtils.join(repeatList, ",");
            throw new ServiceException(repeatedId + "　身份证号码存在多条");
        }
        List<EldersAuthElderlyExcelVO> newVoList = list.stream().filter(ListUtils.distinctByKey(EldersAuthElderlyExcelVO::getIdCard)).collect(Collectors.toList());
        R r = this.communityService.listSaveEldersAuthElderlyExcelVO(newVoList,this.communityId,this.createBy);
        if (!R.isOk(r)) {
            throw new ServiceException(r.getMsg());
        }
    }
}

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

New file
@@ -0,0 +1,84 @@
package com.panzhihua.common.listen;

import cn.hutool.core.util.IdcardUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.enums.EldersAuthLevelEnum;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @description: 高龄老人导入监听
 * @author: xyh
 * @date: 2021/3/11 13:26
 */
@Slf4j
public class ComEldersAuthRecordExcelListen extends AnalysisEventListener<EldersAuthElderlyExcelVO> {

    private CommunityService communityService;

    private Long communityId;

    private Long createBy;

    public ComEldersAuthRecordExcelListen(CommunityService communityService, Long communityId, Long createBy){
        this.communityService = communityService;
        this.communityId = communityId;
        this.createBy = createBy;
    }


    private static final int BATCH_COUNT = 500;
    private List<EldersAuthElderlyExcelVO> list = new ArrayList<>();

    @Override
    public void invoke(EldersAuthElderlyExcelVO eldersAuthElderlyExcelVO, AnalysisContext analysisContext) {
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getName())){
            throw new ServiceException("姓名不可为空");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsExist())){
            eldersAuthElderlyExcelVO.setIsExist("是");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIsBigAge())){
            eldersAuthElderlyExcelVO.setIsBigAge("是");
        }
        if(StringUtils.isEmpty(eldersAuthElderlyExcelVO.getIdCard())){
            throw new ServiceException("身份证号错误");
        }

        eldersAuthElderlyExcelVO.setBirthday(DateUtils.getDateStringYMD(IdcardUtil.getBirthDate(eldersAuthElderlyExcelVO.getIdCard())));
        eldersAuthElderlyExcelVO.setLevel(EldersAuthLevelEnum.getCode(IdcardUtil.getAgeByIdCard(eldersAuthElderlyExcelVO.getIdCard())));
        list.add(eldersAuthElderlyExcelVO);
        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
        if(list.size() >= BATCH_COUNT){
            log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
            List<EldersAuthElderlyExcelVO> newVoList = list.stream().filter(ListUtils.distinctByKey(EldersAuthElderlyExcelVO::getIdCard)).collect(Collectors.toList());
            R r = this.communityService.listSaveEldersAuthElderlyExcelVO(newVoList,this.communityId,this.createBy);
            if (!R.isOk(r)) {
                throw new ServiceException(r.getMsg());
            }
            list.clear();           //清空list
        }

    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
        List<EldersAuthElderlyExcelVO> newVoList = list.stream().filter(ListUtils.distinctByKey(EldersAuthElderlyExcelVO::getIdCard)).collect(Collectors.toList());
        R r = this.communityService.listSaveEldersAuthElderlyExcelVO(newVoList,this.communityId,this.createBy);
        if (!R.isOk(r)) {
            throw new ServiceException(r.getMsg());
        }
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * 高领老人分页查询条件
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高领老人分页查询条件")
public class EldersAuthElderlyDTO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "姓名", example = "妞妞")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "是否健在",example = "1是，2否")
    private Integer isExist;

    @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，2否")
    private Integer isBigAge;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthTypeQueryDTO.java

New file
@@ -0,0 +1,46 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotBlank;


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高龄认证查询请求参数")
public class EldersAuthTypeQueryDTO {

    @NotBlank()
    @Max(9223372036854775807L)
    @ApiModelProperty(value = "家庭成员ID", hidden = false, example = "1", required = true)
    private Long familyUserId;

    @Length(max=1024) @NotBlank()
    @ApiModelProperty(value = "视频地址", hidden = false, example = "")
    private String videoUrl;


    @ApiModelProperty(value = "用户ID", hidden = true, example = "")
    private Long userId;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "提交人", hidden = true, example = "1")
    private Long operUserId;


    @ApiModelProperty(value = "社区ID", hidden = true, example = "")
    private Long communityId;


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthElderlyDTO.java

New file
@@ -0,0 +1,126 @@
package com.panzhihua.common.model.dtos.community;

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;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.Pattern;
import java.util.Date;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("查询高龄老人库请求参数")
@EncryptQueryClass
public class PageComEldersAuthElderlyDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Length(max=50)
    @ApiModelProperty(value = "名称", hidden = false, example = "")
    private String name;


    @Length(max=50)
    @EncryptQuery
    @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
    private String idCard;


    @Length(max=50)
    @ApiModelProperty(value = "出生年月", hidden = false, example = "")
    private String birthday;


    @Max(127)
    @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）", hidden = false, example = "1")
    private Integer level;


    @Length(max=255)
    @ApiModelProperty(value = "户籍地", hidden = false, example = "")
    private String domicile;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区id", hidden = false, example = "1")
    private Long communityId;


    @Max(127)
    @ApiModelProperty(value = "是否健在（1.是  2.否）", hidden = false, example = "1")
    private Integer isExist;


    @Max(127)
    @ApiModelProperty(value = "是否办理高龄津贴（1.是 2.否）", hidden = false, example = "1")
    private Integer isBigAge;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建用户", hidden = false, example = "1")
    private Long createBy;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAtBegin;
    @ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "修改用户", hidden = false, example = "1")
    private Long updateBy;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthHistoryRecordDTO.java

New file
@@ -0,0 +1,100 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.*;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("查询高龄老人认证记录请求参数")
public class PageComEldersAuthHistoryRecordDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "老人用户id", hidden = false, example = "1")
    private Long userId;


    @Length(max=50)
    @ApiModelProperty(value = "名称", hidden = false, example = "")
    private String name;


    @Length(max=50)
    @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
    private String idCard;


    @Length(max=50)
    @ApiModelProperty(value = "出生年月", hidden = false, example = "")
    private String brithday;


    @Max(9999999999L)
    @ApiModelProperty(value = "年龄", hidden = false, example = "1")
    private Integer age;


    @Length(max=50)
    @ApiModelProperty(value = "户籍地", hidden = false, example = "")
    private String domicile;


    @Max(127)
    @ApiModelProperty(value = "本月是否已认证（1.是 2.否）", hidden = false, example = "1")
    private Integer isAuth;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthStatisticsDTO.java

New file
@@ -0,0 +1,90 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.*;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("查询老人认证月统计请求参数")
public class PageComEldersAuthStatisticsDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Max(9999999999L)
    @ApiModelProperty(value = "年份", hidden = false, example = "1")
    private Integer year;


    @Max(9999999999L)
    @ApiModelProperty(value = "月份", hidden = false, example = "1")
    private Integer month;


    @Max(9999999999L)
    @ApiModelProperty(value = "总人数", hidden = false, example = "1")
    private Integer sum;


    @Max(9999999999L)
    @ApiModelProperty(value = "认证人数", hidden = false, example = "1")
    private Integer authSum;


    @Max(9999999999L)
    @ApiModelProperty(value = "未认证人数", hidden = false, example = "1")
    private Integer noAuthSum;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersAuthUserDTO.java

New file
@@ -0,0 +1,93 @@
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;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.Pattern;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("查询用户绑定老人关系请求参数")
@EncryptQueryClass
public class PageComEldersAuthUserDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "用户id", hidden = false, example = "1")
    private Long userId;


    @Max(127)
    @ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)", hidden = false, example = "1")
    private Integer relation;


    @Max(127)
    @ApiModelProperty(value = "是否已认证（1.是 2.否）", hidden = false, example = "1")
    private Integer isAuth;


    @Length(max=50)
    @ApiModelProperty(value = "姓名", hidden = false, example = "")
    private String name;


    @Length(max=50)
    @EncryptQuery
    @ApiModelProperty(value = "身份证号码", hidden = false, example = "")
    private String idCard;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区id", hidden = false, example = "1")
    private Long communityId;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "高龄老人库id", hidden = false, example = "1")
    private Long bigAgeId;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComEldersRecordsDTO.java

New file
@@ -0,0 +1,51 @@
package com.panzhihua.common.model.dtos.community;

import com.google.common.base.CaseFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;

/**
 * 分页查询生存认证记录表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("查询高龄老人库请求参数")
public class PageComEldersRecordsDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }

    @ApiModelProperty(value = "家庭成员ID", hidden = false, example = "1", required = true)
    @NotNull(message = "家庭成员ID不能为空")
    private Long bigAgeid;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

 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

New file
@@ -0,0 +1,54 @@
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;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;

/**
 * 高领老人分页查询条件
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高领老人分页查询条件")
@EncryptQueryClass
public class PageEldersAuthElderlyDTO {

    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
    @NotNull
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10", required = true)
    @NotNull
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", hidden = true, example = "createAt")
    private String sortBy="create_at";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", hidden = true, example = "desc")
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String order="desc";

    @ApiModelProperty(value = "姓名", example = "妞妞")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    @EncryptQuery
    private String idCard;

    @ApiModelProperty(value = "人员类别",example = "1:80-89周岁;2:90-99周岁;3:100周岁（含）以上")
    private Integer level;

    @ApiModelProperty(value = "是否健在",example = "1是，2否")
    private Integer isExist;

    @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，2否")
    private Integer isBigAge;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthHistoryDTO.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;

/**
 * 高领老人分页查询条件
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("高领老人分页查询条件")
public class PageEldersAuthHistoryDTO {

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "社区ID", hidden = true)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthRecordDTO.java

New file
@@ -0,0 +1,59 @@
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;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;

/**
 * 高领老人分页查询条件
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Data
@ApiModel("生存认证记录分页查询条件")
@EncryptQueryClass
public class PageEldersAuthRecordDTO {

    @ApiModelProperty(value = "分页-当前页数,默认1", example = "1", required = true)
    @NotNull
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认10", example = "10", required = true)
    @NotNull
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }

    @ApiModelProperty(value = "姓名", example = "妞妞")
    private String name;

    @EncryptQuery
    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸核验）",example = "1")
    private Integer type;

    @ApiModelProperty(value = "认证时间(月份)",example = "1")
    private Integer month;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageSysConfDTO.java

New file
@@ -0,0 +1,94 @@
package com.panzhihua.common.model.dtos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.Pattern;
import java.util.Date;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("查询系统配置请求参数")
public class PageSysConfDTO {

    @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
    private Long pageNum = 1L;

    @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
    private Long pageSize = 10L;

    @ApiModelProperty(value = "排序字段, 默认createAt", example = "createAt", position = 3)
    private String sortAttr="createAt";

    @ApiModelProperty(value = "排序方式: asc/desc(默认)", example = "desc", position = 4)
    @Pattern(regexp = "asc|desc|ASC|DESC")
    private String sortType="desc";

    @ApiModelProperty(value = "排序列", example = "create_at", hidden = true)
    public String getSortColumns(){
        String dbColumn = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sortAttr);
        return dbColumn;
    }


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "主键id", hidden = false, example = "1")
    private Long id;


    @Length(max=50)
    @ApiModelProperty(value = "参数名", hidden = false, example = "")
    private String name;


    @Length(max=50)
    @ApiModelProperty(value = "参数唯一编码", hidden = false, example = "")
    private String code;


    @Length(max=65535)
    @ApiModelProperty(value = "参数值", hidden = false, example = "")
    private String value;


    @Length(max=100)
    @ApiModelProperty(value = "参数描述", hidden = false, example = "")
    private String describe;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date createAtBegin;
    @ApiModelProperty(value = "创建时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAtEnd;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建用户", hidden = false, example = "1")
    private Long createBy;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "社区id", hidden = false, example = "1")
    private Long communityId;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long operUserId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String operUserName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthGetResultDTO.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.common.model.dtos.elders;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel("人脸核身获取结果请求参数")
public class ComEldersAuthGetResultDTO {

    @NotNull()
    @ApiModelProperty(value = "用户eidToken")
    private String eidToken;

    @NotNull()
    @ApiModelProperty(value = "老人id")
    private Long authUserId;

    @ApiModelProperty(value = "人脸核身结果数据",hidden = true)
    private String verificationResult;

    @ApiModelProperty(value = "当前登录用户id",hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthPageDTO.java

New file
@@ -0,0 +1,22 @@
package com.panzhihua.common.model.dtos.elders;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("人脸核身获取结果请求参数")
public class ComEldersAuthPageDTO {

    @ApiModelProperty(value = "页数大小")
    private Integer pageSize = 10;

    @ApiModelProperty(value = "页数")
    private Integer pageNum = 1;

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.dtos.elders;

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;

@Data
@ApiModel("人脸核身获取结果请求参数")
@EncryptQueryClass
public class ComEldersAuthUserAddAppDTO {

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "姓名")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    @EncryptQuery
    private String idCard;

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

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "老人id")
    private Long elderId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java

@@ -64,7 +64,7 @@
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDirectReportDTO.java

@@ -87,7 +87,7 @@
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java

@@ -68,7 +68,7 @@
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommunityRepublishEventDTO.java

New file
@@ -0,0 +1,34 @@
package com.panzhihua.common.model.dtos.grid;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;


/**
 * 事件重新发布请求参表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
@Data
@ApiModel("事件重新发布请求参数")
public class CommunityRepublishEventDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "事件id", hidden = false, example = "1", required = true)
    @NotNull(message = "事件id不能为空")
    private Long id;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
    private String userName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventBatchRevokeDTO.java

@@ -36,4 +36,10 @@
    @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
    private Long communityId;

    @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
    private Integer revokeType;

    @ApiModelProperty(value = "撤销人/社区ID", hidden = true, example = "1")
    private Long revokeId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventRevokeDTO.java

@@ -36,4 +36,10 @@
    @ApiModelProperty(value = "操作人所属社区", hidden = true, example = "学院社区")
    private Long communityId;

    @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
    private Integer revokeType;

    @ApiModelProperty(value = "撤销人/社区ID", hidden = true, example = "1")
    private Long revokeId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java

@@ -272,6 +272,8 @@
    @ApiModelProperty(value = "修改人", hidden = false, example = "1")
    private Long updateBy;

    @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
    private Integer revokeType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventManageDTO.java

@@ -42,6 +42,8 @@
        return dbColumn;
    }

    @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
    private Integer revokeType;

    @ApiModelProperty(value = "搜索关键词", hidden = false, example = "1", required = true)
    private String keyWord;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventCommunityDTO.java

@@ -50,6 +50,8 @@
        return dbColumn;
    }

    @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
    private Integer revokeType;


    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java

@@ -263,6 +263,9 @@
    @ApiModelProperty(value = "修改人", hidden = false, example = "1")
    private Long updateBy;

    @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
    private Integer revokeType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
    private Date updateAtBegin;
@@ -276,4 +279,5 @@

    @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java

@@ -1,7 +1,6 @@
package com.panzhihua.common.model.dtos.grid;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.enums.EventType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -55,7 +54,7 @@
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java

@@ -57,7 +57,7 @@
    private String eventClazz;

    @Max(127)
    @ApiModelProperty(value = "危险级别:1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @ApiModelProperty(value = "危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）", hidden = false, example = "1", required = true)
    @NotNull(message = "危险级别不能为空")
    private Integer dangerLevel;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -174,4 +174,7 @@
    @ApiModelProperty("下班时间")
    private Integer workEndTime;

    @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
    private Integer bigAgeTips;

}

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

New file
@@ -0,0 +1,76 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.*;


/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("高龄老人库详细返回参数")
public class ComEldersAuthElderlyDetailsVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "认证时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    @ApiModelProperty(value = "更新时间")
    private Date updateAt;

    @ApiModelProperty(value = "身份证")
    private String idCard;

    @ApiModelProperty(value = "认证人姓名")
    private String authUserName;

    @ApiModelProperty(value = "视频地址")
    private String videoUrl;

    @ApiModelProperty(value = "提交人")
    private Long sumitUserId;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "状态")
    private String status;

    @ApiModelProperty(value = "出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthDay;

    @ApiModelProperty(value = "家庭成员ID")
    private Long  familyUserId;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "管辖社区")
    private String communityName;

    @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
    private Integer type;

    @ApiModelProperty(value = "反馈信息")
    private List<EldersAuthFeedbackVO> feedback;


}

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

New file
@@ -0,0 +1,72 @@
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;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("高龄老人库返回参数")
@EncryptDecryptClass
public class ComEldersAuthElderlyVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "名称")
    private String name;

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

    @ApiModelProperty(value = "出生年月")
    private String birthday;

    @ApiModelProperty(value = "人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）")
    private Integer level;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty(value = "是否健在（1.是  2.否）")
    private Integer isExist;

    @ApiModelProperty(value = "是否办理高龄津贴（1.是 2.否）")
    private Integer isBigAge;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "创建用户")
    private Long createBy;

    @ApiModelProperty(value = "修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty(value = "修改用户")
    private Long updateBy;

    @ApiModelProperty(value = "年龄")
    private Integer age;

}

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

New file
@@ -0,0 +1,51 @@
package com.panzhihua.common.model.vos.community;

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("高龄老人认证记录详细返回参数")
public class ComEldersAuthHistoryRecordDetailsVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "老人用户id")
    private Long userId;

    @ApiModelProperty(value = "名称")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "出生年月")
    private String brithday;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "本月是否已认证（1.是 2.否）")
    private Integer isAuth;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

New file
@@ -0,0 +1,51 @@
package com.panzhihua.common.model.vos.community;

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("高龄老人认证记录返回参数")
public class ComEldersAuthHistoryRecordVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "老人用户id")
    private Long userId;

    @ApiModelProperty(value = "名称")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "出生年月")
    private String brithday;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "本月是否已认证（1.是 2.否）")
    private Integer isAuth;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("高龄老人报表记录返回参数")
public class ComEldersAuthHistoryVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "高龄老人总人数")
    private Integer sum;

    @ApiModelProperty(value = "已认证人数")
    private Integer authSum;

    @ApiModelProperty(value = "未认证人数")
    private Integer noAuthSum;

}

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

New file
@@ -0,0 +1,81 @@
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.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;

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("高龄认证记录返回参数")
@EncryptDecryptClass
public class ComEldersAuthRecordForCommunityVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "认证时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

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

    @ApiModelProperty(value = "年龄")
    private Integer age;


    @ApiModelProperty(value = "认证人姓名")
    private String authUserName;

    @ApiModelProperty(value = "视频地址")
    private String videoUrl;

    @ApiModelProperty(value = "申请人")
    private Long sumitUserId;

    @ApiModelProperty(value = "户籍地")
    private String domicile;

    @ApiModelProperty(value = "状态")
    private String status;

    @ApiModelProperty(value = "出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date birthDay;

    @ApiModelProperty(value = "申请人姓名")
    private String sumitUserName;

    @ApiModelProperty(value = "认证方式（1.视频认证 2.人脸核验）")
    private Integer type;

    @ApiModelProperty(value = "申请人账号")
    private String sumitUserAccount;

}

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

New file
@@ -0,0 +1,37 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("高龄认证记录返回参数")
public class ComEldersAuthRecordVO {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "年份")
    private String  yearMonth;

    @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
    private Integer type;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "有反馈")
    private Boolean hasFeed;

}

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

New file
@@ -0,0 +1,45 @@
package com.panzhihua.common.model.vos.community;

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("老人认证月统计详细返回参数")
public class ComEldersAuthStatisticsDetailsVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "总人数")
    private Integer sum;

    @ApiModelProperty(value = "认证人数")
    private Integer authSum;

    @ApiModelProperty(value = "未认证人数")
    private Integer noAuthSum;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

New file
@@ -0,0 +1,45 @@
package com.panzhihua.common.model.vos.community;

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@ApiModel("老人认证月统计返回参数")
public class ComEldersAuthStatisticsVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "年份")
    private Integer year;

    @ApiModelProperty(value = "月份")
    private Integer month;

    @ApiModelProperty(value = "总人数")
    private Integer sum;

    @ApiModelProperty(value = "认证人数")
    private Integer authSum;

    @ApiModelProperty(value = "未认证人数")
    private Integer noAuthSum;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}

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

New file
@@ -0,0 +1,43 @@
package com.panzhihua.common.model.vos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("用户绑定老人关系返回参数")
public class ComEldersAuthUserVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "用户id")
    private Long userId;

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

    @ApiModelProperty(value = "是否已认证（1.是 2.否）")
    private Integer isAuth;

    @ApiModelProperty(value = "姓名")
    private String name;

    @ApiModelProperty(value = "身份证号码")
    private String idCard;

    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty(value = "高龄老人库id")
    private Long bigAgeId;


}

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

@@ -2,6 +2,8 @@

import java.util.*;

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 EldersAuthDetailsVO {

    @ApiModelProperty(value = "ID")
@@ -26,8 +29,8 @@
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    @ApiModelProperty(value = "认证时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")
@@ -39,6 +42,7 @@

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

    @ApiModelProperty(value = "认证人姓名")
@@ -76,4 +80,7 @@
    @ApiModelProperty(value = "家庭成员ID")
    private Long  familyUserId;

    @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
    private Integer type;

}

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

New file
@@ -0,0 +1,36 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * @author xyh
 * @date 2021/6/9 14:54
 */
@Data
public class EldersAuthElderlyExcelVO implements Serializable {

    private static final long serialVersionUID = -6256711519268125208L;

    @ExcelProperty(value = "姓名" ,index = 0)
    private String name;

    @ExcelProperty(value = "身份证号" ,index = 1)
    private String idCard;

    @ExcelProperty(value = "是否健在" ,index = 2)
    private String isExist;

    @ExcelProperty(value = "是否登记" ,index = 3)
    private String isBigAge;

    private String birthday;
    private Integer level;
    private String domicile;
    private Long communityId;
    private Long createBy;


}

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

@@ -24,7 +24,7 @@
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "更新人")

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

New file
@@ -0,0 +1,36 @@
package com.panzhihua.common.model.vos.community;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * @author xyh
 * @date 2021/6/9 14:54
 */
@Data
public class EldersAuthRecordExcelVO implements Serializable {

    private static final long serialVersionUID = -6256711519268125208L;

    @ExcelProperty(value = "姓名" ,index = 0)
    private String name;

    @ExcelProperty(value = "身份证号" ,index = 1)
    private String idCard;

    @ExcelProperty(value = "是否健在" ,index = 2)
    private String isExist;

    @ExcelProperty(value = "是否登记" ,index = 3)
    private String isBigAge;

    private String birthday;
    private Integer level;
    private String domicile;
    private Long communityId;
    private Long createBy;


}

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

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

import java.util.*;

import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
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;
@@ -15,6 +21,7 @@
 * */
@Data
@ApiModel("高龄认证返回参数")
@EncryptDecryptClass
public class EldersAuthVO {

    @ApiModelProperty(value = "ID")
@@ -35,6 +42,8 @@
    private Date updateAt;

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

    @ApiModelProperty(value = "认证人姓名")
@@ -68,4 +77,10 @@
    @ApiModelProperty(value = "家庭成员ID")
    private Long  familyUserId;

    @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
    private Integer type;

    @ApiModelProperty(value = "人脸核验结果数据")
    private Integer verificationResult;

}

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

New file
@@ -0,0 +1,47 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@ApiModel("系统配置返回参数")
public class SysConfVO {

    @ApiModelProperty(value = "主键id")
    private Long id;

    @ApiModelProperty(value = "参数名")
    private String name;

    @ApiModelProperty(value = "参数唯一编码")
    private String code;

    @ApiModelProperty(value = "参数值")
    private String value;

    @ApiModelProperty(value = "参数描述")
    private String describe;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty(value = "创建用户")
    private Long createBy;

    @ApiModelProperty(value = "社区id")
    private Long communityId;


}

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

New file
@@ -0,0 +1,45 @@
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;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

    @ApiModelProperty(value = "老人id")
    private String elderId;

    @ApiModelProperty(value = "姓名")
    private String name;

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

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

    @ApiModelProperty(value = "是否有反馈（1.是 2.否）")
    private Integer isFeedback = 2;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    @ApiModelProperty(value = "管辖社区")
    private String communityName;

    @ApiModelProperty(value = "本月是否已认证(1.是 2.否)")
    private Integer isAuth;

    @ApiModelProperty(value = "是否健在",example = "1是，2否")
    private Integer isExist;

}

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

New file
@@ -0,0 +1,16 @@
package com.panzhihua.common.model.vos.elders;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("高龄认证用户信息")
public class ComElderAuthUserDetailVO {

    @ApiModelProperty(value = "姓名")
    private String name;

    @ApiModelProperty(value = "身份证")
    private String idCard;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComEldersAuthHistoryExcelVO.java

New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.vos.partybuilding;

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @description: 党员信息导出
 * @author: lyq
 * @date: 2021/5/6 17:48
 */
@Data
public class ComEldersAuthHistoryExcelVO {

    @ExcelProperty(value = "姓名" ,index = 0)
    private String name;

    @ExcelProperty(value = "身份证号" ,index = 1)
    private String idCard;

    @ExcelProperty(value = "出生年月" ,index = 2)
    private String brithday;

    @ExcelProperty(value = "年龄" ,index = 3)
    private Date age;

    @ExcelProperty(value = "户籍地" ,index = 4)
    private Date domicile;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java

@@ -26,6 +26,9 @@
    @ApiModelProperty("昵称")
    private String nickName;

    @ApiModelProperty("身份证号码")
    private String idCard;

    @ApiModelProperty("真实名字")
    private String name;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5,6 +5,9 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
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.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
@@ -2727,4 +2730,133 @@
     */
    @PostMapping("/vaccines/admin/enroll/type/list")
    R getEnrollTypeListByAdmin();

    /**
     * 查询老龄认证记录
     * @param pageComEldersRecordsDTO
     * @return
     */
    @PostMapping("/elders/records")
    R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO);

    /**
     * 查询老龄认证记录详细
     * @param id
     * @return
     */
    @PostMapping("/elders/records/deatils")
    R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id);

    /**
     * 查询老龄认证社区认证方式
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    @PostMapping("/elders/authtype")
    R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

    /**
     * 分页查询高领老人列表
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/eldersauthelderly/page")
    R pageQueryEldersAuthElderly(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO);

    /**
     * 批量保存高龄老人
     * @param newVoList
     * @param communityId
     * @return
     */
    @PostMapping("/eldersauthelderly/batchSave")
    R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy);

    /**
     * 查看高龄老人详情
     * @param id
     * @return
     */
    @GetMapping("/eldersauthelderly/{id}")
    R getEldersAuthElderlyById(@PathVariable("id") Long id);

    /**
     * 修改高龄老人信息
     * @param eldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/eldersauthelderly/update")
    R updateEldersAuthElderly(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO);

    /**
     * 删除高领老人
     * @param id
     * @return
     */
    @PostMapping("/eldersauthelderly/delete")
    R deleteEldersAuthElderly(@RequestParam("id") Long id);

    /**
     * 通过老人用户id获取老人信息
     * @param authUserId    老人用户id
     * @return  老人信息
     */
    @PostMapping("/elders/getAuth")
    R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId);

    /**
     * 人脸核验新增高龄认证记录
     * @param authGetResultDTO  请求参数
     * @return  新增结果
     */
    @PostMapping("/elders/add/auth")
    R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO);

    /**
     * 高龄认证分页接口
     * @param authPageDTO   请求参数
     * @return  查询结果
     */
    @PostMapping("/elders/page/auth")
    R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO);

    /**
     * 添加高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  添加结果
     */
    @PostMapping("/elders/add")
    R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);

    /**
     * 修改高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  修改结果
     */
    @PostMapping("/elders/edit")
    R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);


    /**
     * 分页查询生存认证记录
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/elders/records/page")
    R pageQueryEldersAuthRecord(@RequestBody  PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);

    /**
     *
     * @param communityId
     * @param type
     * @return
     */
    @PostMapping("/elders/setCommunityAuthType")
    R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type);

    @PostMapping("/elders/getAuthHistoryList")
    R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);

    @PostMapping("/elders/getAuthHistoryExport")
    R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -757,4 +757,7 @@
     */
    @PostMapping("gridMemberEditStatus")
    R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);

    @GetMapping("big/no/tip")
    R noTips(@RequestParam("userId") Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AgeUtils.java

@@ -12,8 +12,8 @@
    public static int getAgeFromBirthTime(String birthTimeString) {
        // 先截取到字符串中的年、月、日
        int selectYear = Integer.parseInt(birthTimeString.substring(0,4));
        int selectMonth = Integer.parseInt(birthTimeString.substring(4,6));
        int selectDay = Integer.parseInt(birthTimeString.substring(6,8));
        int selectMonth = Integer.parseInt(birthTimeString.substring(5,7));
        int selectDay = Integer.parseInt(birthTimeString.substring(8));
        // 得到当前时间的年、月、日
        Calendar cal = Calendar.getInstance();
        int yearNow = cal.get(Calendar.YEAR);
@@ -52,6 +52,24 @@
            }
        }
        return age;
    }

    // 根据时间戳计算年龄
    public static int getAgeFromBirthTime(long birthTimeLong) {
        Date date = new Date(birthTimeLong * 1000l);
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        String birthTimeString = format.format(date);
        return getAgeFromBirthTime(birthTimeString);
    }

    public static String getAgeFormatBirthday(String brithday) {
        if(StringUtils.isEmpty(brithday)){
            return "";
        }
        String year = brithday.substring(0,4);
        String month = brithday.substring(4,6);
        String ri = brithday.substring(6,8);
        return year + "-" + month + "-" + ri;
    }

    public static int getAgeFromBirthTimes(String birthTimeString) {
@@ -96,19 +114,20 @@
                age = age + 1;
            }
        }
        return age - 1;
        return age;
    }

    // 根据时间戳计算年龄
    public static int getAgeFromBirthTime(long birthTimeLong) {
    public static int getAgeFromBirthTimes(long birthTimeLong) {
        Date date = new Date(birthTimeLong * 1000l);
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        String birthTimeString = format.format(date);
        return getAgeFromBirthTime(birthTimeString);
        return getAgeFromBirthTimes(birthTimeString);
    }

    public static void main(String[] args) {
        int age = getAgeFromBirthTime("1995-08-18");
        System.out.println(age);
        String yese = "19980516";
        String year = yese.substring(0,4);
        String month = yese.substring(4,6);
        String ri = yese.substring(6,8);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -642,12 +642,85 @@
    }


    /**
     * 将日期对象格式化成yyyy-MM-dd格式的字符串
     *
     * @param date         日期对象
     * @return String
     */
    public static String getDateStringYMD(Date date) {

        String dateString = "";
        if (date != null) {
            dateString = yyyyMMdd_format.format(date);
        }
        return dateString;
    }

    /**
     * 获取当前月第一天
     * @return
     */
    public static Date getFirstDayOfMonth() {
        Calendar cal = Calendar.getInstance();
        cal.add(Calendar.MONTH,0);
        int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY),actualMinimum,00,00,00);
        return cal.getTime();
    }

    /**
     * 获取当前年月的第一天时间
     * @param year  年份
     * @param month 月份
     * @return  时间
     */
    public static Date getYearMonthStart(Integer year,Integer month) {
        Calendar cal = Calendar.getInstance();
        // 设置年份
        cal.set(Calendar.YEAR, year);
        // 设置月份
        cal.set(Calendar.MONTH, month - 1);
        // 获取某月最小天数
        int firstDay = cal.getMinimum(Calendar.DATE);
        // 设置日历中月份的最小天数
        cal.set(Calendar.DAY_OF_MONTH, firstDay);
        int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY),actualMinimum,00,00,00);
        return cal.getTime();
    }

    /**
     * 获取当前年月的最后一天时间
     * @param year  年份
     * @param month 月份
     * @return  时间
     */
    public static Date getYearMonthEnd(Integer year,Integer month) {
        Calendar cal = Calendar.getInstance();
        // 设置年份
        cal.set(Calendar.YEAR, year);
        // 设置月份
        cal.set(Calendar.MONTH, month - 1);
        // 获取某月最大天数
        int lastDay = cal.getMaximum(Calendar.DATE);
        // 设置日历中月份的最大天数
        cal.set(Calendar.DAY_OF_MONTH, lastDay);
        int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY),actualMinimum,00,00,00);
        return cal.getTime();
    }





    public static void main(String[]args)throws Exception{
        isValidDate("2020/12/4");
//        Date date= new Date();
//        Date after = new Date();
//        System.out.println(calTimeDifference(date,after));
        System.out.println(getYearMonthStart(2021,2));

    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java

New file
@@ -0,0 +1,89 @@
package com.panzhihua.common.utlis;

import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.profile.ClientProfile;
import com.tencentcloudapi.common.profile.HttpProfile;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.faceid.v20180301.FaceidClient;
import com.tencentcloudapi.faceid.v20180301.models.*;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class TencentUtils {


    private static final String secretId = "AKIDCG5h4EArJVTCesseAQQCiyzlIZicHgpk";
    private static final String secretKey = "jCPM5appZ4KK4YrvjHaeS0JNCl5C4g5E";
    /**
     * 商户id
     */
    private static final String merchantId = "0NSJ2106041331155797";
    /**
     * 请求地址
     */
    private static final String url = "faceid.tencentcloudapi.com";

    /**
     * 获取用户EidToken接口
     * @param name  姓名
     * @param idCard    身份证号
     * @return  调用结果
     */
    public static String getEidToken(String name,String idCard){
        try{
            Credential cred = new Credential(secretId, secretKey);

            HttpProfile httpProfile = new HttpProfile();
            httpProfile.setEndpoint(url);

            ClientProfile clientProfile = new ClientProfile();
            clientProfile.setHttpProfile(httpProfile);

            FaceidClient client = new FaceidClient(cred, "", clientProfile);

            GetEidTokenRequest req = new GetEidTokenRequest();
            req.setIdCard(idCard);
            req.setName(name);
            GetEidTokenConfig getEidTokenConfig1 = new GetEidTokenConfig();
            getEidTokenConfig1.setInputType("4");
            req.setConfig(getEidTokenConfig1);

            req.setMerchantId(merchantId);
            GetEidTokenResponse resp = client.GetEidToken(req);
            return GetEidTokenResponse.toJsonString(resp);
        } catch (TencentCloudSDKException e) {
            log.error("人脸核身获取Token接口调用失败，错误信息：" + e.toString());
        }
        return "";
    }

    /**
     * 获取用户核身结果接口
     * @param eidToken  用户token
     * @return  调用结果
     */
    public static String getEidResult(String eidToken){
        try{
            Credential cred = new Credential(secretId, secretKey);
            HttpProfile httpProfile = new HttpProfile();
            httpProfile.setEndpoint(url);
            ClientProfile clientProfile = new ClientProfile();
            clientProfile.setHttpProfile(httpProfile);
            FaceidClient client = new FaceidClient(cred, "", clientProfile);
            GetEidResultRequest req = new GetEidResultRequest();
            req.setEidToken(eidToken);
            GetEidResultResponse resp = client.GetEidResult(req);
            return GetEidTokenResponse.toJsonString(resp);
        } catch (TencentCloudSDKException e) {
            log.error("人脸核身获取结果接口调用失败，错误信息：" + e.toString());
        }
        return "";
    }







}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -303,6 +303,7 @@
        return communityService.listBuildType();
    }


    @ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class)
    @PostMapping("pageotherbuild")
    public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
@@ -446,6 +447,7 @@
        return communityService.deleteVolunteerExamine(comMngVolunteerMngVO);
    }


    @ApiOperation(value = "导入居民")
    @PostMapping("importuser")
    public R importUser(MultipartFile multipartFile)throws IOException {
@@ -462,6 +464,9 @@
        EasyExcel.read(multipartFile.getInputStream(), EexcelUserDTO.class, new UploadEexcelUserDTOListener(userService,name)) .extraRead(CellExtraTypeEnum.MERGE).headRowNumber(1).sheet().doRead();
        return R.ok();
    }




    @ApiOperation(value = "社区人员详情",response = CommunityUserInfoVO.class)
    @GetMapping("detailuser")
@@ -575,6 +580,7 @@
        }
    }


    @ApiOperation(value = "选择导入的小区",response =ComMngStructAreaVO.class )
    @GetMapping("listareas")
    public R listAreas(String param) {

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

@@ -67,6 +67,10 @@
    @Resource
    private CommunityService communityService;


    @Value("${excel.elderimporturl}")
    private Object elderimporturl;

    /**
     * 新增高龄认证
     * @param {classNameFirstLower}AddDTO 添加高龄认证传递对象
@@ -195,4 +199,14 @@
        return communityService.addFeedback(eldersAuthFeedbackAddDTO);
    }

    /**
     * 获取高龄老人导入模板
     * @return 导入模板地址
     */
    @GetMapping("/imp/templates")
    @ApiOperation(value = "获取高龄老人导入模板", response = R.class)
    R getImportExcelUrl(){
        return R.ok(elderimporturl);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthElderlyApi.java

New file
@@ -0,0 +1,107 @@
package com.panzhihua.community_backstage.api;


import com.alibaba.excel.EasyExcel;
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.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Slf4j
@RestController
@RequestMapping("/eldersauthelderly")
@Api(tags = {"高龄老人"})
public class EldersAuthElderlyApi extends BaseController {


    @Resource
    private CommunityService communityService;

    /**
     * 高领老人列表
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/page")
    @ApiOperation(value = "高领老人列表", response = ComEldersAuthElderlyVO.class)
    R query(@Validated @RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO){
//        ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
//        pageEldersAuthElderlyDTO.setUserId(getUserId());
        return communityService.pageQueryEldersAuthElderly(pageEldersAuthElderlyDTO);
    }

    /**
     * 高领老人导入
     * @param file
     * @return
     */
    @PostMapping("/import")
    @ApiOperation(value = "高领老人导入", response = R.class)
    R batchSave(@RequestParam MultipartFile file){
        InputStream inputStream;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, EldersAuthElderlyExcelVO.class, new ComEldersAuthElderlyExcelListen(communityService, getCommunityId(),getUserId())).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
        }
        return R.ok();

    }

    /**
     * 查看高龄老人详情
     * @param id
     * @return
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "高领老人详情", response = ComEldersAuthElderlyVO.class)
    R details(@PathVariable("id") Long id){
        return communityService.getEldersAuthElderlyById(id);
    }

    /**
     * 修改高龄老人
     * @param eldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/update")
    @ApiOperation(value = "更新高龄老人信息", response = R.class)
    R update(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO){
        return communityService.updateEldersAuthElderly(eldersAuthElderlyDTO);
    }

    /**
     * 删除高龄老人
     * @param id
     * @return
     */
    @PostMapping("/delete")
    @ApiOperation(value = "更新高龄老人信息", response = R.class)
    R delete(@RequestParam("id") Long id){
        return communityService.deleteEldersAuthElderly(id);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthHistoryApi.java

New file
@@ -0,0 +1,131 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthHistoryVO;
import com.panzhihua.common.model.vos.partybuilding.ComEldersAuthHistoryExcelVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.List;

@Slf4j
@RestController
@RequestMapping("/elders/history")
@Api(tags = {"高龄老人报表模块"})
public class EldersAuthHistoryApi extends BaseController {

    @Resource
    private CommunityService communityService;
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Value("${excel.userurl}")
    private String excelUrl;


    /**
     * 分页查询老人报表记录
     * @param pageEldersAuthElderlyDTO  请求参数
     * @return
     */
    @PostMapping("/page")
    @ApiOperation(value = "分页查询老人报表记录", response = ComEldersAuthHistoryVO.class)
    public R query(@Validated @RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        pageEldersAuthElderlyDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.getAuthHistoryList(pageEldersAuthElderlyDTO);
    }

    @PostMapping("/export")
    @ApiOperation(value = "导出已认证老人记录")
    public R export(@Validated @RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
        String name = "已认证老人信息.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
//        用户搜索了就下载搜索的用户否则下载所有用户
        R r = communityService.getAuthHistoryExport(pageEldersAuthElderlyDTO);
        if (R.isOk(r)) {
            List<ComEldersAuthHistoryExcelVO> eexcelUserDTOS = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComEldersAuthHistoryExcelVO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComEldersAuthHistoryExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("认证老人记录数据导出").build();
                        excelWriter.write(eexcelUserDTOS, writeSheet);
                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(excelUrl + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到用户");
    }


}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthRecordsApi.java

New file
@@ -0,0 +1,143 @@
package com.panzhihua.community_backstage.api;


import com.alibaba.excel.EasyExcel;
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.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
@Slf4j
@RestController
@RequestMapping("/eldersauthrecords")
@Api(tags = {"高龄认证"})
public class EldersAuthRecordsApi extends BaseController {

    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Value("${excel.userurl}")
    private String excelUrl;

    //@Value("${excel.elderrecordurl}")
   //private String elderRecordUrl = "http://panzhihua.nhys.cdnhxx.com/web/%e8%bd%a6%e8%be%86%e5%af%bc%e5%85%a5%e6%a8%a1%e6%9d%bf.xlsx";

    @Resource
    private CommunityService communityService;

    /**
     * 生存认证记录
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/page")
    @ApiOperation(value = "生存认证记录", response = ComEldersAuthRecordForCommunityVO.class)
    R query(@Validated @RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO){
        ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
        return communityService.pageQueryEldersAuthRecord(pageEldersAuthElderlyDTO);
    }


    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询高龄认证详细信息", response = EldersAuthDetailsVO.class)
    R<EldersAuthDetailsVO> details(@PathVariable("id") Long id){
        return communityService.eldersAuthDetails(id);
    }


    /**
     * 生存认证记录导入
     * @param file
     * @return
     */
    /*@PostMapping("/import")
    @ApiOperation(value = "生存认证记录导入", response = R.class)
    R importRecord(@RequestParam MultipartFile file){
        InputStream inputStream;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, EldersAuthRecordExcelVO.class, new ComEldersAuthElderlyExcelListen(communityService, getCommunityId(),getUserId())).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
        }
        return R.ok();

    }*/

    /**
     * 生存认证记录导入
     * @param id 高龄认证 id
     * @return 查找结果
     */
   /* @GetMapping("/importTemplate")
    @ApiOperation(value = "生存认证记录导入模板", response = EldersAuthDetailsVO.class)
    R importTemplate(@PathVariable("id") Long id){
        //return R.ok(elderRecordUrl);
        return R.ok();
    }*/

    /**
     * 设置当前社区认证方式
     * @return 查找结果
     */
    @PutMapping("/authType/{type}")
    @ApiOperation(value = "设置当前社区认证方式:核验类型（1.视频认证 2.人脸核验）", response = R.class)
    R setAuthType(@PathVariable("type")Integer type){
        if(type!=1&&type!=2){
            return R.fail("参数错误");
        }
        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/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonApi.java

@@ -94,7 +94,7 @@
            log.info("临时文件删除【{}】", delete);
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();
            return R.ok(url + "/idcard/" + name);
            return R.ok(url + "idcard/" + name);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());
            return R.fail();
@@ -141,7 +141,7 @@
                boolean delete = file1.delete();
                log.info("临时文件删除【{}】", delete);
                sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
                urlList.add(url + "/idcard/" + name);
                urlList.add(url + "idcard/" + name);
            } catch (Exception e) {
                log.error("上传文件失败【{}】", e.getMessage());
                return R.fail();

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/CommonEventApi.java

@@ -57,6 +57,7 @@
        }
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageEventDTO.setUserId(loginUserInfoVO.getUserId());
        pageEventDTO.setRevokeType(1);
        return gridService.query(pageEventDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventApi.java

@@ -47,6 +47,8 @@
        LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
        eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
        eventRevokeDTO.setUserName(loginUserInfoVO.getNickName());
        eventRevokeDTO.setRevokeType(1);
        eventRevokeDTO.setRevokeId(loginUserInfoVO.getUserId());
        return gridService.emergenciesRevoke(eventRevokeDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/PublicityEventApi.java

@@ -48,6 +48,7 @@
        ClazzUtils.setIfStringIsEmpty(pagePublicityEventDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pagePublicityEventDTO.setUserId(loginUserInfoVO.getUserId());
        pagePublicityEventDTO.setRevokeType(1);
        return gridService.queryPublicity(pagePublicityEventDTO);
    }
    /**

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java

@@ -1,10 +1,7 @@
package com.panzhihua.grid_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.grid.CommonEventBatchRepublishDTO;
import com.panzhihua.common.model.dtos.grid.EventBatchRevokeDTO;
import com.panzhihua.common.model.dtos.grid.EventDeleteDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridNearbyDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataAreaVO;
@@ -82,6 +79,8 @@
        eventBatchRevokeDTO.setUserName(loginUserInfoVO.getName());
        eventBatchRevokeDTO.setCommunityName(loginUserInfoVO.getCommunityName());
        eventBatchRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        eventBatchRevokeDTO.setRevokeType(2);
        eventBatchRevokeDTO.setRevokeId(loginUserInfoVO.getCommunityId());
        return gridService.batchMarkEventInvalid(eventBatchRevokeDTO);
    }

@@ -97,4 +96,19 @@
        return gridService.getNearByGrid(pageEventGridNearbyDTO);
    }

    /**
     * 重新发布事件
     * @param commonEventRepublishDTO 重新发布事件传递对象
     * @return 修改结果
     */
    @PutMapping("/republish")
    @ApiOperation(value = "重新发布事件", response = R.class)
    R republish(@Validated @RequestBody CommonEventRepublishDTO commonEventRepublishDTO){
        ClazzUtils.setIfStringIsEmpty(commonEventRepublishDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        commonEventRepublishDTO.setUserId(loginUserInfoVO.getUserId());
        commonEventRepublishDTO.setUserName(loginUserInfoVO.getNickName());
        return gridService.republishEvent(commonEventRepublishDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventManageApi.java

@@ -57,6 +57,7 @@
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageEventManageDTO.setUserId(loginUserInfoVO.getUserId());
        pageEventManageDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        pageEventManageDTO.setRevokeType(1);
        return gridService.queryEventToManage(pageEventManageDTO);
    }

@@ -75,6 +76,8 @@
        eventRevokeDTO.setUserName(loginUserInfoVO.getNickName());
        eventRevokeDTO.setCommunityName(loginUserInfoVO.getCommunityName());
        eventRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        eventRevokeDTO.setRevokeId(loginUserInfoVO.getCommunityId());
        eventRevokeDTO.setRevokeType(2);
        return gridService.markEventInvalid(eventRevokeDTO);
    }
    /**

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PublicityEventApi.java

@@ -48,6 +48,7 @@
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pagePublicityEventDTO.setUserId(loginUserInfoVO.getUserId());
        pagePublicityEventDTO.setCommunityId(loginUserInfoVO.getCommunityId());
        pagePublicityEventDTO.setRevokeType(2);
        return gridService.queryPublicityCommunity(pagePublicityEventDTO);
    }

@@ -93,6 +94,8 @@
        LoginUserInfoVO loginUserInfoVO = getLoginUserInfo();
        eventRevokeDTO.setUserId(loginUserInfoVO.getUserId());
        eventRevokeDTO.setUserName(loginUserInfoVO.getName());
        eventRevokeDTO.setRevokeType(2);
        eventRevokeDTO.setRevokeId(loginUserInfoVO.getCommunityId());
        return gridService.emergenciesRevoke(eventRevokeDTO);
    }


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

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

import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,9 +19,8 @@
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.IdCardUtil;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
@@ -82,6 +82,10 @@
    private EldersAuthService eldersAuthService;
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
    public ComEldersAuthUserService comEldersAuthUserService;
    @Resource
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;

    /**
     * 新增社区活动
@@ -1574,31 +1578,32 @@
    }

    @PostMapping("/eldersauth/addByFamilyUser")
    @Transactional(rollbackFor = Exception.class)
    R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){

        List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(eldersAuthAddByFamilyDTO.getUserId());
        ComMngFamilyInfoVO theFamily = null;
        Long familyUserId = eldersAuthAddByFamilyDTO.getFamilyUserId();
        for (ComMngFamilyInfoVO family : list) {
            if (familyUserId == family.getId()) {
                theFamily = family;
            }
        ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
        if(authUserDO == null){
            return R.fail("未查询到老人信息");
        }

        if(theFamily==null){
            return R.fail("家庭成员信息错误");
        Long elderId = authUserDO.getId();
        boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
        if(!canReAuthThisMonth){
            return R.fail("当月已认证，不能再次进行认证");
        }
        Integer age = IdCard.IdNOToAge(theFamily.getIdCard());
        if(age>=80){

        String idCard = authUserDO.getIdCard();

            Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
            EldersAuthDO eldersAuthDO = new EldersAuthDO();
            eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
        eldersAuthDO.setSumitUserId(loginUserId);
            eldersAuthDO.setCreateBy(loginUserId);
            eldersAuthDO.setCreateAt(new Date());
            eldersAuthDO.setIdCard(theFamily.getIdCard());
            eldersAuthDO.setAuthUserName(theFamily.getName());
        eldersAuthDO.setIdCard(idCard);
        eldersAuthDO.setAuthUserName(authUserDO.getName());
            eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
            eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
        eldersAuthDO.setFamilyUserId(authUserDO.getId());
        eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
            //根据身份证查询出籍贯 出生日期
            //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
            String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
@@ -1606,16 +1611,38 @@
                domicile = "暂无";
            }

            Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
        Date birthDay = IdCard.birthDay(idCard);
            eldersAuthDO.setDomicile(domicile);
            eldersAuthDO.setBirthDay(birthDay);
            int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
            if(add==1){
            //设置认证成功
            Long familyUserId = eldersAuthDO.getFamilyUserId();
            ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
            comEldersAuthUserDO.setId(familyUserId);
            comEldersAuthUserDO.setIsAuth(1);
            boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
            if(!updated){
                throw  new ServiceException("添加认证失败，更新认证状态");
            }
            //认证成功  添加认证记录
            List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
                    .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,idCard).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
            if(authHistoryRecordDOList.isEmpty()){
                ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
                authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
                BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
                authHistoryRecordDO.setId(null);
                authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
                authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
                authHistoryRecordDO.setIsAuth(1);
                authHistoryRecordDO.setDomicile(domicile);
                comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
            }
                return R.ok(eldersAuthDO.getId());
            }
        }else{
            return R.fail("家庭成员年龄还未达到80");
        }

        return R.fail();
    }

@@ -1663,4 +1690,15 @@
    R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
        return eldersAuthService.queryExportData(pageEldersAuthDTO);
    }

    /**
     * 设置社区认证方式
     * @param communityId 社区ID
     * @param type 核验类型（1.视频认证 2.人脸核验）
     * @return
     */
    @PostMapping("/elders/setCommunityAuthType")
    R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
        return eldersAuthService.setCommunityAuthType(communityId, type);
    }
}

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

New file
@@ -0,0 +1,151 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
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.vos.R;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
import com.panzhihua.common.model.vos.community.SysConfVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.service_community.service.ComEldersAuthUserService;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @ClasssName EldersAuthApi
 * @Description TODO
 * @Author cedoo
 * @Date 2021/6/9
 * @Version 1.0
 **/
@Slf4j
@RestController
@RequestMapping("/elders")
public class EldersAuthApi {

    @Resource
    private ComEldersAuthUserService comEldersAuthUserService;
    @Resource
    private EldersAuthService eldersAuthService;

    @PostMapping("/getAuth")
    public R getAuth(@RequestParam("authUserId") Long authUserId){
        ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(authUserId);
        if(authUserDO == null){
            return R.fail("未查询到老人信息");
        }
        if(authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)){
            return R.fail("该老人已认证");
        }
        ComElderAuthUserDetailVO authUserDetailVO = new ComElderAuthUserDetailVO();
        BeanUtils.copyProperties(authUserDO,authUserDetailVO);
        return R.ok(authUserDetailVO);
    }

    /**
     * 人脸核验新增高龄认证记录
     * @param authGetResultDTO  请求参数
     * @return  新增结果
     */
    @PostMapping("/add/auth")
    public R addAuth(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO){
        try {
            return eldersAuthService.addAuthByEldersApp(authGetResultDTO);
        } catch (Exception e) {
            throw new ServiceException(e.getMessage());
        }
    }

    /**
     * 高龄认证分页接口
     * @param authPageDTO   请求参数
     * @return  查询结果
     */
    @PostMapping("/page/auth")
    public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO) throws Exception{
        return eldersAuthService.pageEldersByApp(authPageDTO);
    }

    /**
     * 添加高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  添加结果
     */
    @PostMapping("/add")
    public R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO){
        return eldersAuthService.addEldersByApp(authUserAddAppDTO);
    }

    /**
     * 修改高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  修改结果
     */
    @PostMapping("/edit")
    public R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO){
        return eldersAuthService.editEldersByApp(authUserAddAppDTO);
    }


    /**
     * 查询老龄认证记录
     * @param pageComEldersRecordsDTO
     * @return
     */
    @PostMapping("/records")
    R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO){
        return eldersAuthService.queryEldersRecord(pageComEldersRecordsDTO);
    }

    /**
     * 查询老龄认证记录详细
     * @param id
     * @return
     */
    @PostMapping("/records/deatils")
    R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id){
        return eldersAuthService.comEldersAuthElderlyDetails(id);
    }

    /**
     *
     *      * 查询老龄认证社区认证方式
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    @PostMapping("/authtype")
    R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO){
        return eldersAuthService.communityAuthType(eldersAuthTypeQueryDTO);
    }


    /**
     * 分页查询生存认证记录
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/records/page")
    R pageQueryEldersAuthRecord(@RequestBody  PageEldersAuthRecordDTO pageEldersAuthElderlyDTO){
        return eldersAuthService.pageQueryEldersAuthRecord(pageEldersAuthElderlyDTO);
    }

    @PostMapping("/getAuthHistoryList")
    public R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
        return eldersAuthService.getAuthHistoryList(pageEldersAuthElderlyDTO);
    }

    @PostMapping("/getAuthHistoryExport")
    public R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
        return eldersAuthService.getAuthHistoryExport(pageEldersAuthElderlyDTO);
    }


}

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

New file
@@ -0,0 +1,84 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * @author xyh
 * @date 2021/6/9 14:29
 */
@Slf4j
@RestController
@RequestMapping("/eldersauthelderly")
public class EldersAuthElderlyApi {

    @Resource
    private ComEldersAuthElderlyService comEldersAuthElderlyService;



    /**
     * 高领老人列表
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/page")
    R query(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO){
//        ClazzUtils.setIfStringIsEmpty(pageEldersAuthElderlyDTO);
//        pageEldersAuthElderlyDTO.setUserId(getUserId());
        return comEldersAuthElderlyService.pageQueryEldersAuthElderly(pageEldersAuthElderlyDTO);
    }

    /**
     * 批量保存高龄老人
     * @param eldersAuthElderlyExcelVOS
     * @return
     */
    @PostMapping("/batchSave")
    R batchSave(@RequestBody List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy){
        if(eldersAuthElderlyExcelVOS==null||eldersAuthElderlyExcelVOS.size()==0){
            return R.fail("模板高龄老人数据为空");
        }
        return comEldersAuthElderlyService.batchSave(eldersAuthElderlyExcelVOS,communityId,createBy);
    }

    /**
     * 查看高龄老人详情
     * @param id
     * @return
     */
    @GetMapping("/{id}")
    R getById(@PathVariable("id") Long id){
        return comEldersAuthElderlyService.getEldersAuthElderlyById(id);
    }

    /**
     * 修改高领老人信息
     * @param eldersAuthElderlyDTO
     * @return
     */
    @PostMapping("/update")
    R update(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO){
        return comEldersAuthElderlyService.updateEldersAuthElderly(eldersAuthElderlyDTO);
    }

    /**
     * 删除高领老人
     * @param id
     * @return
     */
    @PostMapping("/delete")
    R deleteEldersAuthElderly(@RequestParam("id") Long id){
        return comEldersAuthElderlyService.deleteEldersAuthElderly(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthElderlyMapper.java

New file
@@ -0,0 +1,39 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComEldersAuthElderlyDTO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-06-09
 * @since 1.0
 */
@Mapper
public interface ComEldersAuthElderlyMapper extends BaseMapper<ComEldersAuthElderlyDO> {

    /**
     * 分页查询
     *
     * @param pageComEldersAuthElderlyDTO
     * @return
     */
    IPage<ComEldersAuthElderlyVO> findByPage(Page page, @Param("pageComEldersAuthElderlyDTO") PageComEldersAuthElderlyDTO pageComEldersAuthElderlyDTO);


    Integer updateEldersAuthElderly(ComEldersAuthElderlyDO comEldersAuthElderlyDO);

    /**
     * 根据老人库id删除绑定用户的关系
     * @param elderId   老人库老人id
     */
    void deleteEldersAuthUserById(@Param("elderId") Long elderId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthHistoryRecordMapper.java

New file
@@ -0,0 +1,31 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComEldersAuthHistoryRecordDTO;
import com.panzhihua.service_community.model.dos.ComEldersAuthHistoryRecordDO;
import com.panzhihua.common.model.vos.community.ComEldersAuthHistoryRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-06-10
 * @since 1.0
 */
@Mapper
public interface ComEldersAuthHistoryRecordMapper extends BaseMapper<ComEldersAuthHistoryRecordDO> {

    /**
     * 分页查询
     *
     * @param pageComEldersAuthHistoryRecordDTO
     * @return
     */
    IPage<ComEldersAuthHistoryRecordVO> findByPage(Page page, @Param("pageComEldersAuthHistoryRecordDTO") PageComEldersAuthHistoryRecordDTO pageComEldersAuthHistoryRecordDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthStatisticsMapper.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComEldersAuthStatisticsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
import com.panzhihua.common.model.vos.community.ComEldersAuthHistoryVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthStatisticsDO;
import com.panzhihua.common.model.vos.community.ComEldersAuthStatisticsVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-06-10
 * @since 1.0
 */
@Mapper
public interface ComEldersAuthStatisticsMapper extends BaseMapper<ComEldersAuthStatisticsDO> {

    /**
     * 分页查询
     *
     * @param pageEldersAuthHistoryDTO
     * @return
     */
    IPage<ComEldersAuthHistoryVO> findByPage(Page page, @Param("pageEldersAuthHistoryDTO") PageEldersAuthHistoryDTO pageEldersAuthHistoryDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEldersAuthUserMapper.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-06-09
 * @since 1.0
 */
@Mapper
public interface ComEldersAuthUserMapper extends BaseMapper<ComEldersAuthUserDO> {

    /**
     * 分页查询高龄老人用户绑定列表
     * @return  高龄老人用户绑定列表
     */
    IPage<ComElderAuthUserAppVO> findByPage(Page page,@Param("userId") Long userId);


    /**
     * 统计当月家庭老人 有效认证记录数
     * @param elderId
     * @return
     */
    int countCurrentMonthValidAuthRecord(@Param("elderId") Long elderId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java

@@ -5,10 +5,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ExcelElderAuthDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -74,9 +75,9 @@

    @Select("<script> " +
            "SELECT ea.id, ea.create_at, ea.create_by, ea.update_by, ea.update_at," +
            " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID, " +
            " ea.AUTH_USER_NAME , ea.ID_CARD, ea.BIRTH_DAY, ea.FAMILY_USER_ID, ea.type,  " +
            " ea.DOMICILE, ea.SUMIT_USER_ID,  u.phone as submitUserAccount  , ea.VIDEO_URL , ea.FAMILY_USER_ID, " +
            " u.name as submitUserName, ROUND(DATEDIFF(CURDATE(), ea.BIRTH_DAY)/365.2422) as age \n" +
            " u.name as submitUserName, ea.age \n" +
            "FROM  com_elders_auth ea LEFT JOIN sys_user  u ON ea.SUMIT_USER_ID = u.user_id\n" +
            " where ea.id = #{id}"  +
            "</script>")
@@ -154,4 +155,68 @@
            "  WHERE substring(ad.district_adcode, 1, 6) = substring(#{idCard}, 1, 6) "+
            "</script>")
    String selectDomicile(@Param("idCard")String idCard);


    @Select("<script> " +
            " SELECT distinct t.id, t.yearMonth, au.`type`,  DATE_FORMAT(au.CREATE_AT,'%Y-%m-%d')  AS create_at,\n" +
            " case " +
            " when fed.id IS NOT NULL then true\n" +
            " ELSE false " +
            " END hasFeed " +
            " FROM ( SELECT MAX(id) AS id , DATE_FORMAT(create_at, '%Y-%m') AS yearMonth\n" +
            " FROM com_elders_auth \n" +
            " GROUP BY id_card, yearMonth\n" +
            " ) t  LEFT JOIN com_elders_auth au ON t.id = au.id\n" +
            " LEFT JOIN com_elders_auth_feedback fed ON t.id = fed.AUTH_ID\n" +
            " <where>" +
            " au.FAMILY_USER_ID = #{pageComEldersRecordsDTO.bigAgeid} " +
            "</where>" +
            "<if test='pageComEldersRecordsDTO.sortColumns!=null'>\n" +
            "ORDER BY ${pageComEldersRecordsDTO.sortColumns} ${pageComEldersRecordsDTO.sortType}\n" +
            "</if>  " +
            "</script>")
    List<ComEldersAuthRecordVO> selectEldersRecordByPage(Page page, @Param("pageComEldersRecordsDTO") PageComEldersRecordsDTO pageComEldersRecordsDTO);

    @Select("<script> " +
            "  SELECT DISTINCT a.name" +
            " FROM com_elders_auth ea LEFT JOIN com_elders_auth_user au ON ea.FAMILY_USER_ID = au.id \n" +
            "LEFT JOIN com_act a ON au.community_id = a.community_id\n" +
            " WHERE ea.ID = #{id}  " +
            "</script>")
    String selectCommunityNameByAuth(@Param("id")  Long id);

    @Select("select user_id,id_card,name from sys_user where user_id = #{userId}")
    SysUserVO getSysUserByUserId(@Param("userId")Long userId);


    @Select("<script> " +
            " SELECT e.ID,e.CREATE_BY,e.CREATE_AT, e.UPDATE_BY, e.UPDATE_AT, e.ID_CARD, e.AUTH_USER_NAME, e.VIDEO_URL," +
            " e.SUMIT_USER_ID, e.DOMICILE, e.STATUS, e.BIRTH_DAY, e.type, e.age, e.verification_result, u.name as sumitUserName, u.phone as sumitUserAccount  " +
            " FROM ( " +
            "       SELECT MAX(id) AS id , DATE_FORMAT(create_at, '%Y-%m') AS yearMonth " +
            "        FROM com_elders_auth " +
            "        GROUP BY id_card, yearMonth " +
            "       ) t " +
            " left join com_elders_auth e on t.id = e.id " +
            " LEFT JOIN sys_user u ON e.SUMIT_USER_ID = u.user_id  " +
            "<where>" +
            " <if test='pageEldersAuthRecordDTO.name!=null'>\n" +
            " AND e.AUTH_USER_NAME like concat('%', #{pageEldersAuthRecordDTO.name}, '%')" +
            "</if>" +
            " <if test='pageEldersAuthRecordDTO.idCard!=null'>\n" +
            " AND e.ID_CARD  like concat('%',  #{pageEldersAuthRecordDTO.idCard}, '%')\n" +
            "</if>" +
            " <if test='pageEldersAuthRecordDTO.type!=null'>\n" +
            " AND e.type = #{pageEldersAuthRecordDTO.type}\n" +
            "</if>" +
            " <if test='pageEldersAuthRecordDTO.month!=null'>\n" +
            " AND month(e.CREATE_AT) = #{pageEldersAuthRecordDTO.month}\n" +
            "</if>\n" +
            "</where>\n" +
            "<if test='pageEldersAuthRecordDTO.sortColumns!=null'>\n" +
            "ORDER BY e.${pageEldersAuthRecordDTO.sortColumns} ${pageEldersAuthRecordDTO.sortType}\n" +
            "</if> " +
            "</script>")
    IPage<ComEldersAuthRecordForCommunityVO> selectCommunityEldersRecordByPage(Page page, @Param("pageEldersAuthRecordDTO") PageEldersAuthRecordDTO pageEldersAuthRecordDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthElderlyDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.EldersAuthFeedbackDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @author xyh
 * @date 2021/6/9 14:34
 */
@Mapper
public interface EldersAuthElderlyDAO extends BaseMapper<EldersAuthFeedbackDO> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/SysConfMapper.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageSysConfDTO;
import com.panzhihua.common.model.vos.community.SysConfVO;
import com.panzhihua.service_community.model.dos.SysConfDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Mapper
public interface SysConfMapper extends BaseMapper<SysConfDO> {

        /**
         * 分页查询
         * @param pageSysConfDTO
         * @return
         */
        IPage<SysConfVO> findByPage(Page page, @Param("pageSysConfDTO")PageSysConfDTO pageSysConfDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -35,7 +35,7 @@
    private String happenAddr;

    /**
     * 状态 1待处理 2已处理
     * 状态 1待审核   2进行中 3已驳回 4已完成
     */
    private Integer status;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthElderlyDO.java

New file
@@ -0,0 +1,84 @@
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;
import java.util.Date;


/**
 * 高龄老人库实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@TableName("com_elders_auth_elderly")
@EncryptDecryptClass
public class ComEldersAuthElderlyDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 名称   列: name
     */
    private String name;
    /**
     * 身份证号码   列: id_card
     */
    @EncryptDecryptField
    private String idCard;
    /**
     * 出生年月   列: birthday
     */
    private String birthday;
    /**
     * 人员类别（1.80-89周岁 2.90-99周岁 3.100周岁（含）以上）   列: level
     */
    private Integer level;
    /**
     * 户籍地   列: domicile
     */
    private String domicile;
    /**
     * 社区id   列: community_id
     */
    private Long communityId;
    /**
     * 是否健在（1.是  2.否）   列: is_exist
     */
    private Integer isExist;
    /**
     * 是否办理高龄津贴（1.是 2.否）   列: is_big_age
     */
    private Integer isBigAge;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 创建用户   列: create_by
     */
    private Long createBy;
    /**
     * 修改时间   列: update_at
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;
    /**
     * 修改用户   列: update_by
     */
    private Long updateBy;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthHistoryRecordDO.java

New file
@@ -0,0 +1,74 @@
package com.panzhihua.service_community.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 高龄老人认证记录实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@TableName("com_elders_auth_history_record")
public class ComEldersAuthHistoryRecordDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 老人用户id   列: user_id
     */
    private Long userId;
    /**
     * 认证记录id   列：auth_id
     */
    private Long authId;
    /**
     * 名称   列: name
     */
    private String name;
    /**
     * 身份证号码   列: id_card
     */
    private String idCard;
    /**
     * 出生年月   列: brithday
     */
    private String brithday;
    /**
     * 年龄   列: age
     */
    private Integer age;
    /**
     * 户籍地   列: domicile
     */
    private String domicile;
    /**
     * 本月是否已认证（1.是 2.否）   列: is_auth
     */
    private Integer isAuth;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 社区id     列：社区id
     */
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthStatisticsDO.java

New file
@@ -0,0 +1,62 @@
package com.panzhihua.service_community.model.dos;

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;



/**
 * 老人认证月统计实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-10
 * */
@Data
@TableName("com_elders_auth_statistics")
public class ComEldersAuthStatisticsDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 年份   列: year
     */
    private Integer year;
    /**
     * 月份   列: month
     */
    private Integer month;
    /**
     * 总人数   列: sum
     */
    private Integer sum;
    /**
     * 认证人数   列: auth_sum
     */
    private Integer authSum;
    /**
     * 未认证人数   列: no_auth_sum
     */
    private Integer noAuthSum;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 社区id   列: community_id
     */
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComEldersAuthUserDO.java

New file
@@ -0,0 +1,87 @@
package com.panzhihua.service_community.model.dos;

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;
import java.util.Date;


/**
 * 用户绑定老人关系实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@TableName("com_elders_auth_user")
@EncryptDecryptClass
public class ComEldersAuthUserDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 用户id   列: user_id
     */
    private Long userId;
    /**
     * 与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)   列: relation
     */
    private Integer relation;
    /**
     * 是否已认证（1.是 2.否）   列: is_auth
     */
    private Integer isAuth;
    /**
     * 姓名   列: name
     */
    private String name;
    /**
     * 身份证号码   列: id_card
     */
    @EncryptDecryptField
    private String idCard;
    /**
     * 社区id   列: community_id
     */
    private Long communityId;
    /**
     * 高龄老人库id   列: big_age_id
     */
    private Long bigAgeId;
    /**
     * 创建时间 列：create_at
     */
    private Date createAt;
    /**
     * 是否已认证（1.是 2.否）
     */
    public interface isAuth{
        int yes = 1;
        int no = 2;
    }
    /**
     * 与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)
     */
    public interface relation{
        int fm = 1;
        int po = 2;
        int zn = 3;
        int xdjm = 4;
        int zf = 5;
        int br = 6;
        int qt = 7;
    }

}

 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
@@ -76,4 +80,16 @@
     * 家庭成员ID   列: FAMILY_USER_ID
     */
    private Long  familyUserId;
    /**
     * 年龄    列: age
     */
    private Integer age;
    /**
     * 核验类型（1.视频认证 2.人脸核验）  列：type
     */
    private Integer type;
    /**
     * 人脸核验结果数据 列：verification_result
     */
    private String verificationResult;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/SysConfDO.java

New file
@@ -0,0 +1,59 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * 系统配置实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Data
@TableName("sys_conf")
public class SysConfDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id   列: id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 参数名   列: name
     */
    private String name;
    /**
     * 参数唯一编码   列: code
     */
    private String code;
    /**
     * 参数值   列: value
     */
    private String value;
    /**
     * 参数描述   列: description
     */
    private String description;
    /**
     * 创建时间   列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 创建用户   列: create_by
     */
    private Long createBy;
    /**
     * 社区id   列: community_id
     */
    private Long communityId;

}

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

New file
@@ -0,0 +1,57 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;

import java.util.List;

/**
 * 高龄老人库 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
public interface ComEldersAuthElderlyService extends IService<ComEldersAuthElderlyDO> {


    /**
     * 查询高龄老人列表
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    R pageQueryEldersAuthElderly(PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO);

    /**
     * 批量保存高龄老人
     * @param eldersAuthElderlyExcelVOS
     * @return
     */
    R batchSave(List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,Long communityId,Long createBy);

    /**
     * 查看高龄老人详情
     * @param id
     * @return
     */
    R getEldersAuthElderlyById(Long id);

    /**
     * 修改高龄老人
     * @param eldersAuthElderlyDTO
     * @return
     */
    R updateEldersAuthElderly(EldersAuthElderlyDTO eldersAuthElderlyDTO);

    /**
     * 删除高领老人
     * @param id
     * @return
     */
    R deleteEldersAuthElderly(Long id);
}

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

New file
@@ -0,0 +1,23 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;

/**
 * 用户绑定老人关系 service
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
public interface ComEldersAuthUserService extends IService<ComEldersAuthUserDO> {


    /**
     * 检查当月是否可再次进行认证
     * @param elderId
     * @return
     */
    boolean checkReAuthAgain(Long elderId);
}

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

@@ -3,9 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.*;
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.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.vos.community.SysConfVO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;

/**
@@ -72,4 +77,73 @@
     * @return
     */
    String queryDomicile(String idCard);

    /**
     * 人脸核验新增认证记录
     * @param authGetResultDTO  请求参数
     * @return  新增结果
     */
    R addAuthByEldersApp(ComEldersAuthGetResultDTO authGetResultDTO)  throws Exception;

    /**
     * 高龄认证分页接口
     * @param authPageDTO   请求参数
     * @return  查询结果
     */
    R pageEldersByApp(ComEldersAuthPageDTO authPageDTO) throws Exception;

    /**
     * 添加高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  添加结果
     */
    R addEldersByApp(ComEldersAuthUserAddAppDTO authUserAddAppDTO);

    /**
     * 修改高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  修改结果
     */
    R editEldersByApp(ComEldersAuthUserAddAppDTO authUserAddAppDTO);

    /**
     * 查询生存认证记录
     * @param pageComEldersRecordsDTO
     * @return
     */
    R queryEldersRecord(PageComEldersRecordsDTO pageComEldersRecordsDTO);

    /**
     * 查询老龄认证记录详细
     * @param id
     * @return
     */
    R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(Long id);

    /**
     * 查询社区老龄认证 认证方式
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

    /**
     * 分页查询生存认证记录
     * @param pageEldersAuthElderlyDTO
     * @return
     */
    R pageQueryEldersAuthRecord(PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);

    /**
     * 设置社区认证方式
     * @param communityId 社区ID
     * @param type 核验类型（1.视频认证 2.人脸核验）
     * @return
     */
    R setCommunityAuthType(Long communityId, Integer type);

    R getAuthHistoryList(PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);

    R getAuthHistoryExport(PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);

}

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

New file
@@ -0,0 +1,171 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.service_community.dao.ComEldersAuthElderlyMapper;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;

/**
 * 高龄老人库 serviceImpl
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Slf4j
@Service
public class ComEldersAuthElderlyServiceImpl extends ServiceImpl<ComEldersAuthElderlyMapper, ComEldersAuthElderlyDO> implements ComEldersAuthElderlyService {

    @Resource
    private ComEldersAuthElderlyMapper comEldersAuthElderlyMapper;

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

    @Resource
    private EldersAuthService eldersAuthService;

    @Override
    public R pageQueryEldersAuthElderly(PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO) {
        PageComEldersAuthElderlyDTO pageComEldersAuthElderlyDTO = new PageComEldersAuthElderlyDTO();
        BeanUtils.copyProperties(pageEldersAuthElderlyDTO,pageComEldersAuthElderlyDTO);
        IPage<ComEldersAuthElderlyVO> page = comEldersAuthElderlyMapper.findByPage(new Page(pageEldersAuthElderlyDTO.getPageNum(),pageEldersAuthElderlyDTO.getPageSize()),pageComEldersAuthElderlyDTO);
        return R.ok(page);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R batchSave(List<EldersAuthElderlyExcelVO> list,Long communityId,Long createBy) {
        List<ComEldersAuthElderlyDO> listNewDO = new ArrayList<>();
        List<ComEldersAuthElderlyDO> listUpdateDO = new ArrayList<>();
        list.forEach(e->{
            String idCardProto = e.getIdCard();
            if(idCardProto!=null && idCardProto.contains("x")){
                idCardProto = idCardProto.replaceAll("x", "X");
            }
            String idCardEncrypted = e.getIdCard();
            try {
                idCardEncrypted = AESUtil.encrypt128(idCardEncrypted, aesKey);
            } catch (Exception exp) {
                exp.printStackTrace();
            }
            List<ComEldersAuthElderlyDO> comEldersAuthElderlyDOList =
                    comEldersAuthElderlyMapper.selectList(new LambdaQueryWrapper<ComEldersAuthElderlyDO>().eq(ComEldersAuthElderlyDO::getIdCard, idCardEncrypted)
                    .orderByDesc(ComEldersAuthElderlyDO::getCreateAt));

            if(comEldersAuthElderlyDOList!=null && comEldersAuthElderlyDOList.size()>0){
                ComEldersAuthElderlyDO lastestOne = comEldersAuthElderlyDOList.get(0);
                lastestOne.setName(e.getName());
                lastestOne.setCommunityId(communityId);
                lastestOne.setUpdateBy(createBy);
                lastestOne.setIdCard(null);
                lastestOne.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
                lastestOne.setIsExist(Objects.equals("是",e.getIsExist())?1:2);
                lastestOne.setIsBigAge(Objects.equals("是",e.getIsExist())?1:2);
                lastestOne.setUpdateAt(new Date());
                listUpdateDO.add(lastestOne);
            }else{
                ComEldersAuthElderlyDO comEldersAuthElderlyDO = new ComEldersAuthElderlyDO();
                comEldersAuthElderlyDO.setName(e.getName());
                comEldersAuthElderlyDO.setIdCard(e.getIdCard());
                comEldersAuthElderlyDO.setCommunityId(communityId);
                comEldersAuthElderlyDO.setCreateBy(createBy);
                comEldersAuthElderlyDO.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
                comEldersAuthElderlyDO.setIsExist(Objects.equals("是",e.getIsExist())?1:2);
                comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是",e.getIsExist())?1:2);
                comEldersAuthElderlyDO.setBirthday(e.getBirthday());
                comEldersAuthElderlyDO.setLevel(e.getLevel());
                listNewDO.add(comEldersAuthElderlyDO);
            }

        });
        boolean noImport = (listNewDO==null || listNewDO.size()==0) &&  (listUpdateDO==null || listUpdateDO.size()==0);
        if(noImport){
            throw new ServiceException("未发现高龄老人数据");
        }
        if(listNewDO!=null && listNewDO.size()>0) {
            boolean batchAdd = this.saveBatch(listNewDO);
            if (!batchAdd) {
                throw new ServiceException("批量插入失败");
            }
        }
        if(listUpdateDO!=null && listUpdateDO.size()>0) {
            boolean batchUpdate = this.updateBatchById(listUpdateDO);
            if (!batchUpdate) {
                throw new ServiceException("批量更新失败");
            }
        }

        return R.ok("共计导入高龄老人数量：" + list.size());
    }


    @Override
    public R getEldersAuthElderlyById(Long id) {
        ComEldersAuthElderlyDO comEldersAuthElderlyDO = this.baseMapper.selectById(id);
        if(comEldersAuthElderlyDO==null){
            return R.fail("记录不存在");
        }
        ComEldersAuthElderlyVO comEldersAuthElderlyVO = new ComEldersAuthElderlyVO();
        BeanUtils.copyProperties(comEldersAuthElderlyDO,comEldersAuthElderlyVO);
        return R.ok(comEldersAuthElderlyVO);
    }

    @Override
    public R updateEldersAuthElderly(EldersAuthElderlyDTO eldersAuthElderlyDTO) {
        ComEldersAuthElderlyDO  comEldersAuthElderlyDO = this.baseMapper.selectById(eldersAuthElderlyDTO.getId());
        if(!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getName())){
            comEldersAuthElderlyDO.setName(eldersAuthElderlyDTO.getName());
        }
        if(eldersAuthElderlyDTO.getIsExist()!=null&&
                eldersAuthElderlyDTO.getIsExist().intValue()!=1 && eldersAuthElderlyDTO.getIsExist()!=2){
            return R.fail("参数错误，是否健在只能为1或2");
        }
        comEldersAuthElderlyDO.setIsExist(eldersAuthElderlyDTO.getIsExist());
        comEldersAuthElderlyDO.setIsBigAge(eldersAuthElderlyDTO.getIsBigAge());
        baseMapper.updateEldersAuthElderly(comEldersAuthElderlyDO);
        return R.ok();
    }

    @Override
    public R deleteEldersAuthElderly(Long id) {
        if(this.baseMapper.deleteById(id) > 0){
            //删除用户关联的老人信息
            this.baseMapper.deleteEldersAuthUserById(id);
            return R.ok();
        }
        return R.fail();
    }
}

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

New file
@@ -0,0 +1,33 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.dao.ComEldersAuthUserMapper;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import com.panzhihua.service_community.service.ComEldersAuthUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;


/**
 * 用户绑定老人关系 serviceImpl
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
@Slf4j
@Service
public class ComEldersAuthUserServiceImpl extends ServiceImpl<ComEldersAuthUserMapper, ComEldersAuthUserDO> implements ComEldersAuthUserService {

    @Resource
    private ComEldersAuthUserMapper comEldersAuthUserMapper;

    @Override
    public boolean checkReAuthAgain(Long elderId) {
        int validAuthRecord = comEldersAuthUserMapper.countCurrentMonthValidAuthRecord(elderId);
        return validAuthRecord==0;
    }
}

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

@@ -1,33 +1,53 @@
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;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
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;
import com.panzhihua.common.model.vos.community.EldersAuthFeedbackVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.common.model.vos.partybuilding.ComEldersAuthHistoryExcelVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.EldersAuthService;
import io.swagger.annotations.ApiModelProperty;
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;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**
 * @auther lyq
 * @create 2021-04-14 15:03:01
 * @describe 订单表服务实现类
 * @describe 服务实现类
 */
@Slf4j
@Service
@@ -35,9 +55,22 @@

    @Resource
    private EldersAuthDAO eldersAuthDAO;

    @Resource
    private EldersAuthFeedbackDAO eldersAuthFeedbackDAO;
    @Resource
    private ComEldersAuthUserMapper comEldersAuthUserMapper;
    @Resource
    private ComEldersAuthElderlyMapper comEldersAuthElderlyMapper;
    @Resource
    private SysConfMapper sysConfDao;
    @Resource
    private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
    @Resource
    private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;

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

    /**
     * 新增高龄认证
     * @param eldersAuthAddDTO
@@ -119,12 +152,29 @@
     * @param eldersAuthFeedbackAddDTO
     * @return 新增结果
     */
    @Transactional(rollbackFor = Exception.class)
    public R addFeedback(EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
        EldersAuthDO eldersAuthDO = eldersAuthDAO.selectById(eldersAuthFeedbackAddDTO.getAuthId());
        if(eldersAuthDO==null){
            return R.fail("认证记录不存在");
        }
        if(eldersAuthDO.getType()==null){
            return R.fail("认证方式未知");
        }
        if(eldersAuthDO.getType().intValue()!=1){
            return R.fail("当前认证方式不能进行反馈");
        }
        EldersAuthFeedbackDO eldersAuthFeedbackDO = new EldersAuthFeedbackDO();
        eldersAuthFeedbackDO.setCreateBy(eldersAuthFeedbackAddDTO.getUserId());
        eldersAuthFeedbackDO.setCreateAt(new Date());
        BeanUtils.copyProperties(eldersAuthFeedbackAddDTO, eldersAuthFeedbackDO);
        if(eldersAuthFeedbackDAO.insert(eldersAuthFeedbackDO)>0){
            eldersAuthDO.setStatus("1");
            eldersAuthDO.setIdCard(null);
            int updated = eldersAuthDAO.updateById(eldersAuthDO);
            if(updated!=1){
                throw new ServiceException("更新认证记录状态失败");
            }
            return R.ok();
        }
        return R.fail();
@@ -147,4 +197,298 @@
    public String queryDomicile(String idCard) {
        return eldersAuthDAO.selectDomicile(idCard);
    }

    @Override
    public R queryEldersRecord(PageComEldersRecordsDTO pageComEldersRecordsDTO) {
        Page page = new Page<>();
        page.setSize(pageComEldersRecordsDTO.getPageSize());
        page.setCurrent(pageComEldersRecordsDTO.getPageNum());
        List<ComEldersAuthRecordVO> eldersAuthDOList = eldersAuthDAO.selectEldersRecordByPage(page, pageComEldersRecordsDTO);
        return R.ok(eldersAuthDOList);
    }

    @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);

        String communityName = eldersAuthDAO.selectCommunityNameByAuth(id);
        comEldersAuthElderlyDetailsVO.setCommunityName(communityName);

        List<EldersAuthFeedbackDO> eldersAuthFeedbackDOList = eldersAuthFeedbackDAO.selectList(new LambdaQueryWrapper<EldersAuthFeedbackDO>().eq(EldersAuthFeedbackDO::getAuthId, id));
        List<EldersAuthFeedbackVO> eldersAuthFeedbackVOList = new ArrayList<>();
        eldersAuthFeedbackDOList.forEach(edo ->{
            EldersAuthFeedbackVO eldersAuthFeedbackVO = new EldersAuthFeedbackVO();
            BeanUtils.copyProperties(edo, eldersAuthFeedbackVO);
            eldersAuthFeedbackVOList.add(eldersAuthFeedbackVO);
        });
        comEldersAuthElderlyDetailsVO.setFeedback(eldersAuthFeedbackVOList);
        return R.ok(comEldersAuthElderlyDetailsVO);
    }

    @Override
    public R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        Long communityId = eldersAuthTypeQueryDTO.getCommunityId();
        List<SysConfDO> confDOList =
                sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCommunityId, communityId)
                .orderByDesc(SysConfDO::getCreateAt));
        if(confDOList==null || confDOList.size()==0){
            SysConfDO sysConfDO = new SysConfDO();
            sysConfDO.setCode("ELDER_AUTH_TYPE");
            sysConfDO.setName("高龄认证类型");
            sysConfDO.setValue(2+"");//核验类型（1.视频认证 2.人脸核验）
            sysConfDO.setDescription("高龄认证默认添加的核验类型");
            sysConfDO.setCommunityId(communityId);
            sysConfDO.setCreateBy(eldersAuthTypeQueryDTO.getUserId());
            int inserted = sysConfDao.insert(sysConfDO);
            if(inserted!=1){
                throw new ServiceException("添加高龄认证默认添加的核验类型失败");
            }
            confDOList =
                    sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCommunityId, eldersAuthTypeQueryDTO.getOperUserId())
                            .orderByDesc(SysConfDO::getCreateAt));
        }
        if(confDOList!=null && confDOList.size()>0){
            SysConfDO  latest = confDOList.get(0);
            SysConfVO sysConfVO = new SysConfVO();
            BeanUtils.copyProperties(latest, sysConfVO);
            return R.ok(sysConfVO.getValue());
        }
        return R.ok();
    }

    /**
     * 人脸核验新增高龄认证记录
     * @param authGetResultDTO  请求参数
     * @return  新增结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addAuthByEldersApp(ComEldersAuthGetResultDTO authGetResultDTO) throws Exception{
        ComEldersAuthUserDO authUserDO = comEldersAuthUserMapper.selectById(authGetResultDTO.getAuthUserId());
        if(authUserDO != null){
            String idCard = authUserDO.getIdCard();
            EldersAuthDO eldersAuthDO = new EldersAuthDO();
            eldersAuthDO.setIdCard(idCard);
            eldersAuthDO.setAuthUserName(authUserDO.getName());
            eldersAuthDO.setCreateBy(authGetResultDTO.getUserId());
            eldersAuthDO.setCreateAt(new Date());
            eldersAuthDO.setSumitUserId(authGetResultDTO.getUserId());
            String domicile = this.baseMapper.selectDomicile(idCard);
            if(org.springframework.util.StringUtils.isEmpty(domicile)){
                domicile = "暂无";
            }
            eldersAuthDO.setDomicile(domicile);
            eldersAuthDO.setBirthDay(IdcardUtil.getBirthDate(idCard));
            eldersAuthDO.setFamilyUserId(authUserDO.getId());
            Integer age = IdcardUtil.getAgeByIdCard(idCard);

            eldersAuthDO.setAge(age);
            eldersAuthDO.setType(2);
            eldersAuthDO.setVerificationResult(authGetResultDTO.getVerificationResult());

            this.baseMapper.insert(eldersAuthDO);

            //认证成功  添加认证记录
            List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
                    .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,eldersAuthDO.getIdCard()).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
            if(authHistoryRecordDOList.isEmpty()){
                ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                authHistoryRecordDO.setUserId(authGetResultDTO.getAuthUserId());
                authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
                BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
                authHistoryRecordDO.setId(null);
                authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
                authHistoryRecordDO.setAge(age);
                authHistoryRecordDO.setIsAuth(1);
                authHistoryRecordDO.setDomicile(domicile);
                comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
            }

            authUserDO.setIsAuth(ComEldersAuthUserDO.isAuth.yes);
            authUserDO.setIdCard(AESUtil.encrypt128(authUserDO.getIdCard(), aesKey));
            comEldersAuthUserMapper.updateById(authUserDO);

            return R.ok(eldersAuthDO.getId());
        }
        log.error("人脸核验新增认证记录失败，错误原因：未查询到老人记录，老人id：" + authGetResultDTO.getAuthUserId());
        return R.fail();
    }

    /**
     * 高龄认证分页接口
     * @param authPageDTO   请求参数
     * @return  查询结果
     */
    @Override
    public R pageEldersByApp(ComEldersAuthPageDTO authPageDTO) throws Exception{
        //判断当前用户是否是高龄老人，如果是则将这个人新增到高龄老人的列表里
        SysUserVO userVO = this.eldersAuthDAO.getSysUserByUserId(authPageDTO.getUserId());
        if(userVO != null){
            String idCard = userVO.getIdCard();
            userVO.setIdCard(AESUtil.encrypt128(userVO.getIdCard(), aesKey));
            //查询当前用户是否已存在用户关联中
            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(idCard);
                    authUserDO.setCommunityId(authElderlyDO.getCommunityId());
                    authUserDO.setBigAgeId(authElderlyDO.getId());
                    comEldersAuthUserMapper.insert(authUserDO);
                }
            }
        }

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

                if(authUser.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)){
                    List<EldersAuthDO> authDOS = eldersAuthDAO.selectList(new QueryWrapper<EldersAuthDO>().lambda()
                            .eq(EldersAuthDO::getSumitUserId,authPageDTO.getUserId()).orderByDesc(EldersAuthDO::getCreateAt));
                    if(!authDOS.isEmpty()){
                        EldersAuthDO authDO = authDOS.get(0);
                        if(authDO.getType().equals(1)){//视频认证
                            Integer count = eldersAuthFeedbackDAO.selectCount(new QueryWrapper<EldersAuthFeedbackDO>().lambda()
                                    .eq(EldersAuthFeedbackDO::getAuthId,authDO.getId()));
                            if(count > 0){
                                authUser.setIsFeedback(1);
                            }
                        }
                    }
                }

                ComEldersAuthUserDO authUserDO = comEldersAuthUserMapper.selectById(authUser.getElderId());
                if(authUserDO != null){
                    try {
                        authUser.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
                    }catch (NullPointerException e){
                        log.error("获取用户年龄出错了:" + authUser.getIdCard());
                    }
                }
            });
        }
        return R.ok(authUserAppVOIPage);
    }

    /**
     * 添加高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  添加结果
     */
    @Override
    public R addEldersByApp(ComEldersAuthUserAddAppDTO authUserAddAppDTO){

        ComEldersAuthUserDO authUserDO = comEldersAuthUserMapper.selectOne(new QueryWrapper<ComEldersAuthUserDO>().lambda()
                .eq(ComEldersAuthUserDO::getIdCard,authUserAddAppDTO.getIdCard()));
        if(authUserDO != null){
            return R.fail("当前老人已存在");
        }

        String encryptedIdCard =authUserAddAppDTO.getIdCard();
        try {
            encryptedIdCard =  AESUtil.encrypt128(authUserAddAppDTO.getIdCard(), aesKey);
        } catch (Exception e) {
            e.printStackTrace();
        }
        ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()
                .eq(ComEldersAuthElderlyDO::getIdCard, encryptedIdCard));
        if(authElderlyDO == null){
            return R.fail("未在系统找到相符的高龄老人！请检查信息是否正确，或联系社区工作人员");
        }

        authUserDO = new ComEldersAuthUserDO();
        BeanUtils.copyProperties(authUserAddAppDTO,authUserDO);
        authUserDO.setBigAgeId(authElderlyDO.getId());
        authUserDO.setName(authElderlyDO.getName());
        if(comEldersAuthUserMapper.insert(authUserDO) > 0){
            return R.ok(authUserDO.getId());
        }

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

    /**
     * 修改高龄老人接口
     * @param authUserAddAppDTO 请求参数
     * @return  修改结果
     */
    @Override
    public R editEldersByApp(ComEldersAuthUserAddAppDTO authUserAddAppDTO){

        ComEldersAuthUserDO authUserDO = comEldersAuthUserMapper.selectById(authUserAddAppDTO.getElderId());
        if(authUserDO == null){
            return R.fail("未查询到老人信息");
        }
        if(StringUtils.isNotEmpty(authUserAddAppDTO.getName())){
            authUserDO.setName(authUserAddAppDTO.getName());
        }
        if(authUserAddAppDTO.getRelation() != null){
            authUserDO.setRelation(authUserAddAppDTO.getRelation());
        }
        if(comEldersAuthUserMapper.updateById(authUserDO) > 0){
            return R.ok();
        }
        return R.fail();
    }

    @Override
    public R pageQueryEldersAuthRecord(PageEldersAuthRecordDTO pageEldersAuthElderlyDTO) {
        Page page = new Page();
        page.setCurrent(pageEldersAuthElderlyDTO.getPageNum());
        page.setSize(pageEldersAuthElderlyDTO.getPageSize());
        IPage<ComEldersAuthRecordForCommunityVO> ipage = eldersAuthDAO.selectCommunityEldersRecordByPage(page, pageEldersAuthElderlyDTO);
        return R.ok(ipage);
    }
    @Override
    public R setCommunityAuthType(Long communityId, Integer type) {
        List<SysConfDO> authConf =
                sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>()
                        .eq(SysConfDO::getCommunityId, communityId)
                        .eq(SysConfDO::getCode, "ELDER_AUTH_TYPE")
                        .orderByDesc(SysConfDO::getCreateAt));
        if(authConf!=null && authConf.size()>0){
            SysConfDO first = authConf.get(0);
            first.setValue(type+"");
            int updated = sysConfDao.updateById(first);
            if(updated == 1){
                return R.ok();
            }
        }
        return R.fail();
    }

    @Override
    public R getAuthHistoryList(PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
        return R.ok(comEldersAuthStatisticsMapper.findByPage(new Page(pageEldersAuthElderlyDTO.getPageNum(),pageEldersAuthElderlyDTO.getPageSize()),pageEldersAuthElderlyDTO));
    }

    public R getAuthHistoryExport(PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
        Date startTime = DateUtils.getYearMonthStart(pageEldersAuthElderlyDTO.getYear(),pageEldersAuthElderlyDTO.getMonth());
        Date endTime = DateUtils.getYearMonthEnd(pageEldersAuthElderlyDTO.getYear(),pageEldersAuthElderlyDTO.getMonth());

        List<ComEldersAuthHistoryRecordDO> userList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
                .eq(ComEldersAuthHistoryRecordDO::getCommunityId,pageEldersAuthElderlyDTO.getCommunityId())
                .ge(ComEldersAuthHistoryRecordDO::getCreateAt,startTime).le(ComEldersAuthHistoryRecordDO::getCreateAt,endTime));

        List<ComEldersAuthHistoryExcelVO> authHistoryExcelVOS = new ArrayList<>();
        userList.forEach(user -> {
            ComEldersAuthHistoryExcelVO authHistoryExcelVO = new ComEldersAuthHistoryExcelVO();
            BeanUtils.copyProperties(user,authHistoryExcelVO);
            authHistoryExcelVOS.add(authHistoryExcelVO);
        });
        return R.ok(authHistoryExcelVOS);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthElderlyMapper.xml

New file
@@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_community.dao.ComEldersAuthElderlyMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="idCard" column="id_card"/>
        <result property="birthday" column="birthday"/>
        <result property="level" column="level"/>
        <result property="domicile" column="domicile"/>
        <result property="communityId" column="community_id"/>
        <result property="isExist" column="is_exist"/>
        <result property="isBigAge" column="is_big_age"/>
        <result property="createAt" column="create_at"/>
        <result property="createBy" column="create_by"/>
        <result property="updateAt" column="update_at"/>
        <result property="updateBy" column="update_by"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,name,id_card,birthday,level,domicile,community_id,is_exist,is_big_age,create_at,create_by,update_at,update_by
    ]]>
    </sql>

    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO"
        parameterType="com.panzhihua.common.model.dtos.community.PageComEldersAuthElderlyDTO">
        SELECT <include refid="columns" />, ROUND(DATEDIFF(CURDATE(), birthday)/365.2422) as age
        FROM com_elders_auth_elderly
        <where>
           <if test="pageComEldersAuthElderlyDTO.id!=null">
                AND id = #{pageComEldersAuthElderlyDTO.id}
            </if>
           <if test="pageComEldersAuthElderlyDTO.name!=null and pageComEldersAuthElderlyDTO.name!=&quot;&quot;">
                AND name like concat(#{pageComEldersAuthElderlyDTO.name},'%')
            </if>
           <if test="pageComEldersAuthElderlyDTO.idCard!=null and pageComEldersAuthElderlyDTO.idCard!=&quot;&quot;">
                AND id_card = #{pageComEldersAuthElderlyDTO.idCard}
            </if>
           <if test="pageComEldersAuthElderlyDTO.birthday!=null and pageComEldersAuthElderlyDTO.idCard!=&quot;&quot;">
                AND birthday = #{pageComEldersAuthElderlyDTO.birthday}
            </if>
           <if test="pageComEldersAuthElderlyDTO.level!=null">
                AND level = #{pageComEldersAuthElderlyDTO.level}
            </if>
           <if test="pageComEldersAuthElderlyDTO.domicile!=null and pageComEldersAuthElderlyDTO.idCard!=&quot;&quot;">
                AND domicile = #{pageComEldersAuthElderlyDTO.domicile}
            </if>
           <if test="pageComEldersAuthElderlyDTO.communityId!=null">
                AND community_id = #{pageComEldersAuthElderlyDTO.communityId}
            </if>
           <if test="pageComEldersAuthElderlyDTO.isExist!=null">
                AND is_exist = #{pageComEldersAuthElderlyDTO.isExist}
            </if>
           <if test="pageComEldersAuthElderlyDTO.isBigAge!=null">
                AND is_big_age = #{pageComEldersAuthElderlyDTO.isBigAge}
            </if>
           <if test="pageComEldersAuthElderlyDTO.createAtBegin!=null  and pageComEldersAuthElderlyDTO.createAtBegin!=&quot;&quot;">
                AND create_at &gt;= #{pageComEldersAuthElderlyDTO.createAtBegin}
           </if>
           <if test="pageComEldersAuthElderlyDTO.createAtEnd!=null and pageComEldersAuthElderlyDTO.createAtEnd!=&quot;&quot;">
                AND create_at &lt;= #{pageComEldersAuthElderlyDTO.createAtEnd}
           </if>
           <if test="pageComEldersAuthElderlyDTO.createBy!=null">
                AND create_by = #{pageComEldersAuthElderlyDTO.createBy}
            </if>
           <if test="pageComEldersAuthElderlyDTO.updateAtBegin!=null and pageComEldersAuthElderlyDTO.updateAtBegin!=&quot;&quot;">
                AND update_at &gt;= #{pageComEldersAuthElderlyDTO.updateAtBegin}
           </if>
           <if test="pageComEldersAuthElderlyDTO.updateAtEnd!=null and pageComEldersAuthElderlyDTO.updateAtEnd!=&quot;&quot;">
                AND update_at &lt;= #{pageComEldersAuthElderlyDTO.updateAtEnd}
           </if>
           <if test="pageComEldersAuthElderlyDTO.updateBy!=null">
                AND update_by = #{pageComEldersAuthElderlyDTO.updateBy}
            </if>
        </where>
        <if test="pageComEldersAuthElderlyDTO.sortColumns!=null">
            ORDER BY ${pageComEldersAuthElderlyDTO.sortColumns} ${pageComEldersAuthElderlyDTO.sortType}
        </if>
    </select>

    <update id="updateEldersAuthElderly" parameterType="com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO">
        update com_elders_auth_elderly
        <set>
            <if test="name !=null">
                name = #{name},
            </if>
            <if test="isExist !=null">
                is_exist = #{isExist},
            </if>
            <if test="isBigAge !=null">
                is_big_age = #{isBigAge},
            </if>
        </set>

        where id = #{id}

    </update>

    <delete id="deleteEldersAuthUserById">
        delete from com_elders_auth_user where big_age_id = #{elderId}
    </delete>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthHistoryRecordMapper.xml

New file
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_community.model.dos.ComEldersAuthHistoryRecordDO">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>
        <result property="name" column="name"/>
        <result property="idCard" column="id_card"/>
        <result property="brithday" column="brithday"/>
        <result property="age" column="age"/>
        <result property="domicile" column="domicile"/>
        <result property="isAuth" column="is_auth"/>
        <result property="createAt" column="create_at"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,user_id,name,id_card,brithday,age,domicile,is_auth,create_at
    ]]>
    </sql>

    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.community.ComEldersAuthHistoryRecordVO"
        parameterType="com.panzhihua.common.model.dtos.community.PageComEldersAuthHistoryRecordDTO">
        SELECT <include refid="columns" />
        FROM com_elders_auth_history_record
        <where>
           <if test="pageComEldersAuthHistoryRecordDTO.id!=null">
                AND id = #{pageComEldersAuthHistoryRecordDTO.id}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.userId!=null">
                AND user_id = #{pageComEldersAuthHistoryRecordDTO.userId}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.name!=null">
                AND name = #{pageComEldersAuthHistoryRecordDTO.name}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.idCard!=null">
                AND id_card = #{pageComEldersAuthHistoryRecordDTO.idCard}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.brithday!=null">
                AND brithday = #{pageComEldersAuthHistoryRecordDTO.brithday}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.age!=null">
                AND age = #{pageComEldersAuthHistoryRecordDTO.age}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.domicile!=null">
                AND domicile = #{pageComEldersAuthHistoryRecordDTO.domicile}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.isAuth!=null">
                AND is_auth = #{pageComEldersAuthHistoryRecordDTO.isAuth}
            </if>
           <if test="pageComEldersAuthHistoryRecordDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageComEldersAuthHistoryRecordDTO.createAtBegin}
           </if>
           <if test="pageComEldersAuthHistoryRecordDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageComEldersAuthHistoryRecordDTO.createAtEnd}
           </if>
        </where>
        <if test="pageComEldersAuthHistoryRecordDTO.sortColumns!=null">
            ORDER BY ${pageComEldersAuthHistoryRecordDTO.sortColumns} ${pageComEldersAuthHistoryRecordDTO.sortType}
        </if>
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthStatisticsMapper.xml

New file
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_community.dao.ComEldersAuthStatisticsMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_community.model.dos.ComEldersAuthStatisticsDO">
        <result property="id" column="id"/>
        <result property="year" column="year"/>
        <result property="month" column="month"/>
        <result property="sum" column="sum"/>
        <result property="authSum" column="auth_sum"/>
        <result property="noAuthSum" column="no_auth_sum"/>
        <result property="createAt" column="create_at"/>
        <result property="communityId" column="community_id"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,year,month,sum,auth_sum,no_auth_sum,create_at,community_id
    ]]>
    </sql>

    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.community.ComEldersAuthHistoryVO"
        parameterType="com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO">
        SELECT <include refid="columns" />
        FROM com_elders_auth_statistics
        <where>
           <if test="pageEldersAuthHistoryDTO.month!=null">
                AND month = #{pageEldersAuthHistoryDTO.month}
            </if>
            <if test="pageEldersAuthHistoryDTO.year!=null">
                AND year = #{pageEldersAuthHistoryDTO.year}
            </if>
            <if test="pageEldersAuthHistoryDTO.communityId!=null">
                AND community_id = #{pageEldersAuthHistoryDTO.communityId}
            </if>
        </where>
        ORDER BY create_at desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEldersAuthUserMapper.xml

New file
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_community.dao.ComEldersAuthUserMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_community.model.dos.ComEldersAuthUserDO">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>
        <result property="relation" column="relation"/>
        <result property="isAuth" column="is_auth"/>
        <result property="name" column="name"/>
        <result property="idCard" column="id_card"/>
        <result property="communityId" column="community_id"/>
        <result property="bigAgeId" column="big_age_id"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,user_id,relation,is_auth,name,id_card,community_id,big_age_id
    ]]>
    </sql>

    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO">
        SELECT
            ceau.id AS elderId,
            ceau.`name`,
            ceau.id_card,
            ceau.relation,
            ceau.is_auth,
            ca.`name` AS communityName,
            ae.is_exist
        FROM
            com_elders_auth_user AS ceau
            LEFT JOIN com_act AS ca ON ca.community_id = ceau.community_id
            LEFT JOIN com_elders_auth_elderly ae ON ceau.big_age_id = ae.id
        where ceau.user_id = #{userId}
            order by ceau.create_at desc
    </select>

    <select id="countCurrentMonthValidAuthRecord" resultType="java.lang.Integer" >
        SELECT COUNT(*)
        FROM  com_elders_auth
        WHERE FAMILY_USER_ID = #{elderId} AND DATE_FORMAT(create_at, '%Y-%m') =  DATE_FORMAT(NOW(), '%Y-%m')  AND  (`type` = 2 OR ( type=1 AND `STATUS` IS NULL) )
    </select>


</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml

New file
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >


<mapper namespace="com.panzhihua.service_community.dao.SysConfMapper">

     <resultMap id="baseResult" type="com.panzhihua.service_community.model.dos.SysConfDO">
        <result property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="code" column="code"/>
        <result property="value" column="value"/>
        <result property="description" column="description"/>
        <result property="createAt" column="create_at"/>
        <result property="createBy" column="create_by"/>
        <result property="communityId" column="community_id"/>
    </resultMap>

    <sql id="columns">
    <![CDATA[
        id,name,code,value,`description`,create_at,create_by,community_id
    ]]>
    </sql>

    <!-- 分页查询 -->
    <select id="findByPage" resultType="com.panzhihua.common.model.vos.community.SysConfVO"
        parameterType="com.panzhihua.common.model.dtos.community.PageSysConfDTO">
        SELECT <include refid="columns" />
        FROM sys_conf
        <where>
           <if test="pageSysConfDTO.id!=null">
                AND id = #{pageSysConfDTO.id}
            </if>
           <if test="pageSysConfDTO.name!=null">
                AND name = #{pageSysConfDTO.name}
            </if>
           <if test="pageSysConfDTO.code!=null">
                AND code = #{pageSysConfDTO.code}
            </if>
           <if test="pageSysConfDTO.value!=null">
                AND value = #{pageSysConfDTO.value}
            </if>
           <if test="pageSysConfDTO.describe!=null">
                AND `describe` = #{pageSysConfDTO.describe}
            </if>
           <if test="pageSysConfDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageSysConfDTO.createAtBegin}
           </if>
           <if test="pageSysConfDTO.createAtEnd!=null">
                AND create_at &lt;= #{pageSysConfDTO.createAtEnd}
           </if>
           <if test="pageSysConfDTO.createBy!=null">
                AND create_by = #{pageSysConfDTO.createBy}
            </if>
           <if test="pageSysConfDTO.communityId!=null">
                AND community_id = #{pageSysConfDTO.communityId}
            </if>
        </where>
        <if test="pageSysConfDTO.sortColumns!=null">
            ORDER BY ${pageSysConfDTO.sortColumns} ${pageSysConfDTO.sortType}
        </if>
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java

@@ -2,6 +2,7 @@

import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
@@ -215,4 +216,13 @@
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    /**
     * 撤销人/社区ID   列: revoke_id
     */
    private Long revokeID;
    /**
     * 修改时间   列: revoke_type
     */
    private Integer revokeType;
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -515,6 +515,8 @@
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
        eventDO.setRevokeID(eventRevokeDTO.getRevokeId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated == 1) {
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
@@ -1262,12 +1264,12 @@
            if (eventDO.getEventCategory() == 1) {
                boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
                if (!canRevoke) {
                    return R.fail("当前事件不是上报状态，不允许标为无效");
                    return R.fail("当前事件不是上报状态，不允许撤销");
                }
            } else if (eventDO.getEventCategory() == 2) {
                boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
                if (!canRevoke) {
                    return R.fail("当前事件不是发布状态，不允许标为无效");
                    return R.fail("当前事件不是发布状态，不允许撤销");
                }
            } else {
                return R.fail("");
@@ -1281,6 +1283,8 @@
        eventDO.setEventStatus(4);//4、撤销
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setRevokeID(eventRevokeDTO.getRevokeId());
        eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated == 1) {
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1, "标为无效", eventRevokeDTO.getCommunityId(), eventRevokeDTO.getCommunityName(), 4);
@@ -1777,15 +1781,15 @@
                    throw new ServiceException("id为" + id + "的事件不存在");
                }
                if (eventDO.getEventCategory() != null) {
                    if (eventDO.getEventCategory() == 1) {
                    if (eventDO.getEventCategory() == 1) {//
                        boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
                        if (!canRevoke) {
                            throw new ServiceException("当前事件不是上报状态，不允许标为无效");
                            throw new ServiceException("当前事件不是上报状态，不允许撤销");
                        }
                    } else if (eventDO.getEventCategory() == 2) {
                    } else if (eventDO.getEventCategory() == 2) {//宣传教育
                        boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
                        if (!canRevoke) {
                            throw new ServiceException("当前事件不是发布状态，不允许标为无效");
                            throw new ServiceException("当前事件不是发布状态，不允许撤销");
                        }
                    } else {
                        throw new ServiceException("事件分类错误");

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -72,6 +72,9 @@
            <if test="pageEventDTO.eventDealStatus!=null">
                AND event_deal_status = #{pageEventDTO.eventDealStatus}
            </if>
            <if test="pageEventDTO.revokeType!=null">
                AND ( revoke_type = #{pageEventDTO.revokeType} OR revoke_type is null )
            </if>
           <if test="pageEventDTO.id!=null">
                AND id = #{pageEventDTO.id}
            </if>
@@ -237,6 +240,10 @@
            e.event_status != 3 AND e.event_category = 2
            <if test="pagePublicityEventDTO.communityId!=null">
                AND egd.grid_community_id = #{pagePublicityEventDTO.communityId}
            </if>

            <if test="pagePublicityEventDTO.revokeType!=null">
                AND ( e.revoke_type = #{pagePublicityEventDTO.revokeType} OR e.revoke_type is null )
            </if>
            <if test="pagePublicityEventDTO.eventDealStatus!=null">
                AND e.event_deal_status = #{pagePublicityEventDTO.eventDealStatus}
@@ -447,6 +454,9 @@
                e.order_sn like concat('%', #{pageEventManageDTO.keyWord},'%')
                )
             </if>
            <if test="pageEventManageDTO.revokeType!=null">
                AND ( e.revoke_type = #{pageEventManageDTO.revokeType} OR e.revoke_type is null )
            </if>
            <if test="pageEventManageDTO.eventDealStatus!=null">
                AND e.event_deal_status = #{pageEventManageDTO.eventDealStatus}
            </if>
@@ -499,6 +509,9 @@
                e.order_sn like concat('%', #{pagePublicityEventCommunityDTO.keyWord},'%')
                )
            </if>
            <if test="pagePublicityEventCommunityDTO.revokeType!=null">
                AND ( e.revoke_type = #{pagePublicityEventCommunityDTO.revokeType} OR e.revoke_type is null )
            </if>
            <if test="pagePublicityEventCommunityDTO.communityId!=null">
                AND egd.grid_community_id = #{pagePublicityEventCommunityDTO.communityId}
            </if>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapperTest.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/GridMemberApi.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -963,5 +963,10 @@
        return userService.gridMemberEditStatus(gridMemberEditDTO);
    }

    @GetMapping("big/no/tip")
    public R noTips(@RequestParam("userId") Long userId){
        return userService.noTips(userId);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java

@@ -191,5 +191,9 @@
     * 网格员上班结束时间
     */
    private Integer workEndTime;
    /**
     * 高龄认证显示提示（1.是 2.否）
     */
    private Integer bigAgeTips;

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -458,4 +458,6 @@
    R deleteMembers(List<Long> Ids);

    R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);

    R noTips(Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -2037,4 +2037,15 @@
        userDao.gridMemberEditStatus(gridMemberEditDTO);
        return R.ok();
    }

    public R noTips(Long userId){
        SysUserDO userDO = this.userDao.selectById(userId);
        if(userDO != null){
            userDO.setBigAgeTips(2);
            if(this.userDao.updateById(userDO) > 0){
                return R.ok();
            }
        }
        return R.fail();
    }
}