huanghongfa
2021-09-22 90054e58d4a11bc7d735f567d18cdbdd503911ce
身份认证缺失接口开发
2个文件已修改
82 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -25,6 +25,7 @@
    public static SimpleDateFormat format_yyymmdd = new SimpleDateFormat("yyyyMMdd");
    private static DateTimeFormatter format_ymdhmssss = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
    private static DateTimeFormatter format_ymds = DateTimeFormatter.ofPattern("yyyyMMdd");
    private static DateTimeFormatter format_yms = DateTimeFormatter.ofPattern("yyyyMM");
    /**
     * 将日期对象格式化成指定的字符串格式
@@ -891,4 +892,13 @@
        // System.out.println(getFirstDayOfMonthString());
        // System.out.println(getDayOfMonthString());
    }
    /**
     * 获取当前年月字符串
     * @return  年月字符串
     */
    public static String getCurrentDateString_YYYY_MM() {
        String nowtime = getCurrentDate().format(format_yms);
        return nowtime;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -67,6 +67,10 @@
    private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComElderAuthRecordsDAO comElderAuthRecordsDAO;
    @Resource
    private ComElderAuthElderliesDAO comElderAuthElderliesDAO;
    @Value("${domain.aesKey:}")
    private String aesKey;
@@ -561,40 +565,60 @@
    }
    /**
     * 检测上月所有视频认证记录,取最后一条记录为认证成功记录
     * 检测本月所有认证记录,认证成功记录更新到历史记录中
     * @return  执行结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R timedTaskEldersRecordAuthJobHandler(){
        Date nowDate = new Date();
        //查询所有启用中社区
        List<ComActDO> actList = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState,0));
        actList.forEach(act -> {
            //查询社区上月所有视频认证
            List<ComEldersAuthHistoryVO> authList = eldersAuthDAO.getEldersAuthRecords(act.getCommunityId());
            authList.forEach(auth -> {
                if(auth.getUserId() != null){
                    ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                    authHistoryRecordDO.setCommunityId(auth.getCommunityId());
                    authHistoryRecordDO.setCreateAt(auth.getCreateAt());
                    authHistoryRecordDO.setAuthId(auth.getId());
                    authHistoryRecordDO.setUserId(auth.getUserId());
                    authHistoryRecordDO.setBrithday(auth.getBirthday());
                    authHistoryRecordDO.setDomicile(auth.getDomicile());
                    authHistoryRecordDO.setIdCard(auth.getIdCard());
                    authHistoryRecordDO.setName(auth.getName());
                    authHistoryRecordDO.setIsAuth(1);
                    try {
                        Integer age = IdcardUtil.getAgeByIdCard(auth.getIdCard());
                        authHistoryRecordDO.setAge(age);
                    }catch (Exception e){
                        log.error("年龄转换失败");
        String authPeriod = DateUtils.getCurrentDateString_YYYY_MM();
        //查询所有老人信息并加入到老人认证历史记录表中,如果不存在则新增,存在则不做操作
        List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>());
        authElderliesList.forEach(authElderlies -> {
            ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
                    .eq(ComEldersAuthHistoryRecordDO::getElderliesId,authElderlies.getId())
                    .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authPeriod));
            if(authHistoryRecordDO == null){
                authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                BeanUtils.copyProperties(authElderlies,authHistoryRecordDO);
                authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.no);
                authHistoryRecordDO.setElderliesId(authElderlies.getId());
                authHistoryRecordDO.setAuthPeriod(authPeriod);
                authHistoryRecordDO.setCreateAt(nowDate);
                comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
            }
        });
        List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda()
                .ge(ComElderAuthRecordsDO::getCreateAt,DateUtils.getFirstDayOfMonth()));
        //遍历认证记录列表
        authRecordsList.forEach(authRecords -> {
            if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){
                ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
                        .eq(ComEldersAuthHistoryRecordDO::getElderliesId,authRecords.getElderliesId())
                        .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authRecords.getAuthPeriod()));
                if(authHistoryRecordDO != null){//存在记录
                    if(authHistoryRecordDO.getIsAuth().equals(ComEldersAuthHistoryRecordDO.isAuth.no)){
                        authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
                        authHistoryRecordDO.setAuthDate(authRecords.getApprovalDate());
                        authHistoryRecordDO.setApprovalDate(authRecords.getApprovalDate());
                        authHistoryRecordDO.setApproverId(authRecords.getApproverId());
                        authHistoryRecordDO.setSubmitUserId(authRecords.getSubmitUserId());
                        authHistoryRecordDO.setAuthMethod(authRecords.getAuthMethod());
                        authHistoryRecordDO.setVerificationResult(authRecords.getVerificationResult());
                        authHistoryRecordDO.setAuthId(authRecords.getId());
                        comEldersAuthHistoryRecordMapper.updateById(authHistoryRecordDO);
                    }
                }else{
                    authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
                    BeanUtils.copyProperties(authRecords,authHistoryRecordDO);
                    authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.yes);
                    authHistoryRecordDO.setAuthId(authRecords.getId());
                    comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
                }
            });
            }
        });
        return R.ok();
    }