From d2a5b25d25e8912d3e9e4ae5f9a315c386060f25 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 14 四月 2021 11:31:33 +0800
Subject: [PATCH] bug fixed: 过滤删除的调查问卷，添加调查问卷 调查对象
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 214 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 193 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index e262045..b0665b2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -8,7 +8,9 @@
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
@@ -17,14 +19,17 @@
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
+import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
+
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -71,6 +76,8 @@
private SysRoleMenuDAO sysRoleMenuDAO;
@Resource
private SysMenuDAO sysMenuDAO;
+ @Resource
+ private SysUserInputDAO sysUserInputDAO;
/**
@@ -150,6 +157,8 @@
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setPhone(purePhoneNumber);
sysUserDO.setUserId(userId);
+ userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
+ userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
int i = userDao.updateById(sysUserDO);
if (i > 0) {
return R.ok();
@@ -219,6 +228,7 @@
});
loginUserInfoVO.setRoles(set);
}
+ loginUserInfoVO.setIsmemberrole(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
if (!ObjectUtils.isEmpty(phone)) {
@@ -228,6 +238,14 @@
}else{
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
+ }
+ Integer countTeam = userDao.selectCountTeam(phone);
+ Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
+ //Integer isSysAdmin = userDao.selectCountAdmin(phone);
+ if(countTeam!=null&&countTeam>0) {
+ loginUserInfoVO.setIsmemberrole(1);
+ }else if(selectCountMemberRole!=null&&selectCountMemberRole>0) {
+ loginUserInfoVO.setIsmemberrole(1);
}
}
return R.ok(loginUserInfoVO);
@@ -372,6 +390,10 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO);
+ iPage.getRecords().forEach(record->{
+ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
+ record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
+ });
return R.ok(iPage);
}
@@ -383,7 +405,7 @@
@Override
public R listTag() {
List<String> list=new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(null);
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<>());
if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
}
@@ -398,26 +420,65 @@
*/
@Override
public R detailUser(Long userId) {
- SysUserDO sysUserDO = userDao.selectById(userId);
- if (ObjectUtils.isEmpty(sysUserDO)) {
- return R.fail("人员不存在");
- }
LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
- BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
- List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
- if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
- List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
- comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
- ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
- BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
- comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
- });
- loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ if(userId<100000000l){
+ SysUserDO sysUserDO = userDao.selectById(userId);
+ if (ObjectUtils.isEmpty(sysUserDO)) {
+ return R.fail("人员不存在");
+ }
+ BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
+ List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
+ if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
+ List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
+ comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
+ ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
+ BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
+ comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
+ });
+ loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+
+ }else{
+ //导入社区人员
+ SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(userId - 100000000);
+ if (ObjectUtils.isEmpty(sysUserInputDO)) {
+ return R.fail("人员不存在");
+ }
+ String name1 = sysUserInputDO.getName();
+ BeanUtils.copyProperties(sysUserInputDO,loginUserInfoVO);
+ String doorNumber = sysUserInputDO.getDoorNumber();
+ Long areaId = sysUserInputDO.getAreaId();
+ List<SysUserInputDO> sysUserInputDOS = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getDoorNumber, doorNumber).eq(SysUserInputDO::getAreaId, areaId));
+ if (!ObjectUtils.isEmpty(sysUserInputDOS)) {
+ List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
+ sysUserInputDOS.forEach(sysUserInputDO1 -> {
+ String name = sysUserInputDO1.getName();
+ if (name1.equals(name)) {
+ return;
+ }
+ Integer isRent = sysUserInputDO1.getIsRent();
+ ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
+ comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard()));
+ comMngFamilyInfoVO.setName(name);
+ comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone()));
+ if (isRent.intValue()==0) {
+ comMngFamilyInfoVO.setRelationship("家人");
+ }else{
+ comMngFamilyInfoVO.setRelationship("合租");
+ }
+ comMngFamilyInfoVO.setAge(IdCard.IdNOToAge(sysUserInputDO1.getIdCard()));
+ comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
+ });
+ loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+
}
ComActVO comActVO=userDao.selectCommunity(loginUserInfoVO.getCommunityId());
if (!ObjectUtils.isEmpty(comActVO)) {
loginUserInfoVO.setCommunityName(comActVO.getName());
}
+ loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
+ loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
return R.ok(loginUserInfoVO);
}
@@ -547,8 +608,11 @@
SysUserDO sysUserDO=new SysUserDO();
sysUserDO.setUserId(userPhoneVO.getUserId());
sysUserDO.setPhone(newPhone);
+ userDao.updateMemberRole(newPhone, oldPhone);
+ userDao.updateServiceTeam(newPhone, oldPhone);
int update = userDao.updateById(sysUserDO);
if (update>0) {
+
return R.ok();
}
return R.fail();
@@ -678,7 +742,7 @@
Long roleId = administratorsUserVO.getRoleId();
Long communityId = administratorsUserVO.getCommunityId();
if (roleId.intValue()==999999999) {
-//新增社区高级管理员角色
+ //新增社区高级管理员角色
SysRoleDO sysRoleDO=new SysRoleDO();
sysRoleDO.setCommunityId(communityId);
sysRoleDO.setRoleName("超级管理员");
@@ -689,7 +753,7 @@
if (insert>0) {
SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
roleId=sysRoleDO1.getRoleId();
-// 新角色设置所有权限
+ //新角色设置所有权限
MenuRoleVO menuRoleVO=new MenuRoleVO();
menuRoleVO.setIsAll(1);
menuRoleVO.setCommunityId(communityId);
@@ -718,7 +782,7 @@
}
if (insert>0) {
- SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getPhone, administratorsUserVO.getPhone()));
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
Long userId = sysUserDO1.getUserId();
SysUserRoleDO sysUserRoleDO=new SysUserRoleDO();
sysUserRoleDO.setUserId(userId);
@@ -932,7 +996,7 @@
*/
@Override
public R listAgreement() {
- List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(null);
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<>());
if (ObjectUtils.isEmpty(sysUserAgreementDOS)) {
return R.fail();
}
@@ -1083,6 +1147,7 @@
public R addFeedback(SysUserFeedbackDTO sysUserFeedbackDTO) {
SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
BeanUtils.copyProperties(sysUserFeedbackDTO,sysUserFeedbackDO);
+ sysUserFeedbackDO.setPhotoPath(sysUserFeedbackDTO.getPhotoPah());
int insert = sysUserFeedbackDAO.insert(sysUserFeedbackDO);
if (insert>0) {
return R.ok();
@@ -1360,6 +1425,98 @@
return R.fail();
}
+ /**
+ * 校验小区是否存在
+ *
+ * @param areaName 小区名字
+ * @return 校验结果
+ */
+ @Override
+ public R checkAereaName(String areaName) {
+ Integer num=userDao.selectCountArea(areaName);
+ if (num>0) {
+ Integer integer = userDao.selectCountHouse(areaName);
+ if (integer>0) {
+ return R.ok();
+ }else{
+ return R.fail("小区房屋信息未创建,请先在社区平台添加房屋信息");
+ }
+ }else{
+ return R.fail("小区不存在,请先在社区平台添加小区");
+ }
+ }
+
+ /**
+ * 社区人员详情包括导入人员
+ *
+ * @param userId 人员id
+ * @return CommunityUserInfoVO
+ */
+ @Override
+ public CommunityUserInfoVO detailUserComunity(Long userId) {
+ CommunityUserInfoVO communityUserInfoVO=new CommunityUserInfoVO();
+ SysUserDO sysUserDO = userDao.selectById(userId);
+ if (!ObjectUtils.isEmpty(sysUserDO)) {
+ String idCard = sysUserDO.getIdCard();
+ if (!ObjectUtils.isEmpty(idCard)) {
+ communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
+ communityUserInfoVO.setBirthday(IdCard.birthDay(idCard));
+ communityUserInfoVO.setIdCard(idCard);
+ }
+ communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
+ communityUserInfoVO.setName(sysUserDO.getName());
+ String phone = sysUserDO.getPhone();
+ communityUserInfoVO.setPhone(phone);
+ communityUserInfoVO.setSex(sysUserDO.getSex());
+ communityUserInfoVO.setTags(sysUserDO.getTags());
+ communityUserInfoVO.setUserId(userId);
+ ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
+ if (!ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
+ communityUserInfoVO.setVolunteerCreateAt(comMngVolunteerMngVO.getCreateAt());
+ }
+ Integer isPartymember = sysUserDO.getIsPartymember();
+ if (isPartymember.intValue()==1) {
+ communityUserInfoVO.setPoliticalOutlook(1);
+ }else{
+ communityUserInfoVO.setPoliticalOutlook(3);
+ }
+ communityUserInfoVO.setIsVolunteer(sysUserDO.getIsVolunteer());
+ List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
+ if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
+ List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
+ comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
+ ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
+ BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
+ comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
+ });
+ communityUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+ }
+ return communityUserInfoVO;
+ }
+
+ /**
+ * 用户搜索了就下载搜索的用户否则下载所有用户
+ *
+ * @param exportUserDTO 用户搜索内容
+ * @return List<EexcelUserDTO> excel内容
+ */
+ @Override
+ public R export(ExportUserDTO exportUserDTO) {
+ List<EexcelUserDTO> eexcelUserDTOS=userDao.selectExport(exportUserDTO);
+ return R.ok(eexcelUserDTOS);
+ }
+
+ @Override
+ public R getSysUserVOByPhone(String phone) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone));
+ if (ObjectUtils.isEmpty(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ SysUserVO sysUserVO = new SysUserVO();
+ BeanUtils.copyProperties(sysUserDO,sysUserVO);
+ return R.ok(sysUserVO);
+ }
public static void main(String[] args) {
// String encode = new BCryptPasswordEncoder().encode("lbsq123456");
@@ -1377,4 +1534,19 @@
// boolean matches = encoder.matches("admin1234567", encode);
// System.out.println(matches);
}
+
+ /**
+ * 查询当前社区所有标签以及预设标签
+ *
+ * @return 标签集合
+ */
+ @Override
+ public R listTags(Long communityId) {
+ List<String> list=new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag",1).or().eq("community_id",communityId));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1