From 63d368fffeb8872e9528f56cf6dfb35fa4f50f80 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 30 九月 2021 09:30:45 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 161 +++++++++++++++++++++++------------------------------
1 files changed, 69 insertions(+), 92 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 cedecbf..41c2119 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
@@ -3,7 +3,6 @@
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
-import java.time.Instant;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -15,6 +14,9 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.IdcardUtil;
+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;
@@ -82,34 +84,6 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
-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.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;
@@ -159,6 +133,8 @@
private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
@Resource
private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
+ @Resource
+ private ComActFourMemberDao comActFourMemberDao;
// @Resource
// private GridService gridService;
@@ -347,6 +323,7 @@
loginUserInfoVO.setRoles(set);
}
loginUserInfoVO.setIsmemberrole(2);
+ loginUserInfoVO.setIsFourMember(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -363,6 +340,11 @@
} else {
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
+ }
+ //是否四长四员
+ Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
+ if(countFourMember>0){
+ loginUserInfoVO.setIsFourMember(1);
}
// 是否是"管理员"或者 本社区 "社区团队"、"党委成员"
Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
@@ -576,7 +558,8 @@
@Override
public R listTag() {
List<String> list = new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<>());
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<ComMngUserTagDO>()
+ .eq(ComMngUserTagDO::getSysFlag,1));
if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
.collect(Collectors.toList());
@@ -799,7 +782,7 @@
sysUserDO.setIdCard(idCard);
// 通过身份证号判断性别以及出生日期
sysUserDO.setSex(IdCard.sex(idCard));
- sysUserDO.setBirthday(IdCard.birthDay(idCard));
+ sysUserDO.setBirthday(IdcardUtil.getBirthDate(idCard));
if (!StringUtils.isEmpty(loginUserInfoVO.getJob())) {
sysUserDO.setJob(loginUserInfoVO.getJob());
}
@@ -1203,19 +1186,28 @@
// 获取所有权限id
List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda()
- .eq(SysMenuDO::getCommunityId, 2l).orderByAsc(SysMenuDO::getOrderNum));
+ .eq(SysMenuDO::getCommunityId, 2L).orderByAsc(SysMenuDO::getOrderNum));
if (!menuDOList.isEmpty()) {
menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
- for (int i = 0; i < menuIds.size(); i++) {
- SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda()
- .eq(SysRoleMenuDO::getMenuId, menuIds.get(i)).eq(SysRoleMenuDO::getRoleId, roleId));
- if (sysRoleMenuDO == null) {
- sysRoleMenuDO = new SysRoleMenuDO();
- sysRoleMenuDO.setMenuId(menuIds.get(i));
- sysRoleMenuDO.setRoleId(roleId);
- sysRoleMenuDAO.insert(sysRoleMenuDO);
- }
+
+ List<SysRoleMenuDO> sysRoleMenuDOList = sysRoleMenuDAO.selectList(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId).in(SysRoleMenuDO::getMenuId, menuIds));
+ if (!sysRoleMenuDOList.isEmpty()) {
+ menuIds = menuIds.stream().filter(menuId -> !sysRoleMenuDOList.stream()
+ .anyMatch(sysRoleMenuDO -> sysRoleMenuDO.getMenuId().equals(menuId))).collect(Collectors.toList());
}
+ if (!menuIds.isEmpty()) {
+ sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
+ }
+// for (int i = 0; i < menuIds.size(); i++) {
+// SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda()
+// .eq(SysRoleMenuDO::getMenuId, menuIds.get(i)).eq(SysRoleMenuDO::getRoleId, roleId));
+// if (sysRoleMenuDO == null) {
+// sysRoleMenuDO = new SysRoleMenuDO();
+// sysRoleMenuDO.setMenuId(menuIds.get(i));
+// sysRoleMenuDO.setRoleId(roleId);
+// sysRoleMenuDAO.insert(sysRoleMenuDO);
+// }
+// }
}
return R.ok();
}
@@ -2168,7 +2160,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO) {
- //todo 网格
SysRoleDO gridMemberDefaultRole = roleDAO.selectOne(
new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, Constants.GRID_DEFAULT_ROLE_KEY));
if (gridMemberDefaultRole == null) {
@@ -2591,41 +2582,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
- // todo 便民
- log.error("catTimeStamp进入addConvenientMerchantUser", Instant.now().toEpochMilli());
- SysUserDO sysUserDO = new SysUserDO();
- Long communityId = 0L;
- // 新增社区高级管理员角色
- SysRoleDO sysRoleDO = new SysRoleDO();
- sysRoleDO.setCommunityId(communityId);
- sysRoleDO.setRoleName(convenientMerchantDTO.getName());
- sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + convenientMerchantDTO.getAccount());
- sysRoleDO.setRoleSort(0);
- sysRoleDO.setCreateBy(convenientMerchantDTO.getCreatedBy());
- try {
- int insert = roleDAO.insert(sysRoleDO);
- if (insert != 1) {
- return R.fail("网络错误");
- }
- } catch (Exception e) {
- log.error("新增角色报错【{}】", e.getMessage());
- if (e.getMessage().contains("unique_role_name_community_id")) {
- return R.fail("商家名称已被占用");
- } else {
- return R.fail("建立商家角色失败，商家名称可能已被占用！");
- }
+ SysUserDO sysUserDO;
+ sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount()));
+ if (nonNull(sysUserDO)) {
+ return R.fail("账户已经存在");
}
- log.error("catTimeStamp-SysRoleDO创建完成", Instant.now().toEpochMilli());
- // 新角色设置所有权限
- MenuRoleVO menuRoleVO = new MenuRoleVO();
- menuRoleVO.setIsAll(1);
- menuRoleVO.setCommunityId(communityId);
- menuRoleVO.setRoleId(sysRoleDO.getRoleId());
- this.putMenuRole(menuRoleVO);
-
- log.error("catTimeStamp-MenuRoleVO创建完成", Instant.now().toEpochMilli());
-
+ 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());
BeanUtils.copyProperties(convenientMerchantDTO, sysUserDO);
sysUserDO.setAccount(convenientMerchantDTO.getAccount());
@@ -2637,17 +2604,10 @@
sysUserDO.setPassword(encode);
try {
userDao.insert(sysUserDO);
- log.error("catTimeStamp-sysUserDO创建完成", Instant.now().toEpochMilli());
return R.ok(sysUserDO.getUserId());
} catch (Exception e) {
e.printStackTrace();
log.error("新增后台用户报错【{}】", e.getMessage());
- roleDAO.deleteByRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + convenientMerchantDTO.getAccount());
- if (e.getMessage().contains("union_phone_type")) {
- return R.fail("手机号已经存在");
- } else if (e.getMessage().contains("union_account_type")) {
- return R.fail("账户已经存在");
- }
}
return R.fail("新增商户发生错误");
}
@@ -2664,20 +2624,37 @@
if (isNull(sysUserDO)) {
return R.fail("用户不存在");
}
- String oldAccount = sysUserDO.getAccount();
sysUserDO.setAccount(account);
- int result = userDao.updateById(sysUserDO);
- if (result > 0) {
- SysRoleDO sysRoleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>()
- .lambda().eq(SysRoleDO::getRoleKey, Constants.CONVENIENT_MERCHANT_ROLE_KEY + oldAccount));
- if (nonNull(sysRoleDO)) {
- sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + account);
- roleDAO.updateById(sysRoleDO);
- }
- }
+ userDao.updateById(sysUserDO);
return R.ok();
}
+ // /**
+ // * 修改便民服务商家绑定账号
+ // * @param userId 用户id
+ // * @param account 修改账户
+ // * @return 修改结果
+ // */
+ // @Override
+ // public R putUserAccount(Long userId, String account) {
+ // SysUserDO sysUserDO = userDao.selectById(userId);
+ // if (isNull(sysUserDO)) {
+ // return R.fail("用户不存在");
+ // }
+ // String oldAccount = sysUserDO.getAccount();
+ // sysUserDO.setAccount(account);
+ // int result = userDao.updateById(sysUserDO);
+ // if (result > 0) {
+ // SysRoleDO sysRoleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>()
+ // .lambda().eq(SysRoleDO::getRoleKey, Constants.CONVENIENT_MERCHANT_ROLE_KEY + oldAccount));
+ // if (nonNull(sysRoleDO)) {
+ // sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + account);
+ // roleDAO.updateById(sysRoleDO);
+ // }
+ // }
+ // return R.ok();
+ // }
+
@Override
public R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
userDao.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO.getType(), disableOrEnableConvenientMerchantDTO.getUserIds());
--
Gitblit v1.7.1