From 59fd2e5033cbaa182f949e707735178b2234c4cd Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 10 九月 2021 10:47:22 +0800
Subject: [PATCH] 身份认证
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index aadb356..54b40b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -63,6 +63,7 @@
import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* 实有人口Service实现类
@@ -126,6 +127,8 @@
private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
@Resource
private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;
+ @Resource
+ private ComPensionAuthStatisticsDAO comPensionAuthStatisticsDAO;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -196,7 +199,7 @@
* @return 实有人口详情
*/
@Override
- public R detailPopulation(Long populationId) {
+ public R detailPopulation(Long populationId, Long communityId) {
ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
return R.fail("用户信息不存在");
@@ -237,7 +240,8 @@
// 设置特殊群体标签
ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
comMngPopulationCommunityTagsDAO.selectOne(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda()
- .eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId));
+ .eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId)
+ .eq(ComMngPopulationCommunityTagsDO::getCommunityId, communityId));
if (null != comMngPopulationCommunityTagsDO) {
comMngPopulationVO.setLabel(comMngPopulationCommunityTagsDO.getLabel());
}
@@ -275,7 +279,8 @@
// 吸毒信息
List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(
- new QueryWrapper<ComDrugPopulationDO>().lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
+ new QueryWrapper<ComDrugPopulationDO>().lambda().eq(ComDrugPopulationDO::getPopulationId, populationId)
+ .eq(ComDrugPopulationDO::getCommunityId, communityId));
if (!comDrugPopulationDOs.isEmpty()) {
comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
@@ -289,7 +294,8 @@
List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
List<ComCorrectPopulationDO> comCorrectPopulationDOS =
comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().lambda()
- .eq(ComCorrectPopulationDO::getPopulationId, populationId));
+ .eq(ComCorrectPopulationDO::getPopulationId, populationId)
+ .eq(ComCorrectPopulationDO::getCommunityId, communityId));
if (!comCorrectPopulationDOS.isEmpty()) {
comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
@@ -302,7 +308,8 @@
// 精神障碍信息
List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(
- new QueryWrapper<ComMajorPopulationDO>().lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
+ new QueryWrapper<ComMajorPopulationDO>().lambda().eq(ComMajorPopulationDO::getPopulationId, populationId)
+ .eq(ComMajorPopulationDO::getCommunityId, communityId));
if (!comMajorPopulationDOs.isEmpty()) {
comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
@@ -315,7 +322,8 @@
// 邪教信息
List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(
- new QueryWrapper<ComCultPopulationDO>().lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
+ new QueryWrapper<ComCultPopulationDO>().lambda().eq(ComCultPopulationDO::getPopulationId, populationId)
+ .eq(ComCultPopulationDO::getCommunityId, communityId));
if (!comCultPopulationDOS.isEmpty()) {
comCultPopulationDOS.forEach(comCultPopulationDO -> {
ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
@@ -329,7 +337,8 @@
List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS =
comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().lambda()
- .eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
+ .eq(ComRehabilitationPopulationDO::getPopulationId, populationId)
+ .eq(ComRehabilitationPopulationDO::getCommunityId, communityId));
if (!comRehabilitationPopulationDOS.isEmpty()) {
comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
@@ -342,7 +351,8 @@
// 上访信息
List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(
- new QueryWrapper<ComKeyPopulationDO>().lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
+ new QueryWrapper<ComKeyPopulationDO>().lambda().eq(ComKeyPopulationDO::getPopulationId, populationId)
+ .eq(ComKeyPopulationDO::getCommunityId, communityId));
if (!comKeyPopulationDOS.isEmpty()) {
comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
@@ -356,7 +366,8 @@
List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
List<ComVeteransPopulationDO> comVeteransPopulationDOS =
comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().lambda()
- .eq(ComVeteransPopulationDO::getPopulationId, populationId));
+ .eq(ComVeteransPopulationDO::getPopulationId, populationId)
+ .eq(ComVeteransPopulationDO::getCommunityId, communityId));
if (!comVeteransPopulationDOS.isEmpty()) {
comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
@@ -370,7 +381,8 @@
List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
List<ComDisabilityPopulationDO> comDisabilityPopulationDOS =
comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().lambda()
- .eq(ComDisabilityPopulationDO::getPopulationId, populationId));
+ .eq(ComDisabilityPopulationDO::getPopulationId, populationId)
+ .eq(ComDisabilityPopulationDO::getCommunityId, communityId));
if (!comDisabilityPopulationDOS.isEmpty()) {
comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
@@ -384,7 +396,8 @@
List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS =
comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().lambda()
- .eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
+ .eq(ComLowSecurityPopulationDO::getPopulationId, populationId)
+ .eq(ComLowSecurityPopulationDO::getCommunityId, communityId));
if (!comLowSecurityPopulationDOS.isEmpty()) {
comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
@@ -398,7 +411,8 @@
List<ComElderAuthElderliesVO> comElderAuthElderliesVOList = new ArrayList<>();
List<ComElderAuthElderliesDO> comElderAuthElderliesDOS =
comElderAuthElderliesDAO.selectList(new QueryWrapper<ComElderAuthElderliesDO>().lambda()
- .eq(ComElderAuthElderliesDO::getPopulationId, populationId));
+ .eq(ComElderAuthElderliesDO::getPopulationId, populationId)
+ .eq(ComElderAuthElderliesDO::getCommunityId, communityId));
if (!comElderAuthElderliesDOS.isEmpty()) {
comElderAuthElderliesDOS.forEach(comElderAuthElderliesDO -> {
ComElderAuthElderliesVO comElderAuthElderliesVO = new ComElderAuthElderliesVO();
@@ -412,7 +426,8 @@
List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList = new ArrayList<>();
List<ComPensionAuthPensionerDO> comPensionAuthPensionerDOS =
comPensionAuthPensionerDAO.selectList(new QueryWrapper<ComPensionAuthPensionerDO>().lambda()
- .eq(ComPensionAuthPensionerDO::getPopulationId, populationId));
+ .eq(ComPensionAuthPensionerDO::getPopulationId, populationId)
+ .eq(ComPensionAuthPensionerDO::getCommunityId, communityId));
if (!comPensionAuthPensionerDOS.isEmpty()) {
comPensionAuthPensionerDOS.forEach(comPensionAuthPensionerDO -> {
ComPensionAuthPensionerVO comPensionAuthPensionerVO = new ComPensionAuthPensionerVO();
@@ -4150,8 +4165,7 @@
// 查询当前社区标签列表
List<String> labelList = new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
- .selectList(null);
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(null);
if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
.collect(Collectors.toList());
@@ -4890,11 +4904,11 @@
}
if (!comElderAuthElderliesDO.getIsAlive().equals(1) || !comElderAuthElderliesDO.getIsRegister().equals(1)) {
if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) {
- Calendar calendar = Calendar.getInstance();
+ Date nowDate = new Date();
// 获取当前年
- int year = calendar.get(Calendar.YEAR);
+ int year = DateUtils.getYear(nowDate);
// 获取当前月
- int month = calendar.get(Calendar.MONTH) + 1;
+ int month = DateUtils.getMonth(nowDate) + 1;
ComEldersAuthStatisticsDO comEldersAuthStatisticsDO = comEldersAuthStatisticsMapper.selectOne(new QueryWrapper<ComEldersAuthStatisticsDO>()
.lambda().eq(ComEldersAuthStatisticsDO::getCommunityId, communityId).eq(ComEldersAuthStatisticsDO::getYear, year).eq(ComEldersAuthStatisticsDO::getMonth, month));
comEldersAuthStatisticsDO.setSum(comEldersAuthStatisticsDO.getSum() + 1);
@@ -4922,11 +4936,11 @@
}
}
if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) {
- Calendar calendar = Calendar.getInstance();
+ Date nowDate = new Date();
// 获取当前年
- int year = calendar.get(Calendar.YEAR);
+ int year = DateUtils.getYear(nowDate);
// 获取当前月
- int month = calendar.get(Calendar.MONTH) + 1;
+ int month = DateUtils.getMonth(nowDate) + 1;
ComEldersAuthStatisticsDO comEldersAuthStatisticsDO = comEldersAuthStatisticsMapper.selectOne(new QueryWrapper<ComEldersAuthStatisticsDO>()
.lambda().eq(ComEldersAuthStatisticsDO::getCommunityId, communityId).eq(ComEldersAuthStatisticsDO::getYear, year).eq(ComEldersAuthStatisticsDO::getMonth, month));
comEldersAuthStatisticsDO.setSum(comEldersAuthStatisticsDO.getSum() + 1);
@@ -4942,7 +4956,8 @@
BeanUtils.copyProperties(vo, populationDO);
ComPensionAuthPensionerDO comPensionAuthPensionerDO =
comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda()
- .eq(ComPensionAuthPensionerDO::getPopulationId, populationDO.getId()));
+ .eq(ComPensionAuthPensionerDO::getPopulationId, populationDO.getId())
+ .eq(ComPensionAuthPensionerDO::getCommunityId, communityId));
// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
// userTagStr.split("\\(")[0]).collect(Collectors.toList());
// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -4966,6 +4981,23 @@
BeanUtils.copyProperties(vo, comPensionAuthPensionerDO);
comPensionAuthPensionerDO.setIdCard(cardNoAES);
comPensionAuthPensionerDO.setAddress(vo.getNowAddress());
+ if (!comPensionAuthPensionerDO.getIsAlive().equals(1) || !comPensionAuthPensionerDO.getIsRegister().equals(1)) {
+ if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) {
+ Date nowDate = new Date();
+ // 获取当前年
+ int year = (DateUtils.getYear(nowDate));
+ ComPensionAuthStatisticsDO comPensionAuthStatisticsDO = comPensionAuthStatisticsDAO.selectOne(new QueryWrapper<ComPensionAuthStatisticsDO>()
+ .lambda().eq(ComPensionAuthStatisticsDO::getCommunityId, communityId)
+ .eq(ComPensionAuthStatisticsDO::getYear, year));
+ if(null == comPensionAuthStatisticsDO){
+ comPensionAuthStatisticsDO = comPensionAuthStatisticsDAO.selectOne(new QueryWrapper<ComPensionAuthStatisticsDO>()
+ .lambda().eq(ComPensionAuthStatisticsDO::getCommunityId, communityId)
+ .eq(ComPensionAuthStatisticsDO::getYear, year - 1));
+ }
+ comPensionAuthStatisticsDO.setSum(comPensionAuthStatisticsDO.getSum() + 1);
+ comPensionAuthStatisticsDAO.updateById(comPensionAuthStatisticsDO);
+ }
+ }
comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
} else {
comPensionAuthPensionerDO = new ComPensionAuthPensionerDO();
@@ -4977,6 +5009,16 @@
comPensionAuthPensionerDO.setIdCard(cardNoAES);
comPensionAuthPensionerDO.setAddress(vo.getNowAddress());
comPensionAuthPensionerDAO.insert(comPensionAuthPensionerDO);
+ if (vo.getIsRegister().equals(1) && vo.getIsAlive().equals(1)) {
+ Date nowDate = new Date();
+ // 获取当前年
+ int year = (DateUtils.getYear(nowDate));
+ ComPensionAuthStatisticsDO comPensionAuthStatisticsDO = comPensionAuthStatisticsDAO.selectOne(new QueryWrapper<ComPensionAuthStatisticsDO>()
+ .lambda().eq(ComPensionAuthStatisticsDO::getCommunityId, communityId)
+ .eq(ComPensionAuthStatisticsDO::getYear, year));
+ comPensionAuthStatisticsDO.setSum(comPensionAuthStatisticsDO.getSum() + 1);
+ comPensionAuthStatisticsDAO.updateById(comPensionAuthStatisticsDO);
+ }
}
return populationDO;
}
--
Gitblit v1.7.1