From 0edab788f512d3c269c6b5caa62682dc1ef396f4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 18:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 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 df715de..98eef13 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;
@@ -19,6 +21,7 @@
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;
@@ -154,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();
@@ -223,6 +228,7 @@
});
loginUserInfoVO.setRoles(set);
}
+ loginUserInfoVO.setIsmemberrole(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
if (!ObjectUtils.isEmpty(phone)) {
@@ -232,6 +238,13 @@
}else{
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
+ }
+ Integer countTeam = userDao.selectCountTeam(phone);
+ Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
+ if(countTeam!=null&&countTeam>0) {
+ loginUserInfoVO.setIsmemberrole(1);
+ }else if(selectCountMemberRole!=null&&selectCountMemberRole>0) {
+ loginUserInfoVO.setIsmemberrole(1);
}
}
return R.ok(loginUserInfoVO);
@@ -376,6 +389,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);
}
@@ -440,9 +457,9 @@
}
Integer isRent = sysUserInputDO1.getIsRent();
ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
- comMngFamilyInfoVO.setIdCard(sysUserInputDO1.getIdCard());
+ comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard()));
comMngFamilyInfoVO.setName(name);
- comMngFamilyInfoVO.setPhone(sysUserInputDO1.getPhone());
+ comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone()));
if (isRent.intValue()==0) {
comMngFamilyInfoVO.setRelationship("家人");
}else{
@@ -459,6 +476,8 @@
if (!ObjectUtils.isEmpty(comActVO)) {
loginUserInfoVO.setCommunityName(comActVO.getName());
}
+ loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
+ loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
return R.ok(loginUserInfoVO);
}
@@ -588,8 +607,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();
@@ -1124,6 +1146,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();
@@ -1471,6 +1494,28 @@
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");
@@ -1488,4 +1533,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("sysFlag",1).or().eq("communityId",communityId));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1