From 5b926275cdff23c1fd995afad74be6159ec7476f Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 16:15:05 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 504 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 455 insertions(+), 49 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 6095980..39b3415 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
@@ -11,20 +11,24 @@
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.grid.*;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
+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;
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.partybuilding.PartyBuildingService;
-import com.panzhihua.common.utlis.IdCard;
-import com.panzhihua.common.utlis.RealNameUtil;
-import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.*;
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.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -78,7 +82,14 @@
private SysMenuDAO sysMenuDAO;
@Resource
private SysUserInputDAO sysUserInputDAO;
-
+ @Resource
+ private EventGridMemberBuildingRelationService buildingRelationService;
+ @Resource
+ private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
+ @Resource
+ private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
+// @Resource
+// private GridService gridService;
/**
* 小程序微信用户信息更新
@@ -161,7 +172,7 @@
userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
int i = userDao.updateById(sysUserDO);
if (i > 0) {
- return R.ok();
+ return R.ok(purePhoneNumber);
} else {
return R.fail("维护微信手机号失败");
}
@@ -233,6 +244,12 @@
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
+ if(userCommunityId!=null){
+ ComActVO comActVO = userDao.selectCommunity(userCommunityId);
+ if(comActVO!=null) {
+ loginUserInfoVO.setCommunityName(comActVO.getName());
+ }
+ }
if (!ObjectUtils.isEmpty(phone)) {
ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
@@ -379,23 +396,12 @@
/**
* 分页查询人口管理
*
- * @param loginUserInfoVO 查询参数
+ * @param userInfoVO 查询参数
* @return 分页数据
*/
@Override
- public R pageUser(LoginUserInfoVO loginUserInfoVO) {
- Page page = new Page<>();
- Long pageNum = loginUserInfoVO.getPageNum();
- Long pageSize = loginUserInfoVO.getPageSize();
- if (null == pageNum || 0 == pageNum) {
- pageNum = 1l;
- }
- if (null == pageSize || 0 == pageSize) {
- pageSize = 10l;
- }
- page.setSize(pageSize);
- page.setCurrent(pageNum);
- IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO);
+ public R pageUser(AppletUserInfoVO userInfoVO) {
+ IPage<AppletUserInfoVO> iPage = userDao.pageUser(new Page<>(userInfoVO.getPageNum(),userInfoVO.getPageSize()), userInfoVO);
iPage.getRecords().forEach(record -> {
record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
@@ -583,17 +589,18 @@
*/
@Override
public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
- SysUserDO sysUserDO = new SysUserDO();
- sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
-// sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
- sysUserDO.setUserId(loginUserInfoVO.getUserId());
- int update = userDao.updateById(sysUserDO);
- if (update > 0) {
- //删除用户信息缓存
- String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
- stringRedisTemplate.delete(userKey);
- return R.ok();
- }
+
+// SysUserDO sysUserDO = new SysUserDO();
+// sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
+//// sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
+// sysUserDO.setUserId(loginUserInfoVO.getUserId());
+// int update = userDao.updateById(sysUserDO);
+// if (update > 0) {
+// //删除用户信息缓存
+// String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
+// stringRedisTemplate.delete(userKey);
+// return R.fail();
+// }
return R.fail();
}
@@ -609,23 +616,28 @@
String idCard = loginUserInfoVO.getIdCard();
String name = loginUserInfoVO.getName();
log.info("用户实名认证发送请求，姓名：" + name + "身份证号码：" + idCard);
- try {
- boolean b = RealNameUtil.authentication(idCard, name);
- if (!b) {
- return R.fail("身份认证失败：请填写真实信息");
- }
- }catch (ServiceException serviceException){
- return R.fail(serviceException.getMessage());
- }
+// try {
+// boolean b = RealNameUtil.authentication(idCard, name);
+// if (!b) {
+// return R.fail("身份认证失败：请填写真实信息");
+// }
+// }catch (ServiceException serviceException){
+// return R.fail(serviceException.getMessage());
+// }
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setName(name);
sysUserDO.setIdCard(idCard);
//通过身份证号判断性别以及出生日期
sysUserDO.setSex(IdCard.sex(idCard));
sysUserDO.setBirthday(IdCard.birthDay(idCard));
- sysUserDO.setJob(loginUserInfoVO.getJob());
+ if(!StringUtils.isEmpty(loginUserInfoVO.getJob())){
+ sysUserDO.setJob(loginUserInfoVO.getJob());
+ }
sysUserDO.setUserId(loginUserInfoVO.getUserId());
sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
+ if(!StringUtils.isEmpty(loginUserInfoVO.getPhone())){
+ sysUserDO.setPhone(loginUserInfoVO.getPhone());
+ }
sysUserDO.setFaceState(null);
SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
if (!ObjectUtils.isEmpty(sysUserDO1)) {
@@ -643,6 +655,19 @@
userDao.updateById(sysUserDO);
//修改审核绑定的userId
userDao.updateComPbMemberUserId(idCard,sysUserDO.getUserId());
+ }
+
+ SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
+ if(user != null){
+ //实名认证成功推送订阅消息给用户
+ try {
+ WxXCXTempSend util = new WxXCXTempSend();
+ String accessToken = util.getAppAccessToken();
+ //用户实名认证推送消息
+ WxUtil.sendSubscribeRZSH(user.getOpenid(),accessToken,"实名认证", com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(),"认证成功");
+ }catch (Exception e){
+ log.error("推送用户订阅消息失败，失败原因：" + e.getMessage());
+ }
}
return R.ok();
}
@@ -865,6 +890,29 @@
}
}
+
+ if(insert>0 && sysUserDO.getType()==3){//添加的用户是社区账号时
+ //添加网格综合治理管理后台用户
+ SysUserDO sysUserDOWangGe = new SysUserDO();
+ BeanUtils.copyProperties(sysUserDO, sysUserDOWangGe);
+ sysUserDOWangGe.setUserId(null);
+ sysUserDOWangGe.setType(7);//网格综治后台
+ try {
+ int addWange = userDao.insert(sysUserDOWangGe);
+ if(addWange!=1){
+ throw new ServiceException("新增网格综合治理管理后台用户失败");
+ }
+ } 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) {
SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
Long userId = sysUserDO1.getUserId();
@@ -921,14 +969,19 @@
// 获取所有权限id
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);
+ 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);
+ }
+ }
}
-
return R.ok();
}
@@ -1079,8 +1132,9 @@
* @return 协议集合
*/
@Override
- public R listAgreement() {
- List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<>());
+ public R listAgreement(Long communityId) {
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<SysUserAgreementDO>()
+ .eq(SysUserAgreementDO::getCommunityId,communityId));
if (ObjectUtils.isEmpty(sysUserAgreementDOS)) {
return R.fail();
}
@@ -1118,7 +1172,7 @@
*/
@Override
public R listComMngUserTag(Long communityId) {
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId, communityId));
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().or().lambda().eq(ComMngUserTagDO::getSysFlag,1).or().eq(ComMngUserTagDO::getCommunityId, communityId));
if (ObjectUtils.isEmpty(comMngUserTagDOS)) {
return R.fail();
}
@@ -1832,4 +1886,356 @@
return R.fail();
}
}
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO) {
+
+ SysRoleDO gridMemberDefaultRole = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, Constants.GRID_DEFAULT_ROLE_KEY));
+ if(gridMemberDefaultRole==null) {
+ //添加默认网格员角色
+ 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("网格员默认角色添加失败");
+ }
+ }
+ Long roleId = gridMemberDefaultRole.getRoleId();
+ //新角色设置所有权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(eventGridMemberAddDTO.getCommunityId());
+ 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.getPassword());
+ eventGridMemberAddDTO.setPassword(encode);
+ BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO);
+ if(!StringUtils.isEmpty(sysUserDO.getNickName())){
+ sysUserDO.setName(sysUserDO.getNickName());
+ }
+ sysUserDO.setType(6);
+ if(StringUtils.isEmpty(eventGridMemberAddDTO.getImageUrl())){
+ sysUserDO.setImageUrl(Constants.ZONG_ZHI_GRID_MEMBER_IMAGE_URL);
+ }
+ int insert = 0;
+ try {
+ insert = userDao.insert(sysUserDO);
+ SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
+ sysUserRoleDO.setUserId(sysUserDO.getUserId());
+ sysUserRoleDO.setRoleId(roleId);
+ sysUserRoleDAO.insert(sysUserRoleDO);
+
+ //关联市平台网格员
+ if(eventGridMemberAddDTO.getLcMemberId() != null){
+ LcCompareCodeMemberDO compareCodeMemberDO = lcCompareMemberCodeMapper.selectOne(new QueryWrapper<LcCompareCodeMemberDO>().lambda()
+ .eq(LcCompareCodeMemberDO::getLcGridMemberId,eventGridMemberAddDTO.getLcMemberId()));
+ if(compareCodeMemberDO != null){
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setGridMemberName(sysUserDO.getNickName());
+ compareCodeMemberDO.setUpdateAt(new Date());
+ lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
+ }else{
+ compareCodeMemberDO = new LcCompareCodeMemberDO();
+ compareCodeMemberDO.setId(Snowflake.getId());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setGridMemberName(sysUserDO.getNickName());
+ compareCodeMemberDO.setLcGridMemberId(eventGridMemberAddDTO.getLcMemberId());
+ compareCodeMemberDO.setLcBindUserId(eventGridMemberAddDTO.getLcBindUserId());
+ compareCodeMemberDO.setLcGridMemberName(eventGridMemberAddDTO.getLcMemberName());
+ compareCodeMemberDO.setCreateAt(new Date());
+ lcCompareMemberCodeMapper.insert(compareCodeMemberDO);
+ }
+ }
+
+ //网格员关联楼栋
+ if(eventGridMemberAddDTO.getBuildingIds() != null && !eventGridMemberAddDTO.getBuildingIds().isEmpty()){
+ List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
+ eventGridMemberAddDTO.getBuildingIds().forEach(buildingId -> {
+ Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
+ if(resultMap != null){
+ EventGridMemberBuildingRelationDO buildingRelationDO = new EventGridMemberBuildingRelationDO();
+ buildingRelationDO.setBuildingId(buildingId);
+ buildingRelationDO.setGridMemberId(sysUserDO.getUserId());
+ buildingRelationDO.setVillageId(Long.parseLong(resultMap.get("village_id").toString()));
+ buildingRelationDO.setCommunityId(Long.parseLong(resultMap.get("act_id").toString()));
+ buildingRelationDO.setCreateAt(new Date());
+ buildingRelationList.add(buildingRelationDO);
+ }
+ });
+ if(!buildingRelationList.isEmpty()){
+ buildingRelationService.saveBatch(buildingRelationList);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("新增后台用户报错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ return R.fail("手机号已经存在");
+ } else if (e.getMessage().contains("union_account_type")) {
+ return R.fail("账户已经存在");
+ }
+ }
+ if(insert > 0){
+ return R.ok();
+ }else{
+ return R.fail("添加失败");
+ }
+ }
+
+ /**
+ * 网格员管理
+ * @param memberRelationDTO 请求参数
+ * @return 网格员列表
+ */
+ @Override
+ public R getGridMemberList(PageEventGridMemberRelationDTO memberRelationDTO){
+ IPage<GridMemberVO> gridMemberPage = userDao.getGridMemberList(new Page(memberRelationDTO.getPageNum()
+ ,memberRelationDTO.getPageSize()),memberRelationDTO);
+ if(!gridMemberPage.getRecords().isEmpty()){
+ gridMemberPage.getRecords().forEach(gridMember -> {
+ //查询网格员关联市平台网格员id
+ Map<String,String> lcMemberMap = this.userDao.getLcMemberId(gridMember.getUserId());
+ if(lcMemberMap != null){
+ gridMember.setLcMemberId(lcMemberMap.get("lc_grid_member_id"));
+ gridMember.setLcMemberName(lcMemberMap.get("lc_grid_member_name"));
+ gridMember.setLcBindUserId(lcMemberMap.get("lc_bind_user_id"));
+ }
+
+ //查询网格员关联楼栋信息
+ List<GridMemberBuildingVO> memberBuildingList = eventGridMemberBuildingRelationMapper.getGridMemberBuildingRelation(gridMember.getUserId());
+ if(!memberBuildingList.isEmpty()){
+ memberBuildingList.forEach(memberBuilding -> {
+ if(!memberBuilding.getBuildingName().contains("栋")){
+ memberBuilding.setBuildingName(memberBuilding.getBuildingName() + "栋");
+ }
+ });
+ gridMember.setMemberBuildingList(memberBuildingList);
+ }
+ });
+ }
+ return R.ok(gridMemberPage);
+ }
+
+ /**
+ * 修改网格员信息
+ * @param gridMemberDTO 请求参数
+ * @return 修改结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R editGridUser(EventGridMemberEditAdminDTO 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("昵称已使用");
+ }
+
+ BeanUtils.copyProperties(gridMemberDTO,sysUserDO);
+
+ int insert = 0;
+ try {
+ insert = userDao.updateById(sysUserDO);
+
+ //清除原本关联网格员信息
+ this.userDao.delLcMember(sysUserDO.getUserId());
+ //关联市平台网格员
+ if(gridMemberDTO.getLcMemberId() != null){
+ //关联现有的网格员信息
+ LcCompareCodeMemberDO compareCodeMemberDO = lcCompareMemberCodeMapper.selectOne(new QueryWrapper<LcCompareCodeMemberDO>().lambda()
+ .eq(LcCompareCodeMemberDO::getLcGridMemberId,gridMemberDTO.getLcMemberId()));
+ if(compareCodeMemberDO != null){
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setGridMemberName(sysUserDO.getNickName());
+ compareCodeMemberDO.setUpdateAt(new Date());
+ lcCompareMemberCodeMapper.updateById(compareCodeMemberDO);
+ }else{
+ compareCodeMemberDO = new LcCompareCodeMemberDO();
+ compareCodeMemberDO.setId(Snowflake.getId());
+ compareCodeMemberDO.setLocalGridMemberId(sysUserDO.getUserId().toString());
+ compareCodeMemberDO.setGridMemberName(sysUserDO.getNickName());
+ compareCodeMemberDO.setLcGridMemberId(gridMemberDTO.getLcMemberId());
+ compareCodeMemberDO.setLcBindUserId(gridMemberDTO.getLcBindUserId());
+ compareCodeMemberDO.setLcGridMemberName(gridMemberDTO.getLcMemberName());
+ compareCodeMemberDO.setCreateAt(new Date());
+ lcCompareMemberCodeMapper.insert(compareCodeMemberDO);
+ }
+ }
+ //清除原网格员与楼栋关联关系
+ this.userDao.delGridMemberRelation(sysUserDO.getUserId());
+
+ //新增网格员关联楼栋
+ if(gridMemberDTO.getBuildingIds() != null && !gridMemberDTO.getBuildingIds().isEmpty()){
+ List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
+ gridMemberDTO.getBuildingIds().forEach(buildingId -> {
+ Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
+ if(resultMap != null){
+ EventGridMemberBuildingRelationDO buildingRelationDO = new EventGridMemberBuildingRelationDO();
+ buildingRelationDO.setBuildingId(buildingId);
+ buildingRelationDO.setGridMemberId(sysUserDO.getUserId());
+ buildingRelationDO.setVillageId(Long.parseLong(resultMap.get("village_id").toString()));
+ buildingRelationDO.setCommunityId(Long.parseLong(resultMap.get("act_id").toString()));
+ buildingRelationDO.setCreateAt(new Date());
+ buildingRelationList.add(buildingRelationDO);
+ }
+ });
+ if(!buildingRelationList.isEmpty()){
+ buildingRelationService.saveBatch(buildingRelationList);
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("修改网格员用户报错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ return R.fail("手机号已经存在");
+ } else if (e.getMessage().contains("union_account_type")) {
+ return R.fail("账户已经存在");
+ }
+ }
+ 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();
+ }
+
+ @Override
+ public R noTips(Long userId){
+ SysUserDO userDO = this.userDao.selectById(userId);
+ if(userDO != null){
+ userDO.setBigAgeTips(2);
+ if(this.userDao.updateById(userDO) > 0){
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
+
+ /**
+ * 查询社区的收益说明
+ * @param communityId 社区id
+ * @return 收益说明
+ */
+ @Override
+ public R listAgreements(Long communityId){
+
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<SysUserAgreementDO>()
+ .eq(SysUserAgreementDO::getCommunityId,communityId).eq(SysUserAgreementDO::getType,5));
+ if (sysUserAgreementDOS.isEmpty()) {
+ SysUserAgreementDO agreementDO = new SysUserAgreementDO();
+ agreementDO.setCommunityId(communityId);
+ agreementDO.setName("收益说明");
+ agreementDO.setType(5);
+ agreementDO.setCreateAt(new Date());
+ agreementDO.setContent(Constants.PROFIT_EXPLAIN);
+ sysUserAgreementDAO.insert(agreementDO);
+ sysUserAgreementDOS.add(agreementDO);
+ }
+ List<SysUserAgreementVO> sysUserAgreementVOS = new ArrayList<>();
+ sysUserAgreementDOS.forEach(sysUserAgreementDO -> {
+ SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
+ BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
+ sysUserAgreementVOS.add(sysUserAgreementVO);
+ });
+ return R.ok(sysUserAgreementVOS);
+ }
+
+ @Override
+ public R getGridIsOk(Long userId){
+ Integer count = this.userDao.getGridIsOk(userId);
+ if(count > 0){
+ return R.ok(count);
+ }else{
+ return R.fail();
+ }
+ }
+
+ @Override
+ public R getGridsMemberList(Long communityId){
+ return R.ok(this.userDao.getGridsMemberList(communityId));
+ }
+
+ /**
+ * 根据用户id查询用户openid
+ * @param userId 用户id
+ * @return openid
+ */
+ @Override
+ public R getUserOpenId(Long userId){
+ SysUserDO userDO = this.userDao.selectById(userId);
+ if(userDO != null){
+ return R.ok(userDO.getOpenid());
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1