From 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期日, 26 九月 2021 14:22:22 +0800 Subject: [PATCH] Merge branch 'test' into 'test_bak' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java | 283 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 211 insertions(+), 72 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java index 19ed7ef..e9600ee 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComElderAuthRecordsServiceImpl.java @@ -1,32 +1,62 @@ package com.panzhihua.service_community.service.impl; -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.google.common.base.Joiner; -import com.panzhihua.common.enums.*; -import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO; -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.utlis.AgeUtils; -import com.panzhihua.common.utlis.DateUtils; -import com.panzhihua.common.utlis.Snowflake; -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.ComElderAuthRecordsService; -import lombok.extern.slf4j.Slf4j; +import static com.panzhihua.common.enums.IdentityApprovalStatusEnum.PASS_THROUGH; +import static com.panzhihua.common.enums.IdentityApprovalStatusEnum.PENDING_REVIEW; +import static com.panzhihua.common.enums.IdentityAuthMethodEnum.FACE_AUTH; +import static com.panzhihua.common.enums.IdentityAuthStatusEnum.CERTIFIED; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import javax.annotation.Resource; + 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 java.util.*; -import java.util.stream.Collectors; +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.model.dtos.community.AddIdentityAuthDTO; +import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO; +import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO; +import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO; +import com.panzhihua.common.model.helper.AESUtil; +import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.model.vos.community.ComElderAuthRecordExcleVO; +import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO; +import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportMistakeExcelVO; +import com.panzhihua.common.model.vos.community.ComElderAuthRecordStatisticExcleVO; +import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO; +import com.panzhihua.common.utlis.AgeUtils; +import com.panzhihua.common.utlis.DateUtils; +import com.panzhihua.common.utlis.Snowflake; +import com.panzhihua.common.utlis.StringUtils; +import com.panzhihua.common.utlis.WxUtil; +import com.panzhihua.common.utlis.WxXCXTempSend; +import com.panzhihua.service_community.dao.ComActActSignDAO; +import com.panzhihua.service_community.dao.ComActDAO; +import com.panzhihua.service_community.dao.ComElderAuthElderliesDAO; +import com.panzhihua.service_community.dao.ComElderAuthRecordsDAO; +import com.panzhihua.service_community.dao.ComEldersAuthStatisticsMapper; +import com.panzhihua.service_community.dao.ComMngPopulationDAO; +import com.panzhihua.service_community.model.dos.ComActDO; +import com.panzhihua.service_community.model.dos.ComElderAuthElderliesDO; +import com.panzhihua.service_community.model.dos.ComElderAuthRecordsDO; +import com.panzhihua.service_community.model.dos.ComEldersAuthStatisticsDO; +import com.panzhihua.service_community.model.dos.ComMngPopulationDO; +import com.panzhihua.service_community.service.ComElderAuthRecordsService; + +import cn.hutool.core.util.IdcardUtil; +import lombok.extern.slf4j.Slf4j; /** * title: ComElderAuthRecordsServiceImpl 社区政务》高龄老人认证》认证记录表服务实现类 @@ -52,6 +82,8 @@ private ComActDAO comActDAO; @Resource private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper; + @Resource + private ComActActSignDAO comActActSignDAO; @Value("${domain.aesKey:}") private String aesKey; @@ -82,6 +114,7 @@ @Override public R detailElderAuthRecords(Long authRecordId) { ComElderAuthRecordVO comElderAuthRecordVO = comElderAuthRecordsDAO.detailElderAuthRecords(authRecordId); + comElderAuthRecordVO.setNextIds(comElderAuthRecordsDAO.getNextIds(comElderAuthRecordVO.getCommunityId(),authRecordId)); return R.ok(comElderAuthRecordVO); } @@ -91,9 +124,22 @@ if (comElderAuthRecordsDO == null) { return R.fail("未查询到高龄老人认证记录"); } + if(!comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)){ + return R.fail("该记录已审核,不可重复审核"); + } + ComElderAuthElderliesDO authElderliesDO = comElderAuthElderliesDAO.selectById(comElderAuthRecordsDO.getElderliesId()); + if(authElderliesDO == null){ + return R.fail("未查询到老人信息"); + } + + Date nowDate = new Date(); BeanUtils.copyProperties(comElderAuthRecordVO, comElderAuthRecordsDO); - if (comElderAuthRecordVO.getApprovalStatus().equals(3)) { - comElderAuthRecordsDO.setAuthStatus(1); + comElderAuthRecordsDO.setApprovalDate(nowDate); + if (comElderAuthRecordVO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) { + comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz); + sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", "认证成功!"); + } else { + sendAuthSubscribe(comElderAuthRecordsDO.getSubmitUserId(), "高龄认证", comElderAuthRecordVO.getRejectReason()); } comElderAuthRecordsDO.setApprovalDate(new Date()); int nub = comElderAuthRecordsDAO.updateById(comElderAuthRecordsDO); @@ -101,6 +147,23 @@ return R.fail("审核失败"); } return R.ok(); + } + + private void sendAuthSubscribe(Long userId, String name, String result) { + //发送订阅通知 + Map<String, String> map = comActActSignDAO.getUserOpenId(userId); + if (map != null) { + String openid = map.get("openid"); + try { + WxXCXTempSend util = new WxXCXTempSend(); + String accessToken = util.getAppAccessToken(); + WxUtil.sendSubscribeRZSH(openid, accessToken, name, + DateUtils.format(new Date(), DateUtils.ymdhms_format), + result); + } catch (Exception e) { + log.error("推送审核状态订阅消息失败,失败原因:" + e.getMessage()); + } + } } @Override @@ -138,6 +201,7 @@ // 需要修改的认证记录集合 List<ComElderAuthRecordsDO> updateList = new ArrayList<>(); log.info("开始处理导入数据"); + List<ComElderAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>(); try { // 查询所有人口数据放入HashMap中 @@ -147,9 +211,8 @@ String key = population.getCardNo(); populationMap.put(key, population); }); - + Date nowDate = new Date(); for (ComElderAuthRecordImportExcelVO vo : list) { - String cardNoAES = AESUtil.encrypt128(vo.getIdCard(), aesKey); // 判断实有人口是否已存在 log.info("开始查询实有人口是否已存在"); ComMngPopulationDO populationDO = null; @@ -163,57 +226,48 @@ if (null == comElderAuthElderliesDO) { ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); - setMistake(mistake, vo); - mistake.setMistake("该实有人口已存在,但本社区不存在高龄信息,请先导入高龄人口"); + mistake.setMistake("该实有人口已存在,但本社区不存在高龄老人信息,请先导入高龄老人"); + mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else { //存在高龄信息,判断是否满足认证条件 if (StringUtils.isNotEmpty(vo.getBirthday())) { - int age = AgeUtils.getAgeFromBirthTimes(vo.getBirthday()); + int age = IdcardUtil.getAgeByIdCard(vo.getIdCard()); if (age < 80 || !comElderAuthElderliesDO.getIsRegister().equals(1) || !comElderAuthElderliesDO.getIsAlive().equals(1)) { ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); - setMistake(mistake, vo); mistake.setMistake("该人口未满80岁,或者不健在,或者未做高龄老人登记"); + mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); }else { + //满足认证条件,判断是否存在当期认证记录 + List<ComElderAuthRecordsDO> elderAuthRecordList = null; ComElderAuthRecordsDO comElderAuthRecordsDO = null; - Date nowDate = new Date(); - // 获取当前年 - int year = DateUtils.getYear(nowDate); - // 获取当前月 - int month = DateUtils.getMonth(nowDate) + 1; - String authPeriod = ""; - if (month < 10) { - authPeriod = String.valueOf(year) + "0" + String.valueOf(month); - }else { - authPeriod = String.valueOf(year) + String.valueOf(month); - } - comElderAuthRecordsDO = comElderAuthRecordsDAO.selectOne(new QueryWrapper<ComElderAuthRecordsDO>().lambda(). - eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()).eq(ComElderAuthRecordsDO::getAuthPeriod, authPeriod)); - if (null != comElderAuthRecordsDO) { + String authPeriod = vo.getAuthPeriod(); + elderAuthRecordList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda() + .eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId()) + .eq(ComElderAuthRecordsDO::getAuthPeriod, authPeriod).orderByDesc(ComElderAuthRecordsDO::getCreateAt)); + if (null != elderAuthRecordList && elderAuthRecordList.size() > 0) { + comElderAuthRecordsDO = elderAuthRecordList.get(0); //存在记录且状态为已认证,不能修改 - if (comElderAuthRecordsDO.getAuthStatus().equals(1)) { + if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)) { ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); - setMistake(mistake, vo); - mistake.setMistake("该人口本期已认证,不能修改"); + mistake.setMistake("该人口本期已认证通过,不能重复认证"); + mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); + }else if (comElderAuthRecordsDO.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.dsh)) { + comElderAuthRecordsDO = updateElderAuthRecordsDO(vo, comElderAuthRecordsDO,userId,communityId,nowDate); + updateList.add(comElderAuthRecordsDO); }else { - //存在记录,执行修改 - ComElderAuthRecordsDO comElderAuthRecordsDO1 = - updateElderAuthRecordsDO(vo, comElderAuthRecordsDO, userId); - updateList.add(comElderAuthRecordsDO1); - ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); - BeanUtils.copyProperties(vo, mistake); - setMistake(mistake, vo); - mistake.setMistake("该认证已存在,执行更新"); - mistakes.add(mistake); + // 驳回状态,则新增 + comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate); + saveList.add(comElderAuthRecordsDO); } }else { // 不存在记录,则新增 - comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId); + comElderAuthRecordsDO = saveElderAuthRecordsDO(vo, comElderAuthElderliesDO, authPeriod, userId,communityId,nowDate); saveList.add(comElderAuthRecordsDO); } } @@ -223,8 +277,8 @@ // 不存在实有人口,则新增 ComElderAuthRecordImportMistakeExcelVO mistake = new ComElderAuthRecordImportMistakeExcelVO(); BeanUtils.copyProperties(vo, mistake); - setMistake(mistake, vo); mistake.setMistake("不存在该实有人口,请先导入实有人口信息"); + mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format)); mistakes.add(mistake); } log.info("开始查询实有人口是否已存在完成"); @@ -255,7 +309,7 @@ } @Override - public R exportElderAuthRecordsStatistic(PageElderAuthRecordsDTO pageElderAuthRecordsDTO) { + public R exportElderAuthRecordsStatistic(PageElderAuthStatisticDTO pageElderAuthRecordsDTO) { List<ComElderAuthRecordStatisticExcleVO> comElderAuthRecordStatisticExcleVOS = comElderAuthRecordsDAO.exportElderAuthRecordsStatistic(pageElderAuthRecordsDTO); if (null != comElderAuthRecordStatisticExcleVOS && comElderAuthRecordStatisticExcleVOS.size() > 0) { comElderAuthRecordStatisticExcleVOS.forEach(comElderAuthRecordStatisticExcleVO -> { @@ -307,17 +361,22 @@ return R.ok(); } - private ComElderAuthRecordsDO updateElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo, ComElderAuthRecordsDO comElderAuthRecordsDO, Long userId) { + private ComElderAuthRecordsDO updateElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo + , ComElderAuthRecordsDO comElderAuthRecordsDO, Long userId, Long communityId,Date date) { BeanUtils.copyProperties(vo, comElderAuthRecordsDO); comElderAuthRecordsDO.setSubmitUserId(userId); comElderAuthRecordsDO.setApproverId(userId); - comElderAuthRecordsDO.setApprovalStatus(3); - comElderAuthRecordsDO.setApprovalDate(new Date()); - comElderAuthRecordsDO.setAuthStatus(1); + comElderAuthRecordsDO.setCommunityId(communityId); + comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg); + comElderAuthRecordsDO.setApprovalDate(date); + comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz); + comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz); + comElderAuthRecordsDO.setMark(vo.getMark()); return comElderAuthRecordsDO; } - private ComElderAuthRecordsDO saveElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo, ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId) { + private ComElderAuthRecordsDO saveElderAuthRecordsDO(ComElderAuthRecordImportExcelVO vo + , ComElderAuthElderliesDO comElderAuthElderliesDO, String authPeriod, Long userId, Long communityId,Date date) { ComElderAuthRecordsDO comElderAuthRecordsDO = new ComElderAuthRecordsDO(); BeanUtils.copyProperties(vo, comElderAuthRecordsDO); comElderAuthRecordsDO.setId(Snowflake.getId()); @@ -325,17 +384,15 @@ comElderAuthRecordsDO.setAuthPeriod(authPeriod); comElderAuthRecordsDO.setSubmitUserId(userId); comElderAuthRecordsDO.setApproverId(userId); - comElderAuthRecordsDO.setApprovalStatus(3); - comElderAuthRecordsDO.setApprovalDate(new Date()); - comElderAuthRecordsDO.setAuthStatus(1); + comElderAuthRecordsDO.setApprovalStatus(ComElderAuthRecordsDO.approvalStatus.tg); + comElderAuthRecordsDO.setApprovalDate(date); + comElderAuthRecordsDO.setAuthStatus(ComElderAuthRecordsDO.authStatus.yrz); + comElderAuthRecordsDO.setCommunityId(communityId); + comElderAuthRecordsDO.setAuthMethod(ComElderAuthRecordsDO.authMethod.xxrz); + comElderAuthRecordsDO.setMark(vo.getMark()); + comElderAuthRecordsDO.setCreateAt(date); return comElderAuthRecordsDO; } - - private void setMistake(ComElderAuthRecordImportMistakeExcelVO mvo, - ComElderAuthRecordImportExcelVO vo) { - mvo.setIsAlive(PopulHouseUseEnum.getCnDescByName(vo.getIsAlive())); - } - /** * 判重方法 @@ -350,4 +407,86 @@ return ObjectUtils.isEmpty(hashMap.get(key)); } + /** + * 新增高龄认证 + * @param addIdentityAuthDTO 请求参数 + * @return 新增结果 + */ + @Override + public R addElderAuth(AddIdentityAuthDTO addIdentityAuthDTO) { + String idCard; + try { + idCard = AESUtil.encrypt128(addIdentityAuthDTO.getIdCard(), aesKey); + } catch (Exception e) { + e.printStackTrace(); + log.error("加密失败【{}】", e.getMessage()); + return R.fail("认证失败,请重新尝试"); + } + ComElderAuthElderliesDO comElderAuthElderliesDO = comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>() + .lambda().eq(ComElderAuthElderliesDO::getIdCard, idCard).eq(ComElderAuthElderliesDO::getCommunityId, addIdentityAuthDTO.getCommunityId())); + if (Objects.isNull(comElderAuthElderliesDO)) { + return R.fail("该人员未在社区报道无法认证"); + } + boolean isInfoCorrect = !comElderAuthElderliesDO.getName().equals(addIdentityAuthDTO.getName()) || + !(comElderAuthElderliesDO.getIsRegister().equals(1) && comElderAuthElderliesDO.getIsAlive().equals(1)); + if (isInfoCorrect) { + return R.fail("信息有误,请检查!"); + } + Date dateNow = new Date(); + String currentAuthPeriod = new SimpleDateFormat("yyyyMM").format(dateNow); + List<ComElderAuthRecordsDO> currentAuthPeriodRecords = comElderAuthRecordsDAO + .selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda() + .eq(ComElderAuthRecordsDO::getAuthPeriod, currentAuthPeriod) + .eq(ComElderAuthRecordsDO::getElderliesId, comElderAuthElderliesDO.getId())); + if (!currentAuthPeriodRecords.isEmpty()) { + boolean alreadyAuth = currentAuthPeriodRecords.stream() + .filter(record -> record.getAuthStatus().equals(CERTIFIED.getStatus())).findFirst().isPresent(); + if (alreadyAuth) { + return R.fail(String.format("该人员%s期已认证无需重复认证", currentAuthPeriod)); + } + boolean isPendingReview = currentAuthPeriodRecords.stream() + .filter(record -> record.getApprovalStatus().intValue() == PENDING_REVIEW.getStatus()).findFirst().isPresent(); + if (isPendingReview) { + return R.fail("该人员本期有尚未审核的认证,请稍后再试!"); + } + } + ComElderAuthRecordsDO comElderAuthRecordsDO = new ComElderAuthRecordsDO(); + BeanUtils.copyProperties(addIdentityAuthDTO, comElderAuthRecordsDO); + comElderAuthRecordsDO.setElderliesId(comElderAuthElderliesDO.getId()); + comElderAuthRecordsDO.setAuthDate(dateNow); + comElderAuthRecordsDO.setAuthPeriod(currentAuthPeriod); + if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) { + comElderAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus()); + comElderAuthRecordsDO.setApprovalDate(dateNow); + comElderAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus()); + } + if (this.baseMapper.insert(comElderAuthRecordsDO) < 0) { + return R.fail("认证失败,请重新尝试"); + } + if (addIdentityAuthDTO.getAuthMethod().intValue() == FACE_AUTH.getMethod()) { + sendAuthSubscribe(addIdentityAuthDTO.getSubmitUserId(), "高龄认证", "认证成功!"); + } + return R.ok(); + } + + /** + * 分页查询高龄认证记录 + * @param pageIdentityAuthRecordDTO 高龄认证记录vo + * @return 高龄认证记录列表 + */ + @Override + public R queryRecordWithPage(PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO) { + return R.ok(comElderAuthRecordsDAO.queryRecordWithPage(new Page(pageIdentityAuthRecordDTO.getPageNum(), + pageIdentityAuthRecordDTO.getPageSize()), pageIdentityAuthRecordDTO)); + } + + /** + * 获取高龄认证详情 + * @param identityAuthId 认证id + * @return 认证记录详情 + */ + @Override + public R retrieveElderAuthDetail(Long identityAuthId) { + return R.ok(comElderAuthRecordsDAO.findById(identityAuthId)); + } } -- Gitblit v1.7.1