From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java | 78 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
index 9a9cef8..2fb3c82 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.elders.ComEldersAuthHistoryVO;
+import com.panzhihua.common.model.vos.elders.ComEldersAuthStatisticVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -71,6 +72,12 @@
private ComElderAuthRecordsDAO comElderAuthRecordsDAO;
@Resource
private ComElderAuthElderliesDAO comElderAuthElderliesDAO;
+ @Resource
+ private ComPensionAuthHistoryRecordMapper comPensionAuthHistoryRecordMapper;
+ @Resource
+ private ComPensionAuthRecordDAO comPensionAuthRecordDAO;
+ @Resource
+ private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -495,7 +502,7 @@
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));
+ .eq(SysConfDO::getCode, "ELDER_AUTH_TYPE_" + communityId).orderByDesc(SysConfDO::getCreateAt));
if (authConf != null && authConf.size() > 0) {
SysConfDO first = authConf.get(0);
first.setValue(type + "");
@@ -565,7 +572,7 @@
}
/**
- * 检测本月所有认证记录，认证成功记录更新到历史记录中
+ * 身份认证定时任务
* @return 执行结果
*/
@Override
@@ -573,51 +580,48 @@
public R timedTaskEldersRecordAuthJobHandler(){
Date nowDate = new Date();
- String authPeriod = DateUtils.getCurrentDateString_YYYY_MM();
+ //高龄认证本期期数
+ String elderAuthPeriod = DateUtils.getCurrentDateString_YYYY_MM();
+ //养老认证本期期数
+ String pensionAuthPeriod = DateUtils.getCurrentDateString_YYYY();
+
//查询所有老人信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
- List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.selectList(new QueryWrapper<>());
+ List<ComElderAuthElderliesDO> authElderliesList = comElderAuthElderliesDAO.getAuthElderLiesList();
authElderliesList.forEach(authElderlies -> {
+ //查询高龄认证记录
ComEldersAuthHistoryRecordDO authHistoryRecordDO = comEldersAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
.eq(ComEldersAuthHistoryRecordDO::getElderliesId,authElderlies.getId())
- .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,authPeriod));
+ .eq(ComEldersAuthHistoryRecordDO::getAuthPeriod,elderAuthPeriod));
if(authHistoryRecordDO == null){
authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
BeanUtils.copyProperties(authElderlies,authHistoryRecordDO);
authHistoryRecordDO.setIsAuth(ComEldersAuthHistoryRecordDO.isAuth.no);
authHistoryRecordDO.setElderliesId(authElderlies.getId());
- authHistoryRecordDO.setAuthPeriod(authPeriod);
+ authHistoryRecordDO.setAuthPeriod(elderAuthPeriod);
authHistoryRecordDO.setCreateAt(nowDate);
+ authHistoryRecordDO.setBrithday(IdcardUtil.getBirthByIdCard(authElderlies.getIdCard()));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(authElderlies.getIdCard()));
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);
- }
+ //查询所有养老人员信息并加入到老人认证历史记录表中，如果不存在则新增，存在则不做操作
+ List<ComPensionAuthPensionerDO> pensionAuthPensionerList = comPensionAuthPensionerDAO.getAuthPensionList();
+ pensionAuthPensionerList.forEach(authPension -> {
+ //查询养老认证记录
+ ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()
+ .eq(ComPensionAuthHistoryRecordDO::getElderliesId,authPension.getId())
+ .eq(ComPensionAuthHistoryRecordDO::getAuthPeriod,pensionAuthPeriod));
+ if(pensionAuthDO == null){
+ pensionAuthDO = new ComPensionAuthHistoryRecordDO();
+ BeanUtils.copyProperties(authPension,pensionAuthDO);
+ pensionAuthDO.setIsAuth(ComPensionAuthHistoryRecordDO.isAuth.no);
+ pensionAuthDO.setElderliesId(authPension.getId());
+ pensionAuthDO.setAuthPeriod(pensionAuthPeriod);
+ pensionAuthDO.setCreateAt(nowDate);
+ pensionAuthDO.setBrithday(IdcardUtil.getBirthByIdCard(authPension.getIdCard()));
+ pensionAuthDO.setAge(IdcardUtil.getAgeByIdCard(authPension.getIdCard()));
+ comPensionAuthHistoryRecordMapper.insert(pensionAuthDO);
}
});
return R.ok();
@@ -676,7 +680,13 @@
*/
@Override
public R pageAuthStatisticAdmin(PageElderAuthStatisticDTO pageElderAuthStatisticDTO){
- return R.ok(comEldersAuthHistoryRecordMapper.pageAuthStatisticAdmin(new Page(pageElderAuthStatisticDTO.getPageNum(),pageElderAuthStatisticDTO.getPageSize()),pageElderAuthStatisticDTO));
+ IPage<ComEldersAuthStatisticVO> authStatisticPage = comEldersAuthHistoryRecordMapper.pageAuthStatisticAdmin(
+ new Page(pageElderAuthStatisticDTO.getPageNum(),pageElderAuthStatisticDTO.getPageSize()),pageElderAuthStatisticDTO);
+ authStatisticPage.getRecords().forEach(authStatistic -> {
+ authStatistic.setAge(IdcardUtil.getAgeByIdCard(authStatistic.getIdCard()));
+ authStatistic.setBirthday(IdcardUtil.getBirth(authStatistic.getIdCard()));
+ });
+ return R.ok(authStatisticPage);
}
/**
--
Gitblit v1.7.1