From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 154 insertions(+), 13 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 dc9af18..28590d1 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
@@ -14,11 +14,6 @@
import javax.annotation.Resource;
-import cn.hutool.core.util.IdcardUtil;
-import com.panzhihua.common.model.dtos.DataKanBansDto;
-import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.service_user.dao.*;
-import com.panzhihua.service_user.model.dos.*;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -37,6 +32,7 @@
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
@@ -59,6 +55,11 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.community.IndexUserCommunityVo;
+import com.panzhihua.common.model.vos.community.IndexUserStatisticsVo;
+import com.panzhihua.common.model.vos.community.IndexUserStreetVo;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
@@ -84,10 +85,41 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
+import com.panzhihua.service_user.dao.ComActFourMemberDao;
+import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO;
+import com.panzhihua.service_user.dao.ComMngUserTagDAO;
+import com.panzhihua.service_user.dao.EventGridMemberBuildingRelationMapper;
+import com.panzhihua.service_user.dao.LcCompareMemberCodeMapper;
+import com.panzhihua.service_user.dao.RoleDAO;
+import com.panzhihua.service_user.dao.SysMenuDAO;
+import com.panzhihua.service_user.dao.SysOperLogDAO;
+import com.panzhihua.service_user.dao.SysRoleMenuDAO;
+import com.panzhihua.service_user.dao.SysUserAgreementDAO;
+import com.panzhihua.service_user.dao.SysUserFeedbackDAO;
+import com.panzhihua.service_user.dao.SysUserInputDAO;
+import com.panzhihua.service_user.dao.SysUserNoticeDAO;
+import com.panzhihua.service_user.dao.SysUserRoleDAO;
+import com.panzhihua.service_user.dao.UserDao;
+import com.panzhihua.service_user.model.dos.ComActFourMember;
+import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
+import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
+import com.panzhihua.service_user.model.dos.EventGridMemberBuildingRelationDO;
+import com.panzhihua.service_user.model.dos.LcCompareCodeMemberDO;
+import com.panzhihua.service_user.model.dos.SysMenuDO;
+import com.panzhihua.service_user.model.dos.SysOperLogDO;
+import com.panzhihua.service_user.model.dos.SysRoleDO;
+import com.panzhihua.service_user.model.dos.SysRoleMenuDO;
+import com.panzhihua.service_user.model.dos.SysUserAgreementDO;
+import com.panzhihua.service_user.model.dos.SysUserDO;
+import com.panzhihua.service_user.model.dos.SysUserFeedbackDO;
+import com.panzhihua.service_user.model.dos.SysUserInputDO;
+import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
+import com.panzhihua.service_user.model.dos.SysUserRoleDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;
+import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;
// import com.panzhihua.common.service.grid.GridService;
@@ -325,6 +357,7 @@
loginUserInfoVO.setIsmemberrole(2);
loginUserInfoVO.setIsFourMember(2);
loginUserInfoVO.setIsCommunityWorker(2);
+ loginUserInfoVO.setIsPropertyWorker(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -346,6 +379,11 @@
Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
if(countFourMember>0){
loginUserInfoVO.setIsFourMember(1);
+ }
+ //是否是社区物业人员
+ int countPropertyWorker = userDao.countPropertyWorker(Long.parseLong(userId), userCommunityId);
+ if (countPropertyWorker > 0) {
+ loginUserInfoVO.setIsPropertyWorker(1);
}
// 是否是"管理员"或者 本社区 "社区团队"、"党委成员"
Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
@@ -584,6 +622,7 @@
if (ObjectUtils.isEmpty(sysUserDO)) {
return R.fail("人员不存在");
}
+
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
@@ -637,6 +676,9 @@
if (!ObjectUtils.isEmpty(comActVO)) {
loginUserInfoVO.setCommunityName(comActVO.getName());
}
+ //是否是社区物业人员
+ int countPropertyWorker = userDao.countPropertyWorker(userId, loginUserInfoVO.getCommunityId());
+ loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0);
loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
return R.ok(loginUserInfoVO);
@@ -1037,6 +1079,43 @@
this.putMenuRole(menuRoleVO);
}
}
+ if(roleId.intValue()==777777777){
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ sysRoleDO.setRoleName("超级管理员");
+ sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert > 0) {
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+ roleId = sysRoleDO1.getRoleId();
+ // 新街道管理员角色设置固定三社权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ List<Long> menu=new ArrayList<>();
+ if(administratorsUserVO.getSocialType()==1){
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(235L);
+ menu.add(236L);
+ menu.add(237L);
+ }
+ else if(administratorsUserVO.getSocialType()==2){
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(236L);
+ menu.add(237L);
+ menu.add(238L);
+ }
+ else if(administratorsUserVO.getSocialType()==3){
+ menu.add(233L);
+ menu.add(237L);
+ }
+ menuRoleVO.setMenuIds(menu);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1060,7 +1139,7 @@
}
- if (insert > 0 && sysUserDO.getType() == 3) {// 添加的用户是社区账号时
+ if (insert > 0 && sysUserDO.getType() == 3 &&sysUserDO.getStreetId()==null) {// 添加的用户是社区账号时
// 添加网格综合治理管理后台用户
SysUserDO sysUserDOWangGe = new SysUserDO();
BeanUtils.copyProperties(sysUserDO, sysUserDOWangGe);
@@ -1104,6 +1183,49 @@
public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
SysUserDO sysUserDO = new SysUserDO();
Long roleId = administratorsUserVO.getRoleId();
+ if(roleId.intValue()==777777777){
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ sysRoleDO.setRoleName("三社超级管理员");
+ List<Long> menu=new ArrayList<>();
+ if(administratorsUserVO.getSocialType()==1){
+ sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(235L);
+ menu.add(236L);
+ menu.add(237L);
+ }
+ else if(administratorsUserVO.getSocialType()==2){
+ sysRoleDO.setRoleKey("social_org" + administratorsUserVO.getStreetId());
+ menu.add(233L);
+ menu.add(76L);
+ menu.add(234L);
+ menu.add(236L);
+ menu.add(237L);
+ menu.add(238L);
+ }
+ else if(administratorsUserVO.getSocialType()==3){
+ sysRoleDO.setRoleKey("social_org_member" + administratorsUserVO.getStreetId());
+ menu.add(233L);
+ menu.add(237L);
+ }
+
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+ if(sysRoleDO1!=null){
+ sysRoleDO=sysRoleDO1;
+ roleId = sysRoleDO.getRoleId();
+ }else{
+ roleDAO.insert(sysRoleDO);
+ // 新街道管理员角色设置固定三社权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setMenuIds(menu);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1121,6 +1243,8 @@
throw new ServiceException("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
throw new ServiceException("账户已经存在");
+ }else if(e.getMessage().contains("23000")){
+ throw new ServiceException("手机号已存在");
}
}
@@ -1198,7 +1322,12 @@
.anyMatch(sysRoleMenuDO -> sysRoleMenuDO.getMenuId().equals(menuId))).collect(Collectors.toList());
}
if (!menuIds.isEmpty()) {
- sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
+ if(menuRoleVO.getMenuIds().isEmpty()){
+ sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
+ }
+ else {
+ sysRoleMenuDAO.batchInsertWithRoleId(menuRoleVO.getMenuIds(), roleId);
+ }
}
// for (int i = 0; i < menuIds.size(); i++) {
// SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda()
@@ -1280,7 +1409,7 @@
}
Long communityId = sysUserDO.getCommunityId();
Long communityId1 = administratorsUserVO.getCommunityId();
- if (communityId1.intValue() != communityId.intValue()) {
+ if (communityId1!=null&&communityId1.intValue() != communityId.intValue()) {
return R.fail("用户不属于当前平台");
}
// 删除用户
@@ -2589,10 +2718,6 @@
if (nonNull(sysUserDO)) {
return R.fail("账户已经存在");
}
- sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, convenientMerchantDTO.getPhone()));
- if (nonNull(sysUserDO)) {
- return R.fail("手机号已经存在");
- }
// sys_user 表
sysUserDO = new SysUserDO();
String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
@@ -2601,7 +2726,7 @@
sysUserDO.setType(10);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(1);
- sysUserDO.setPhone(convenientMerchantDTO.getPhone());
+ sysUserDO.setPhone(null);
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
try {
@@ -2745,4 +2870,20 @@
public R communityStatisticsExport(){
return R.ok(userDao.getUserCommunityExcelExport());
}
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ @Override
+ public R getUserInfoByUnionId(String unionId) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getUnionid, unionId));
+ if (isNull(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ return R.ok(loginUserInfoVO);
+ }
}
--
Gitblit v1.7.1