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/ComActSocialProjectMemberServiceImpl.java | 139 ++++++++++++++++++++++++++++++++-------------
1 files changed, 98 insertions(+), 41 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
index e9ed04b..ae6cee8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
@@ -1,25 +1,35 @@
package com.panzhihua.service_community.service.impl;
+import static java.util.Objects.nonNull;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.service_community.dao.ComActSocialMemberDao;
+import com.panzhihua.service_community.dao.ComActSocialProjectMemberDao;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
+import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.entity.ComActSocialProjectMember;
-import com.panzhihua.service_community.dao.ComActSocialProjectMemberDao;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import com.panzhihua.service_community.service.ComActSocialProjectMemberService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.Date;
+import lombok.extern.slf4j.Slf4j;
/**
* 项目人员(ComActSocialProjectMember)表服务实现类
@@ -37,6 +47,9 @@
private ComActSocialWorkerDao comActSocialWorkerDao;
@Resource
private ComMngVolunteerMngDAO comMngVolunteerMngDAO;
+ @Resource
+ private ComActSocialMemberDao comActSocialMemberDao;
+
@Override
public R pageList(CommonPage commonPage) {
return R.ok(this.comActSocialProjectMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -47,15 +60,18 @@
if(comActSocialProjectMemberVO.getType()==1){
ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(comActSocialProjectMemberVO.getParamId());
if(comActSocialWorker!=null){
- ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
- BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
- comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
- comActSocialProjectMember.setImage(comActSocialWorker.getImage());
- comActSocialProjectMember.setName(comActSocialWorker.getName());
- comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
- comActSocialProjectMember.setCreateTime(new Date());
- comActSocialProjectMemberDao.insert(comActSocialProjectMember);
- return R.ok();
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
+ if(CollectionUtils.isEmpty(list)){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
+ comActSocialProjectMember.setImage(comActSocialWorker.getImage());
+ comActSocialProjectMember.setName(comActSocialWorker.getName());
+ comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ return R.ok();
+ }
}
}
else {
@@ -78,37 +94,78 @@
@Override
public R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
if(CollectionUtils.isNotEmpty(comActSocialProjectMemberVO.getIds())){
+ Integer type = comActSocialProjectMemberVO.getType();
comActSocialProjectMemberVO.getIds().forEach(id ->{
- if(comActSocialProjectMemberVO.getType()==1){
+ if(type ==1) {
ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id);
if(comActSocialWorker!=null){
- ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
- BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
- comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
- comActSocialProjectMember.setImage(comActSocialWorker.getImage());
- comActSocialProjectMember.setName(comActSocialWorker.getName());
- comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
- comActSocialProjectMember.setCreateTime(new Date());
- comActSocialProjectMember.setType(1);
- comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
- comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
- comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
+ if(CollectionUtils.isEmpty(list)){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
+ comActSocialProjectMember.setImage(comActSocialWorker.getImage());
+ comActSocialProjectMember.setName(comActSocialWorker.getName());
+ comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(1);
+ comActSocialProjectMember.setCommunityId(comActSocialWorker.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
}
- }
- else {
+ } else if (type == 2) {
ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(id);
if(comMngVolunteerMngDO!=null){
- ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
- BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
- comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
- comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
- comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
- comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
- comActSocialProjectMember.setCreateTime(new Date());
- comActSocialProjectMember.setType(2);
- comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
- comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
- comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comMngVolunteerMngDO.getPhone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
+ if(CollectionUtils.isEmpty(list)){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
+ comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
+ comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
+ comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(2);
+ comActSocialProjectMember.setCommunityId(comMngVolunteerMngDO.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
+ }
+ } else if (type == 3) {
+ ComPbServiceTeamVO comPbServiceTeamVO = comActSocialMemberDao.selectPbServiceTeamById(id);
+ if (nonNull(comPbServiceTeamVO)) {
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comPbServiceTeamVO.getPhone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
+ if(CollectionUtils.isEmpty(list)) {
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setImage(comPbServiceTeamVO.getUrl());
+ comActSocialProjectMember.setName(comPbServiceTeamVO.getName());
+ comActSocialProjectMember.setPhone(comPbServiceTeamVO.getPhone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(3);
+ comActSocialProjectMember.setCommunityId(comPbServiceTeamVO.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
+ }
+ } else {
+ ComActSocialMember comActSocialMember = comActSocialMemberDao.selectById(id);
+ if (nonNull(comActSocialMember)) {
+ List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialMember.getPhone()).eq(ComActSocialProjectMember::getType, type).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getParamId()));
+ if(CollectionUtils.isEmpty(list)) {
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(getAge(comActSocialMember.getIdCard()));
+ comActSocialProjectMember.setImage(comActSocialMember.getImage());
+ comActSocialProjectMember.setName(comActSocialMember.getName());
+ comActSocialProjectMember.setPhone(comActSocialMember.getPhone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(4);
+ comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
}
}
});
@@ -117,7 +174,7 @@
}
public Integer getAge(String idCard){
- Integer year=Integer.parseInt(idCard.substring(5,9));
+ Integer year=Integer.parseInt(idCard.substring(6,10));
Integer nowYear= DateUtils.getYear(new Date());
return nowYear-year;
}
--
Gitblit v1.7.1