From dad584e4efa7a95ec18f37a833acfeb1f670a562 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 04 六月 2021 09:23:00 +0800
Subject: [PATCH] 网格员管理以及网格管理
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 160 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 139 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 19c46d0..33d734b 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
@@ -12,6 +12,9 @@
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
+import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
@@ -20,7 +23,7 @@
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
-import com.panzhihua.common.service.grid.GridService;
+//import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
@@ -81,8 +84,8 @@
private SysMenuDAO sysMenuDAO;
@Resource
private SysUserInputDAO sysUserInputDAO;
- @Resource
- private GridService gridService;
+// @Resource
+// private GridService gridService;
/**
* 小程序微信用户信息更新
@@ -950,12 +953,14 @@
List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2l).orderByAsc(SysMenuDO::getOrderNum));
menuIds = menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
for (int i = 0; i < menuIds.size(); i++) {
- SysRoleMenuDO sysRoleMenuDO = new SysRoleMenuDO();
- sysRoleMenuDO.setMenuId(menuIds.get(i));
- sysRoleMenuDO.setRoleId(roleId);
- sysRoleMenuDAO.insert(sysRoleMenuDO);
+ SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getMenuId,menuIds.get(i))
+ .eq(SysRoleMenuDO::getRoleId,roleId));
+ if(sysRoleMenuDO == null){
+ sysRoleMenuDO.setMenuId(menuIds.get(i));
+ sysRoleMenuDO.setRoleId(roleId);
+ sysRoleMenuDAO.insert(sysRoleMenuDO);
+ }
}
-
return R.ok();
}
@@ -1860,6 +1865,11 @@
}
}
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO) {
@@ -1867,13 +1877,13 @@
SysRoleDO gridMemberDefaultRole = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, Constants.GRID_DEFAULT_ROLE_KEY));
if(gridMemberDefaultRole==null) {
//添加默认网格员角色
- SysRoleDO sysRoleDO = new SysRoleDO();
- sysRoleDO.setCommunityId(0L);
- sysRoleDO.setRoleName("网格员默认角色");
- sysRoleDO.setRoleKey(Constants.GRID_DEFAULT_ROLE_KEY);
- sysRoleDO.setRoleSort(0);
- sysRoleDO.setCreateBy(eventGridMemberAddDTO.getUserId());
- int insert = roleDAO.insert(sysRoleDO);
+ gridMemberDefaultRole = new SysRoleDO();
+ gridMemberDefaultRole.setCommunityId(0L);
+ gridMemberDefaultRole.setRoleName("网格员默认角色");
+ gridMemberDefaultRole.setRoleKey(Constants.GRID_DEFAULT_ROLE_KEY);
+ gridMemberDefaultRole.setRoleSort(0);
+ gridMemberDefaultRole.setCreateBy(eventGridMemberAddDTO.getUserId());
+ int insert = roleDAO.insert(gridMemberDefaultRole);
if (insert!=1) {
throw new ServiceException("网格员默认角色添加失败");
}
@@ -1886,13 +1896,25 @@
menuRoleVO.setRoleId(roleId);
this.putMenuRole(menuRoleVO);
+ //参数校验
+ SysUserDO oldUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType,6)
+ .eq(SysUserDO::getNickName,eventGridMemberAddDTO.getNickName()));
+ if(oldUserDO != null){
+ return R.fail("昵称已使用");
+ }
+
SysUserDO sysUserDO = new SysUserDO();
- String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPasswd());
- eventGridMemberAddDTO.setPasswd(encode);
+ String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPassword());
+ eventGridMemberAddDTO.setPassword(encode);
BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO);
+ sysUserDO.setType(6);
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
+ SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
+ sysUserRoleDO.setUserId(sysUserDO.getUserId());
+ sysUserRoleDO.setRoleId(roleId);
+ sysUserRoleDAO.insert(sysUserRoleDO);
} catch (Exception e) {
e.printStackTrace();
log.error("新增后台用户报错【{}】", e.getMessage());
@@ -1901,12 +1923,108 @@
} else if (e.getMessage().contains("union_account_type")) {
throw new ServiceException("账户已经存在");
}
-
}
- //TODO 添加关联关系
- //gridService.addEventGridMember();
+ if(insert > 0){
+ return R.ok();
+ }else{
+ return R.fail("添加失败");
+ }
+ }
+ /**
+ * 网格员管理
+ * @param memberRelationDTO 请求参数
+ * @return 网格员列表
+ */
+ @Override
+ public R getGridMemberList(PageEventGridMemberRelationDTO memberRelationDTO){
+ return R.ok(userDao.getGridMemberList(new Page(memberRelationDTO.getPageNum(),memberRelationDTO.getPageSize()),memberRelationDTO));
+ }
- return R.fail();
+ /**
+ * 修改网格员信息
+ * @param gridMemberDTO 请求参数
+ * @return 修改结果
+ */
+ @Override
+ public R editGridUser(EventGridMemberAddDTO gridMemberDTO){
+
+ if(gridMemberDTO.getGridMemberId() == null){
+ return R.fail("参数错误");
+ }
+ SysUserDO sysUserDO = userDao.selectById(gridMemberDTO.getGridMemberId());
+ if(sysUserDO == null){
+ return R.fail("参数错误");
+ }
+ gridMemberDTO.setUserId(gridMemberDTO.getGridMemberId());
+
+ //参数校验
+ SysUserDO oldUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType,6)
+ .eq(SysUserDO::getNickName,gridMemberDTO.getNickName()));
+ if(oldUserDO != null && !oldUserDO.getUserId().equals(gridMemberDTO.getGridMemberId())){
+ return R.fail("昵称已使用");
+ }
+
+ String encode = new BCryptPasswordEncoder().encode(gridMemberDTO.getPassword());
+ gridMemberDTO.setPassword(encode);
+ BeanUtils.copyProperties(gridMemberDTO,sysUserDO);
+
+ int insert = 0;
+ try {
+ insert = userDao.updateById(sysUserDO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("修改网格员用户报错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ throw new ServiceException("手机号已经存在");
+ } else if (e.getMessage().contains("union_account_type")) {
+ throw new ServiceException("账户已经存在");
+ }
+ }
+ if(insert > 0){
+ return R.ok();
+ }
+ return R.fail("修改失败");
+ }
+
+ /**
+ * 重置网格员密码
+ * @param gridMemberDTO 请求参数
+ * @return 重置结果
+ */
+ @Override
+ public R passResetUser(EventGridMemberPassResetDTO gridMemberDTO){
+ if(gridMemberDTO.getIds().isEmpty() || StringUtils.isEmpty(gridMemberDTO.getPassword())){
+ return R.fail("参数错误");
+ }
+ String encode = new BCryptPasswordEncoder().encode(gridMemberDTO.getPassword());
+ gridMemberDTO.setPassword(encode);
+ userDao.passResetUser(gridMemberDTO);
+ return R.ok();
+ }
+
+ /**
+ * 批量删除网格员
+ * @param Ids 网格员id集合
+ * @return 删除结果
+ */
+ @Override
+ public R deleteMembers(List<Long> Ids){
+ if(Ids.isEmpty()){
+ return R.fail("参数有误");
+ }
+ if(userDao.deleteBatchIds(Ids) > 0){
+ return R.ok();
+ }
+ return R.fail("删除失败");
+ }
+
+ @Override
+ public R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO){
+ if(gridMemberEditDTO.getIds().isEmpty()){
+ return R.fail("参数有误");
+ }
+ userDao.gridMemberEditStatus(gridMemberEditDTO);
+ return R.ok();
}
}
--
Gitblit v1.7.1