From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
index e3fb348..b1fa119 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -12,10 +12,7 @@
import com.panzhihua.common.enums.PopulRelationEnum;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.community.FourMemberDetailVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
@@ -38,6 +35,7 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -66,16 +64,36 @@
private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
@Override
public R pageList(CommonPage commonPage) {
- return R.ok(comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ IPage<ComActFourMemberVO> comActFourMemberVOIPage=comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage);
+ if(!comActFourMemberVOIPage.getRecords().isEmpty()){
+ comActFourMemberVOIPage.getRecords().forEach(comActFourMemberVO -> {
+ if(comActFourMemberVO.getJurisdictionContent()!=null){
+ comActFourMemberVO.setJurisdictionContentList(JSON.parseArray(comActFourMemberVO.getJurisdictionContent(),String.class));
+ }
+ });
+ }
+ return R.ok(comActFourMemberVOIPage);
}
@Override
public R insert(ComActFourMemberVO comActFourMemberVO) {
if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
+ if(comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda()
+ .eq(ComActFourMember::getIdCard,comActFourMemberVO.getIdCard())
+ .eq(ComActFourMember::getCommunityId, comActFourMemberVO.getCommunityId()))>0){
+ return R.fail("身份证号重复");
+ }
ComActFourMember comActFourMember=new ComActFourMember();
- List<String> jurisdictionList=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
+ List<String> jurisdictionList=new ArrayList<>();
+ List<String> jurisdictionList1=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
+ List<String> jurisdictionList2=comMngBuildingDAO.findByVillage(comActFourMemberVO.getJurisdiction());
+ if(!jurisdictionList1.isEmpty()){
+ jurisdictionList.addAll(jurisdictionList1);
+ }
+ if(!jurisdictionList2.isEmpty()){
+ jurisdictionList.addAll(jurisdictionList2);
+ }
if(!jurisdictionList.isEmpty()&&jurisdictionList.size()==jurisdictionList.stream().distinct().collect(Collectors.toList()).size()){
- comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
administratorsUserVO.setType(3);
@@ -84,6 +102,7 @@
comActFourMemberVO.setUserId(Long.parseLong(r.getData().toString()));
comActFourMemberVO.setCreateTime(DateUtil.date());
BeanUtils.copyProperties(comActFourMemberVO,comActFourMember);
+ comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
this.comActFourMemberDao.insert(comActFourMember);
return R.ok();
}
@@ -177,13 +196,13 @@
}
@Override
- public R get(Integer id) {
+ public R get(Long id) {
return R.ok(comActFourMemberDao.getById(id));
}
@Override
public R selectByMember(CommonPage commonPage) {
- IPage<ComMngPopulationVO> comMngPopulationDOIPage=this.comMngPopulationDAO.query(new Page<ComMngPopulationDO>(commonPage.getPage(),commonPage.getSize()),commonPage);
+ IPage<ComMngPopulationNoSecretVO> comMngPopulationDOIPage=this.comMngPopulationDAO.query(new Page<ComMngPopulationDO>(commonPage.getPage(),commonPage.getSize()),commonPage);
if (!comMngPopulationDOIPage.getRecords().isEmpty()) {
comMngPopulationDOIPage.getRecords().forEach(populDO -> {
if (StringUtils.isNotEmpty(populDO.getBirthday())) {
@@ -205,7 +224,7 @@
// comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
// }
- ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
+ ComMngPopulationNoSecretVO comMngPopulationVO = new ComMngPopulationNoSecretVO();
BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
// 查询户主关系信息
--
Gitblit v1.7.1