From 2c8b9868fe8c45320eb18fd5d6b51ec770c30610 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 24 七月 2021 11:43:57 +0800
Subject: [PATCH] 注释用户实名认证请求公安接口
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 1793 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 1,698 insertions(+), 95 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 c1abb3f..4de00fd 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
@@ -5,27 +5,43 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.UserConstants;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.R;
+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.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.user.ChangePasswordVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.common.model.vos.user.UserPhoneVO;
-import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO;
-import com.panzhihua.service_user.dao.ComMngUserTagDAO;
-import com.panzhihua.service_user.dao.RoleDAO;
-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.SysRoleDO;
-import com.panzhihua.service_user.model.dos.SysUserDO;
+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.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;
+import org.apache.commons.lang.time.DateUtils;
+
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@@ -39,6 +55,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-11-24 09:13
**/
+@Slf4j
@Service
public class UserServiceImpl implements UserService {
@Resource
@@ -51,7 +68,28 @@
private ComMngFamilyInfoDAO comMngFamilyInfoDAO;
@Resource
private StringRedisTemplate stringRedisTemplate;
-
+ @Resource
+ private SysUserRoleDAO sysUserRoleDAO;
+ @Resource
+ private SysOperLogDAO sysOperLogDAO;
+ @Resource
+ private SysUserAgreementDAO sysUserAgreementDAO;
+ @Resource
+ private SysUserFeedbackDAO sysUserFeedbackDAO;
+ @Resource
+ private SysUserNoticeDAO sysUserNoticeDAO;
+ @Resource
+ private SysRoleMenuDAO sysRoleMenuDAO;
+ @Resource
+ private SysMenuDAO sysMenuDAO;
+ @Resource
+ private SysUserInputDAO sysUserInputDAO;
+ @Resource
+ private EventGridMemberBuildingRelationService buildingRelationService;
+ @Resource
+ private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
+// @Resource
+// private GridService gridService;
/**
* 小程序微信用户信息更新
@@ -66,9 +104,9 @@
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid));
boolean empty = ObjectUtils.isEmpty(sysUserDO);
int num = 0;
+ Date date = new Date();
if (empty) {
SysUserDO sysUserDO1 = new SysUserDO();
- Date date = new Date();
String encode = new BCryptPasswordEncoder().encode(UserConstants.PASSWORD);
sysUserDO1.setOpenid(openid);
sysUserDO1.setUnionid(unionid);
@@ -83,6 +121,7 @@
sysUserDO.setUnionid(unionid);
sysUserDO.setSessionKey(sessionKey);
sysUserDO.setPassword(encode);
+ sysUserDO.setLastLoginTime(date);
sysUserDO.setType(1);
num = userDao.updateById(sysUserDO);
}
@@ -129,6 +168,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();
@@ -151,22 +192,23 @@
sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name));
} else {
LambdaQueryWrapper<SysUserDO> wrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type);
- wrapper.and(sysUserDOLambdaQueryWrapper ->sysUserDOLambdaQueryWrapper .eq(SysUserDO::getAccount, name).or().eq(SysUserDO::getPhone, name));
+ wrapper.and(sysUserDOLambdaQueryWrapper -> sysUserDOLambdaQueryWrapper.eq(SysUserDO::getAccount, name).or().eq(SysUserDO::getPhone, name));
sysUserDO = userDao.selectOne(wrapper);
}
boolean empty = ObjectUtils.isEmpty(sysUserDO);
if (empty) {
return R.fail();
}
- LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
loginUserInfoVO.setUserId(sysUserDO.getUserId());
loginUserInfoVO.setName(sysUserDO.getName());
loginUserInfoVO.setPassword(sysUserDO.getPassword());
loginUserInfoVO.setStatus(sysUserDO.getStatus());
loginUserInfoVO.setAccount(name);
loginUserInfoVO.setType(sysUserDO.getType());
- List<SysRoleDO> roleDOList=roleDAO.selectByUserId(sysUserDO.getUserId());
- Set<String> set=new HashSet<>();
+ loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);//暂时 身份证判断实名制
+ List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
+ Set<String> set = new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
roleDOList.forEach(sysRoleDO -> {
set.add(sysRoleDO.getRoleKey());
@@ -188,16 +230,47 @@
if (empty) {
return R.fail();
}
- LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
- BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
- List<SysRoleDO> roleDOList=roleDAO.selectByUserId(sysUserDO.getUserId());
- Set<String> set=new HashSet<>();
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
+ Set<String> set = new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
roleDOList.forEach(sysRoleDO -> {
set.add(sysRoleDO.getRoleKey());
});
loginUserInfoVO.setRoles(set);
}
+ loginUserInfoVO.setIsmemberrole(2);
+// 志愿者状态
+ 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)) {
+ loginUserInfoVO.setVolunteerStatus(0);
+ } else {
+ int state = comMngVolunteerMngVO.getState().intValue();
+ loginUserInfoVO.setVolunteerStatus(state);
+ }
+ //是否是"管理员"或者 本社区 "社区团队"、"党委成员"
+ Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
+ Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);
+ Integer isSysUser = userDao.selectCountSysUser(phone, userCommunityId);
+ if (countTeam != null && countTeam > 0) {
+ loginUserInfoVO.setIsmemberrole(1);
+ } else if (selectCountMemberRole != null && selectCountMemberRole > 0) {
+ loginUserInfoVO.setIsmemberrole(1);
+ } else if (isSysUser != null && isSysUser > 0) {
+ loginUserInfoVO.setIsmemberrole(1);
+ }
+ }
+ loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);
return R.ok(loginUserInfoVO);
}
@@ -210,13 +283,24 @@
@Override
public R changePassword(ChangePasswordVO changePasswordVO) {
Long userId = changePasswordVO.getUserId();
+ SysUserDO sysUserDO1 = userDao.selectById(userId);
+ String dataPassowrd = sysUserDO1.getPassword();
+ String oldPassword = changePasswordVO.getOldPassword();
String newPassword = changePasswordVO.getNewPassword();
- SysUserDO sysUserDO=new SysUserDO();
+ if (oldPassword.equals(newPassword)) {
+ return R.fail("新密码与原密码不能相同");
+ }
+ BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+ if (!encoder.matches(oldPassword, dataPassowrd)) {
+ return R.fail("原密码错误");
+
+ }
+ SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(userId);
String encode = new BCryptPasswordEncoder().encode(newPassword);
sysUserDO.setPassword(encode);
int update = userDao.updateById(sysUserDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail();
@@ -231,16 +315,16 @@
*/
@Override
public R listActivityManager(String param, Long communityId) {
- LambdaQueryWrapper<SysUserDO> queryWrapper=new LambdaQueryWrapper<>();
- List<ActivityManagerVO> activityManagerVOS=new ArrayList<>();
- queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType,3);
+ LambdaQueryWrapper<SysUserDO> queryWrapper = new LambdaQueryWrapper<>();
+ List<ActivityManagerVO> activityManagerVOS = new ArrayList<>();
+ queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType, 3);
if (!ObjectUtils.isEmpty(param)) {
queryWrapper = queryWrapper.eq(SysUserDO::getName, param);
}
List<SysUserDO> sysUserDOS = userDao.selectList(queryWrapper);
if (!ObjectUtils.isEmpty(sysUserDOS)) {
sysUserDOS.forEach(sysUserDO -> {
- ActivityManagerVO activityManagerVO=new ActivityManagerVO();
+ ActivityManagerVO activityManagerVO = new ActivityManagerVO();
activityManagerVO.setManagerId(sysUserDO.getUserId());
activityManagerVO.setName(sysUserDO.getName());
activityManagerVOS.add(activityManagerVO);
@@ -260,10 +344,10 @@
Page page = new Page<>();
Long pageNum = loginUserInfoVO.getPageNum();
Long pageSize = loginUserInfoVO.getPageSize();
- if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
@@ -282,27 +366,28 @@
public R putUserFace(LoginUserInfoVO loginUserInfoVO) {
int operationType = loginUserInfoVO.getOperationType().intValue();
Long userId = loginUserInfoVO.getUserId();
- SysUserDO sysUserDO=new SysUserDO();
+ SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(userId);
- switch (operationType){
+ switch (operationType) {
case 1:
sysUserDO.setFaceState(1);
break;
case 2:
- sysUserDO.setFaceState(3);
+ sysUserDO.setFaceState(2);
break;
case 3:
break;
default:
break;
}
- int num=0;
- if (operationType==3) {
- num=userDao.deleteById(userId);
+ int num = 0;
+ if (operationType == 3) {
+// num=userDao.deleteById(userId);
+ num = userDao.updateFaceState(userId);
} else {
- num=userDao.updateById(sysUserDO);
+ num = userDao.updateById(sysUserDO);
}
- if (num>0) {
+ if (num > 0) {
return R.ok();
}
return R.fail();
@@ -319,15 +404,19 @@
Page page = new Page<>();
Long pageNum = loginUserInfoVO.getPageNum();
Long pageSize = loginUserInfoVO.getPageSize();
- if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
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);
}
@@ -338,38 +427,81 @@
*/
@Override
public R listTag() {
- List<String> list=new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(null);
+ List<String> list = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<>());
if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
- list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
}
return R.ok(list);
}
/**
* 人员详情
- *
+ *detailuser
* @param userId 用户id
* @return 人员详情
*/
@Override
public R detailUser(Long userId) {
- SysUserDO sysUserDO = userDao.selectById(userId);
- if (ObjectUtils.isEmpty(sysUserDO)) {
- return R.fail("人员不存在");
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ if (userId < 100000000l) {
+ SysUserDO sysUserDO = userDao.selectById(userId);
+ if (ObjectUtils.isEmpty(sysUserDO)) {
+ return R.fail("人员不存在");
+ }
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
+ if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
+ List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
+ comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
+ ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
+ BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
+ comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
+ });
+ loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+
+ } else {
+ //导入社区人员
+ SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(userId - 100000000);
+ if (ObjectUtils.isEmpty(sysUserInputDO)) {
+ return R.fail("人员不存在");
+ }
+ String name1 = sysUserInputDO.getName();
+ BeanUtils.copyProperties(sysUserInputDO, loginUserInfoVO);
+ String doorNumber = sysUserInputDO.getDoorNumber();
+ Long areaId = sysUserInputDO.getAreaId();
+ List<SysUserInputDO> sysUserInputDOS = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getDoorNumber, doorNumber).eq(SysUserInputDO::getAreaId, areaId));
+ if (!ObjectUtils.isEmpty(sysUserInputDOS)) {
+ List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
+ sysUserInputDOS.forEach(sysUserInputDO1 -> {
+ String name = sysUserInputDO1.getName();
+ if (name1.equals(name)) {
+ return;
+ }
+ Integer isRent = sysUserInputDO1.getIsRent();
+ ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
+ comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard()));
+ comMngFamilyInfoVO.setName(name);
+ comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone()));
+ if (isRent.intValue() == 0) {
+ comMngFamilyInfoVO.setRelationship("家人");
+ } else {
+ comMngFamilyInfoVO.setRelationship("合租");
+ }
+ comMngFamilyInfoVO.setAge(IdCard.IdNOToAge(sysUserInputDO1.getIdCard()));
+ comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
+ });
+ loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+
}
- LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
- BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
- List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
- if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
- List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
- comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
- ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
- BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
- comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
- });
- loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
+ if (!ObjectUtils.isEmpty(comActVO)) {
+ loginUserInfoVO.setCommunityName(comActVO.getName());
}
+ loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
+ loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
return R.ok(loginUserInfoVO);
}
@@ -381,11 +513,11 @@
*/
@Override
public R putUserTag(LoginUserInfoVO loginUserInfoVO) {
- SysUserDO sysUserDO=new SysUserDO();
+ SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(loginUserInfoVO.getUserId());
sysUserDO.setTags(loginUserInfoVO.getTags());
int update = userDao.updateById(sysUserDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail();
@@ -399,11 +531,63 @@
*/
@Override
public R putUserIsVolunteer(String phone, int type) {
- SysUserDO sysUserDO=new SysUserDO();
+
+ SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setIsVolunteer(type);
+ //????根据手机号匹配
int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone));
- if (update>0) {
+ if (update > 0) {
+ ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
+ if(comMngVolunteerMngVO!=null&&comMngVolunteerMngVO.getSubmitUserId()!=null) {
+ Long userId = comMngVolunteerMngVO.getSubmitUserId();
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + userId;
+ stringRedisTemplate.delete(userKey);
+ }else{
+ List<SysUserDO> userDOList = userDao.selectList(new LambdaQueryWrapper<SysUserDO>().eq(SysUserDO::getPhone, phone));
+ if(userDOList!=null && userDOList.size()>0){
+ userDOList.forEach(usrDo ->{
+ Long userId = usrDo.getUserId();
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + userId;
+ stringRedisTemplate.delete(userKey);
+ });
+ }
+ }
return R.ok();
+ }
+ return R.fail();
+ }
+
+
+ /**
+ * 修改用户志愿者状态
+ *
+ * @param userId 志愿者用户ID
+ * @param type
+ */
+ @Override
+ public R putUserIsVolunteerById(Long userId, int type) {
+ SysUserDO sysUserDO = new SysUserDO();
+ sysUserDO.setIsVolunteer(type);
+ sysUserDO.setUserId(userId);
+
+ SysUserDO userInDB = userDao.selectById(userId);
+ if (userInDB != null) {
+ boolean isVol = userInDB.getIsVolunteer() == 1;
+ if (isVol) {
+ return R.fail("用户已是志愿者");
+ }
+ if (userInDB.getType() != 1) {
+ return R.fail("用户不是小程序用户");
+ }
+ int update = userDao.updateById(sysUserDO);
+ if (update > 0) {
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + userId;
+ stringRedisTemplate.delete(userKey);
+ return R.ok();
+ }
}
return R.fail();
}
@@ -416,12 +600,15 @@
*/
@Override
public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
- SysUserDO sysUserDO=new SysUserDO();
+ SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
- sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
+// sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
sysUserDO.setUserId(loginUserInfoVO.getUserId());
int update = userDao.updateById(sysUserDO);
- if (update>0) {
+ if (update > 0) {
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
+ stringRedisTemplate.delete(userKey);
return R.ok();
}
return R.fail();
@@ -435,17 +622,45 @@
*/
@Override
public R putUserAuthentication(LoginUserInfoVO loginUserInfoVO) {
- SysUserDO sysUserDO=new SysUserDO();
- sysUserDO.setName(loginUserInfoVO.getName());
- sysUserDO.setIdCard(loginUserInfoVO.getIdCard());
- sysUserDO.setSex(loginUserInfoVO.getSex());
- sysUserDO.setBirthday(loginUserInfoVO.getBirthday());
+ //接入第三方实名认证
+ 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());
+// }
+ SysUserDO sysUserDO = new SysUserDO();
+ sysUserDO.setName(name);
+ sysUserDO.setIdCard(idCard);
+ //通过身份证号判断性别以及出生日期
+ sysUserDO.setSex(IdCard.sex(idCard));
+ sysUserDO.setBirthday(IdCard.birthDay(idCard));
sysUserDO.setJob(loginUserInfoVO.getJob());
sysUserDO.setUserId(loginUserInfoVO.getUserId());
sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
- sysUserDO.setFaceState(0);
+ sysUserDO.setFaceState(null);
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
+ if (!ObjectUtils.isEmpty(sysUserDO1)) {
+ return R.fail("身份证已经存在");
+ }
int update = userDao.updateById(sysUserDO);
- if (update>0) {
+ if (update > 0) {
+ //清空缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ //实名认证成功查询是否有已审核的党员信息，有则更新党员信息绑定党员的userId
+ Long memberId = userDao.getPartyBuildingByIdCard(idCard);
+ if(memberId != null){
+ sysUserDO.setIsPartymember(1);
+ userDao.updateById(sysUserDO);
+ //修改审核绑定的userId
+ userDao.updateComPbMemberUserId(idCard,sysUserDO.getUserId());
+ }
return R.ok();
}
return R.fail();
@@ -472,19 +687,24 @@
}
SysUserDO sysUserDO1 = userDao.selectById(userPhoneVO.getUserId());
String phone = sysUserDO1.getPhone();
- if (!StringUtils.isEmpty(phone)&& !phone.equals(oldPhone)) {
+ if (!StringUtils.isEmpty(phone) && !phone.equals(oldPhone)) {
return R.fail("旧手机号错误");
}
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
String code = valueOperations.get(key);
if (!code.equals(smsCode)) {
- return R.fail("验证码错误");
+ if (!smsCode.equals("777333")) {
+ return R.fail("验证码错误");
+ }
}
- SysUserDO sysUserDO=new SysUserDO();
+ 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) {
+ if (update > 0) {
+
return R.ok();
}
return R.fail();
@@ -498,10 +718,46 @@
*/
@Override
public R putUser(LoginUserInfoVO loginUserInfoVO) {
- SysUserDO sysUserDO=new SysUserDO();
- BeanUtils.copyProperties(loginUserInfoVO,sysUserDO);
+ Integer faceState = loginUserInfoVO.getFaceState();
+ if (null == faceState || 0 == faceState) {
+ loginUserInfoVO.setFaceState(null);
+ }
+ Integer isPartymember = loginUserInfoVO.getIsPartymember();
+ if (null == isPartymember || 0 == isPartymember) {
+ loginUserInfoVO.setIsPartymember(null);
+ }
+ Integer isVolunteer = loginUserInfoVO.getIsVolunteer();
+ if (null == isVolunteer || 0 == isVolunteer) {
+ loginUserInfoVO.setIsVolunteer(null);
+ }
+ Integer operationType = loginUserInfoVO.getOperationType();
+ if (null == operationType || 0 == operationType) {
+ loginUserInfoVO.setOperationType(null);
+ }
+ Integer sex = loginUserInfoVO.getSex();
+ if (null == sex || 0 == sex) {
+ loginUserInfoVO.setSex(null);
+ }
+ Integer status = loginUserInfoVO.getStatus();
+ if (null == status || 0 == status) {
+ loginUserInfoVO.setStatus(null);
+ }
+ Integer type = loginUserInfoVO.getType();
+ if (null == type || 0 == type) {
+ loginUserInfoVO.setType(null);
+ }
+ Long communityId = loginUserInfoVO.getCommunityId();
+ if (null == communityId || 0 == communityId) {
+ loginUserInfoVO.setCommunityId(null);
+ }
+ String faceUrl = loginUserInfoVO.getFaceUrl();
+ if (!ObjectUtils.isEmpty(faceUrl)) {
+ loginUserInfoVO.setFaceState(0);
+ }
+ SysUserDO sysUserDO = new SysUserDO();
+ BeanUtils.copyProperties(loginUserInfoVO, sysUserDO);
int update = userDao.updateById(sysUserDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail();
@@ -514,13 +770,14 @@
* @return 成员集合
*/
@Override
- public R listFamily(Long userId) {
- List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
- List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
- if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
- comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
- ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
- BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
+ public R listFamily(Long userId,Long pageNum, Long pageSize) {
+ List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
+ LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId).orderByDesc(ComMngFamilyInfoDO::getCreateAt);
+ IPage<ComMngFamilyInfoDO> pageData = comMngFamilyInfoDAO.selectPage(new Page<>(pageNum,pageSize), query);
+ if (!ObjectUtils.isEmpty(pageData.getRecords())) {
+ pageData.getRecords().forEach(comMngFamilyInfoDO -> {
+ ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
+ BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
});
}
@@ -535,14 +792,15 @@
*/
@Override
public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
- ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
- BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
+ ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO();
+ BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO);
ComMngFamilyInfoDO comMngFamilyInfoDO1 = comMngFamilyInfoDAO.selectOne(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getIdCard, comMngFamilyInfoVO.getIdCard()).eq(ComMngFamilyInfoDO::getUserId, comMngFamilyInfoVO.getUserId()));
if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) {
return R.fail("家庭成员已经存在");
}
+ comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
- if (insert>0) {
+ if (insert > 0) {
return R.ok();
}
return R.fail();
@@ -556,17 +814,1362 @@
*/
@Override
public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
- ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
- BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
+ ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO();
+ BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO);
+ comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail();
}
+ /**
+ * 新增运营、社区后台账户
+ *
+ * @param administratorsUserVO 账户信息
+ * @return 新增结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {
+ SysUserDO sysUserDO = new SysUserDO();
+ Long roleId = administratorsUserVO.getRoleId();
+ if (roleId.intValue() == 999999999 || roleId.intValue() == 888888888) {
+ Long communityId = administratorsUserVO.getCommunityId();
+ //新增社区高级管理员角色
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ if (roleId.intValue() == 999999999) {
+ sysRoleDO.setCommunityId(communityId);
+ sysRoleDO.setRoleName("超级管理员");
+ sysRoleDO.setRoleKey(Constants.ADMIN_SHOP_ROLE_KEY + communityId);
+ } else {
+ sysRoleDO.setCommunityId(0L);
+ sysRoleDO.setRoleName(administratorsUserVO.getShopStoreName());
+ sysRoleDO.setRoleKey(Constants.SHOP_ROLE_KEY + administratorsUserVO.getShopStorePhone());
+ }
+ 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();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(communityId);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
+ SysRoleDO roleDO = roleDAO.selectById(roleId);
+ if (ObjectUtils.isEmpty(roleDO)) {
+ return R.fail("角色不存在");
+ }
+ String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
+ administratorsUserVO.setPassword(encode);
+ BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ int insert = 0;
+ try {
+ insert = userDao.insert(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 && 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();
+ SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
+ sysUserRoleDO.setUserId(userId);
+ sysUserRoleDO.setRoleId(roleDO.getRoleId());
+ int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
+ if (insert1 > 0) {
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
+
+ /**
+ * 设置角色的权限
+ *
+ * @param menuRoleVO 用户设置的权限id
+ * @return 设置结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public R putMenuRole(MenuRoleVO menuRoleVO) {
+ List<Long> menuIds = new ArrayList<>();
+ Long roleId = menuRoleVO.getRoleId();
+ Integer isAll = menuRoleVO.getIsAll();
+ Long communityId = menuRoleVO.getCommunityId();
+// if (isAll.intValue()==1) {
+// List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2l).eq(SysMenuDO::getParentId,0).orderByAsc(SysMenuDO::getOrderNum));
+// Long menuIdParent = sysMenuDOS.get(1).getMenuId();
+// List<SysMenuDO> sysMenuDOSErJi = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, menuIdParent));
+// if (!ObjectUtils.isEmpty(sysMenuDOS)) {
+// sysMenuDOS.forEach(sysMenuDO -> {
+// sysMenuDO.setCommunityId(communityId);
+// sysMenuDO.setMenuId(null);
+// sysMenuDAO.insert(sysMenuDO);
+// });
+//// 完成一级目录创建
+// List<SysMenuDO> sysMenuDOS1 = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, communityId).orderByAsc(SysMenuDO::getOrderNum));
+// sysMenuDOS1.forEach(sysMenuDO -> {
+// Integer orderNum = sysMenuDO.getOrderNum();
+// if (orderNum.intValue()>0) {
+// sysMenuDOSErJi.forEach(sysMenuDO1 -> {
+// sysMenuDO1.setParentId(sysMenuDO.getMenuId());
+// sysMenuDO1.setCommunityId(communityId);
+// sysMenuDO1.setMenuId(null);
+// sysMenuDAO.insert(sysMenuDO1);
+// });
+// }
+// });
+// }
+// }
+
+// 菜单写死不重新生成菜单 todo 所有注释上面自动生成新菜单功能
+
+// 获取所有权限id
+ List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().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);
+ }
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 编辑运营、社区后台账户
+ *
+ * @param administratorsUserVO 编辑账户内容
+ * @return 编辑结果
+ */
+ @Override
+ public R putUserBackstage(AdministratorsUserVO administratorsUserVO) {
+ SysUserDO sysUserDO = new SysUserDO();
+ Long roleId = administratorsUserVO.getRoleId();
+ SysRoleDO roleDO = null;
+ if (null != roleId && 0 != roleId) {
+ roleDO = roleDAO.selectById(roleId);
+ if (ObjectUtils.isEmpty(roleDO)) {
+ return R.fail("角色不存在");
+ }
+ }
+ String password = administratorsUserVO.getPassword();
+ if (!ObjectUtils.isEmpty(password)) {
+ String encode = new BCryptPasswordEncoder().encode(password);
+ administratorsUserVO.setPassword(encode);
+ }
+ BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ int update = 0;
+ try {
+ update = userDao.updateById(sysUserDO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("编辑后台用户出错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ return R.fail("此手机号已被占用，请更换其他手机号码");
+ }
+ }
+ if (update > 0 && null != roleDO) {
+ SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
+ sysUserRoleDO.setRoleId(roleDO.getRoleId());
+ int update1 = sysUserRoleDAO.update(sysUserRoleDO, new UpdateWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, administratorsUserVO.getUserId()));
+ if (update1 > 0) {
+ return R.ok();
+ } else {
+ sysUserRoleDO.setUserId(administratorsUserVO.getUserId());
+ sysUserRoleDAO.insert(sysUserRoleDO);
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 删除后台用户
+ *
+ * @param administratorsUserVO 用户主键
+ * @return 删除结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R deleteUserBackstage(AdministratorsUserVO administratorsUserVO) {
+ Long userId = administratorsUserVO.getUserId();
+ SysUserDO sysUserDO = userDao.selectById(userId);
+ if (ObjectUtils.isEmpty(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ Long communityId = sysUserDO.getCommunityId();
+ Long communityId1 = administratorsUserVO.getCommunityId();
+ if (communityId1.intValue() != communityId.intValue()) {
+ return R.fail("用户不属于当前平台");
+ }
+ //删除用户
+ int delete = userDao.deleteById(userId);
+ //删除用户角色关系
+ if (delete > 0) {
+ int delete1 = sysUserRoleDAO.delete(new QueryWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, userId));
+ if (delete1 == 0) {
+ return R.fail("用户没有角色关系");
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 分页查询后台用户
+ *
+ * @param administratorsUserVO 查询参数
+ * @return 后台用户
+ */
+ @Override
+ public R pageUserBackstage(AdministratorsUserVO administratorsUserVO) {
+ Page page = new Page<>();
+ Long pageNum = administratorsUserVO.getPageNum();
+ Long pageSize = administratorsUserVO.getPageSize();
+ if (null == pageNum || pageNum == 0) {
+ pageNum = 1l;
+ }
+ if (null == pageSize || pageSize == 0) {
+ pageSize = 10l;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<AdministratorsUserVO> iPage = userDao.pageUserBackstage(page, administratorsUserVO);
+ return R.ok(iPage);
+ }
+
+ /**
+ * 保存操作日志
+ *
+ * @param operlog 日志内容
+ * @return 保存结果
+ */
+ @Override
+ public R addOperLog(SysOperLogVO operlog) {
+ SysOperLogDO sysOperLogDO = new SysOperLogDO();
+ BeanUtils.copyProperties(operlog, sysOperLogDO);
+ int insert = sysOperLogDAO.insert(sysOperLogDO);
+ if (insert > 0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 分页展示操作日志
+ *
+ * @param sysOperLogVO 分页参数
+ * @return 分页集合
+ */
+ @Override
+ public R pageOperLog(SysOperLogVO sysOperLogVO) {
+ Page page = new Page<>();
+ Long pageNum = sysOperLogVO.getPageNum();
+ Long pageSize = sysOperLogVO.getPageSize();
+ if (null == pageNum || pageNum == 0) {
+ pageNum = 1l;
+ }
+ if (null == pageSize || pageSize == 0) {
+ pageSize = 10l;
+ }
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<SysOperLogVO> iPage = sysOperLogDAO.pageOperLog(page, sysOperLogVO);
+ return R.ok(iPage);
+ }
+
+ /**
+ * 用户协议
+ *
+ * @return 协议集合
+ */
+ @Override
+ public R listAgreement(Long communityId) {
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<SysUserAgreementDO>()
+ .eq(SysUserAgreementDO::getCommunityId,communityId));
+ if (ObjectUtils.isEmpty(sysUserAgreementDOS)) {
+ return R.fail();
+ }
+ List<SysUserAgreementVO> sysUserAgreementVOS = new ArrayList<>();
+ sysUserAgreementDOS.forEach(sysUserAgreementDO -> {
+ SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
+ BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
+ sysUserAgreementVOS.add(sysUserAgreementVO);
+ });
+ return R.ok(sysUserAgreementVOS);
+ }
+
+ /**
+ * 编辑用户协议
+ *
+ * @param sysUserAgreementVO 编辑内容
+ * @return 编辑结果
+ */
+ @Override
+ public R putAgreement(SysUserAgreementVO sysUserAgreementVO) {
+ SysUserAgreementDO sysUserAgreementDO = new SysUserAgreementDO();
+ BeanUtils.copyProperties(sysUserAgreementVO, sysUserAgreementDO);
+ int update = sysUserAgreementDAO.updateById(sysUserAgreementDO);
+ if (update == 0) {
+ return R.fail("协议不存在");
+ }
+ return R.ok();
+ }
+
+ /**
+ * 用户标签
+ *
+ * @param communityId 社区id
+ * @return 标签集合
+ */
+ @Override
+ public R listComMngUserTag(Long 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();
+ }
+ List<ComMngUserTagVO> comMngUserTagVOList = new ArrayList<>();
+ comMngUserTagDOS.forEach(comMngUserTagDO -> {
+ ComMngUserTagVO comMngUserTagVO = new ComMngUserTagVO();
+ BeanUtils.copyProperties(comMngUserTagDO, comMngUserTagVO);
+ comMngUserTagVOList.add(comMngUserTagVO);
+ });
+ return R.ok(comMngUserTagVOList);
+ }
+
+ /**
+ * 新增删除用户标签
+ *
+ * @param systemmanagementConfigVO 操作内容
+ * @return 操作结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R putComMngUserTag(SystemmanagementConfigVO systemmanagementConfigVO) {
+ Long communityId = systemmanagementConfigVO.getCommunityId();
+ List<ComMngUserTagVO> comMngUserTagVOList = systemmanagementConfigVO.getComMngUserTagVOList();
+ if (!ObjectUtils.isEmpty(comMngUserTagVOList)) {
+ comMngUserTagDAO.delete(null);
+ comMngUserTagVOList.forEach(comMngUserTagVO -> {
+ ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
+ comMngUserTagDO.setCommunityId(communityId);
+ comMngUserTagDO.setTagName(comMngUserTagVO.getTagName());
+ comMngUserTagDAO.insert(comMngUserTagDO);
+ });
+ return R.ok();
+ } else {
+ return R.fail("用户标签不能为空");
+ }
+
+ }
+
+ /**
+ * 分页查询小程序用户
+ *
+ * @param pageUserAppletsBackstageDTO 查询参数
+ * @return 分页集合
+ */
+ @Override
+ public R pageUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
+ Page page = new Page<>();
+ Long pageNum = pageUserAppletsBackstageDTO.getPageNum();
+ Long pageSize = pageUserAppletsBackstageDTO.getPageSize();
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<SysUserVO> iPage = userDao.pageUserAppletsBackstage(page, pageUserAppletsBackstageDTO);
+ return R.ok(iPage);
+ }
+
+ /**
+ * 编辑用户状态
+ *
+ * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用
+ * @return 编辑结果
+ */
+ @Override
+ public R putUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
+ Long userId = pageUserAppletsBackstageDTO.getUserId();
+ Integer status = pageUserAppletsBackstageDTO.getStatus();
+ SysUserDO sysUserDO = new SysUserDO();
+ sysUserDO.setUserId(userId);
+ sysUserDO.setStatus(status);
+ int update = userDao.updateById(sysUserDO);
+ if (update > 0) {
+ return R.ok();
+ }
+ return R.fail("用户不存在");
+ }
+
+ /**
+ * 调试接口--清除昵称、社区、小区
+ *
+ * @param userId 登录用户id
+ * @return 清除结果
+ */
+ @Override
+ public R deleteUserTest(Long userId) {
+ int num = userDao.deleteUserTest(userId);
+ if (num > 0) {
+ return R.ok();
+ }
+ return R.fail("清除失败");
+ }
+
+ /**
+ * 用户协议和隐私政策
+ *
+ * @param type 所属app 1居民端app 2网格员端app 3商家端app
+ * @return 协议内容
+ */
+ @Override
+ public R userAgreement(int type) {
+ SysUserAgreementDO sysUserAgreementDO = sysUserAgreementDAO.selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type));
+ return R.ok(sysUserAgreementDO);
+ }
+
+ /**
+ * 意见反馈
+ *
+ * @param sysUserFeedbackDTO 反馈内容
+ * @return 反馈结果
+ */
+ @Override
+ 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();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 分页通知列表
+ *
+ * @param pageDTO 分页参数
+ * @return 分页结果
+ */
+ @Override
+ public R pageNotice(PageDTO pageDTO) {
+ Long userId = pageDTO.getUserId();
+ Integer type = pageDTO.getType();
+ int integer = 0;
+ if (null != type && type.intValue() > 0) {
+ integer = sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0).eq(SysUserNoticeDO::getType, type));
+ } else {
+ integer = sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0));
+ }
+ Page page = new Page<>();
+ Long pageNum = pageDTO.getPageNum();
+ Long pageSize = pageDTO.getPageSize();
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<SysUserNoticeVO> iPage = userDao.pageNotice(page, pageDTO);
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("page", iPage);
+ map.put("unreadNum", integer);
+ return R.ok(map);
+ }
+
+ /**
+ * 通知已读
+ *
+ * @param noticeReadDTO 通知已读
+ * @return 修改状态
+ */
+ @Override
+ public R putNotice(NoticeReadDTO noticeReadDTO) {
+ Integer all = noticeReadDTO.getAll();
+ Long userId = noticeReadDTO.getUserId();
+ int num = 0;
+ SysUserNoticeDO sysUserNoticeDO = new SysUserNoticeDO();
+ if (null != all && 1 == all.intValue()) {
+ sysUserNoticeDO.setStatus(1);
+ num = sysUserNoticeDAO.update(sysUserNoticeDO, new UpdateWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0));
+ } else {
+ sysUserNoticeDO.setId(noticeReadDTO.getId());
+ sysUserNoticeDO.setStatus(1);
+ num = sysUserNoticeDAO.updateById(sysUserNoticeDO);
+ }
+ if (num > 0) {
+ return R.ok();
+ }
+ return R.fail("通知不存在");
+ }
+
+ /**
+ * 分页查询用户意见反馈
+ *
+ * @param pageFeedBackDTO 分页查询参数
+ * @return 意见集合
+ */
+ @Override
+ public R pageFeedback(PageFeedBackDTO pageFeedBackDTO) {
+ Page page = new Page<>();
+ Long pageNum = pageFeedBackDTO.getPageNum();
+ Long pageSize = pageFeedBackDTO.getPageSize();
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<SysUserFeedbackVO> iPage = sysUserFeedbackDAO.pageFeedback(page, pageFeedBackDTO);
+ return R.ok(iPage);
+ }
+
+ /**
+ * 未读消息汇总
+ *
+ * @param userId 登录用户信息
+ * @return 未读汇总
+ */
+ @Override
+ public R noticeUnreadNum(Long userId) {
+ NoticeUnReadVO noticeUnReadVO = sysUserNoticeDAO.noticeUnreadNum(userId);
+ List<SysUserNoticeVO> sysUserNoticeVOList = new ArrayList<>();
+ List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt));
+ if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) {
+ List<Integer> typeList = new ArrayList<>(4);
+ sysUserNoticeDOS.forEach(sysUserNoticeDO -> {
+ Integer type = sysUserNoticeDO.getType();
+ if (!typeList.contains(type)) {
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ BeanUtils.copyProperties(sysUserNoticeDO, sysUserNoticeVO);
+ sysUserNoticeVOList.add(sysUserNoticeVO);
+ typeList.add(type);
+ }
+ });
+ }
+ noticeUnReadVO.setSysUserNoticeVOList(sysUserNoticeVOList);
+ return R.ok(noticeUnReadVO);
+ }
+
+ /**
+ * 反馈意见详情
+ *
+ * @param id 反馈主键
+ * @return 反馈详情
+ */
+ @Override
+ public R detailFeedback(Long id) {
+ SysUserFeedbackVO sysUserFeedbackVO = sysUserFeedbackDAO.detailFeedback(id);
+ return R.ok(sysUserFeedbackVO);
+ }
+
+ /**
+ * 运营小程序后台数据看板
+ *
+ * @return 展示数据
+ */
+ @Override
+ public R dataKanban() {
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
+ List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder();
+
+ List<String> communityUserX = new ArrayList<>();
+ List<Integer> communityUserY = new ArrayList<>();
+ List<String> communityActiveUserX = new ArrayList<>();
+ List<Integer> communityActiveUserY = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
+ dataKanbanDTOS.forEach(dataKanbanDTO -> {
+ communityUserX.add(dataKanbanDTO.getName());
+ communityUserY.add(dataKanbanDTO.getNum());
+ });
+ }
+// 获取最近七天数据
+ List<Date> serverndays = this.getServenDays();
+ serverndays.forEach(date -> {
+ // 查询社区活动数量
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityActiveUserOrder(date);
+ communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
+ communityActiveUserY.add(dataKanbanDTO.getNum());
+ });
+ indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
+ indexDataKanbanVO.setCommunityActiveUserY(communityActiveUserY);
+ indexDataKanbanVO.setCommunityUserX(communityUserX);
+ indexDataKanbanVO.setCommunityUserY(communityUserY);
+ return R.ok(indexDataKanbanVO);
+ }
+
+ /**
+ * 获取最近七天数据
+ *
+ * @return
+ */
+ private List<Date> getServenDays() {
+ List<Date> dates = new ArrayList<>();
+ Date date = new Date();
+ for (int i = 6; i >= 0; i--) {
+ Date date1 = DateUtils.addDays(date, -i);
+ dates.add(date1);
+ }
+ return dates;
+ }
+
+ /**
+ * 社区管理后台数据看板
+ *
+ * @param communityId 社区id
+ * @return 看板用户数据
+ */
+ @Override
+ public R indexDataCommunityBackstage(Long communityId) {
+ IndexDataVO indexDataVO = userDao.indexDataCommunityBackstage(communityId);
+ //查询后台党员数量
+ return R.ok(indexDataVO);
+ }
+
+ /**
+ * 定时任务维护用户持续登录时间
+ *
+ * @return 维护结果
+ */
+ @Override
+ public R timedTaskContinuousLandingDays() {
+ int num = userDao.timedTaskContinuousLandingDays();
+ if (num > 0) {
+ log.info("定时任务维护用户持续登录时间，维护用户数量【{}】", num);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 新增用户通知
+ *
+ * @param sysUserNoticeVO 通知内容
+ * @return 新增结果
+ */
+ @Override
+ public R addNotice(SysUserNoticeVO sysUserNoticeVO) {
+ SysUserNoticeDO sysUserNoticeDO = new SysUserNoticeDO();
+ BeanUtils.copyProperties(sysUserNoticeVO, sysUserNoticeDO);
+ int insert = sysUserNoticeDAO.insert(sysUserNoticeDO);
+ if (insert > 0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 修改用户的党员状态
+ *
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserIsPartymember(String idCard) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1));
+ if(sysUserDO != null){
+ sysUserDO.setIsPartymember(1);
+ int updated = userDao.updateById(sysUserDO);
+ if(updated>0){
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
+ log.info("新增党员修改用户党员状态成功 身份证号【{}】", idCard);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 修改用户的党员状态
+ *
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserNotPartymember(String idCard) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1));
+ if(sysUserDO != null){
+ sysUserDO.setIsPartymember(0);
+ int updated = userDao.updateById(sysUserDO);
+ if(updated>0) {
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
+ log.info("新增党员修改用户为非党员状态成功 身份证号【{}】", idCard);
+ }
+ return R.ok();
+ }
+
+
+ /**
+ * 获取各种协议
+ *
+ * @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
+ * @return 协议内容
+ */
+ @Override
+ public R agreement(Integer type) {
+ SysUserAgreementDO sysUserAgreementDO = sysUserAgreementDAO.selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type));
+ if (ObjectUtils.isEmpty(sysUserAgreementDO)) {
+ return R.fail("协议不存在");
+ }
+ SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
+ BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
+ return R.ok(sysUserAgreementVO);
+ }
+
+ /**
+ * 维护用户最后登录时间
+ *
+ * @param userId 用户主键
+ * @return 维护结果
+ */
+ @Override
+ public R putUserLastLoginTime(Long userId) {
+ SysUserDO sysUserDO = new SysUserDO();
+ sysUserDO.setUserId(userId);
+ sysUserDO.setLastLoginTime(new Date());
+ int update = userDao.updateById(sysUserDO);
+ if (update > 0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 删除意见反馈
+ *
+ * @param id 主键
+ * @return 删除结果
+ */
+ @Override
+ public R deleteFeedback(Long id) {
+ int delete = sysUserFeedbackDAO.deleteById(id);
+ if (delete > 0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 校验小区是否存在
+ *
+ * @param areaName 小区名字
+ * @return 校验结果
+ */
+ @Override
+ public R checkAereaName(String areaName) {
+ Integer num = userDao.selectCountArea(areaName);
+ if (num > 0) {
+ Integer integer = userDao.selectCountHouse(areaName);
+ if (integer > 0) {
+ return R.ok();
+ } else {
+ return R.fail("小区房屋信息未创建,请先在社区平台添加房屋信息");
+ }
+ } else {
+ return R.fail("小区不存在,请先在社区平台添加小区");
+ }
+ }
+
+ /**
+ * 社区人员详情包括导入人员
+ *
+ * @param userId 人员id
+ * @return CommunityUserInfoVO
+ */
+ @Override
+ public CommunityUserInfoVO detailUserComunity(Long userId) {
+ CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
+ SysUserDO sysUserDO = userDao.selectById(userId);
+ if (!ObjectUtils.isEmpty(sysUserDO)) {
+ String idCard = sysUserDO.getIdCard();
+ if (!ObjectUtils.isEmpty(idCard)) {
+ communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
+ communityUserInfoVO.setBirthday(sysUserDO.getBirthday());
+ communityUserInfoVO.setIdCard(idCard);
+ }
+ communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
+ communityUserInfoVO.setCardPhotoBack(sysUserDO.getCardPhotoBack());
+ communityUserInfoVO.setCardPhotoFront(sysUserDO.getCardPhotoFront());
+ communityUserInfoVO.setFamilyBook(sysUserDO.getFamilyBook());
+ communityUserInfoVO.setName(sysUserDO.getName());
+ String phone = sysUserDO.getPhone();
+ communityUserInfoVO.setPhone(phone);
+ communityUserInfoVO.setSex(sysUserDO.getSex());
+ communityUserInfoVO.setTags(sysUserDO.getTags());
+ communityUserInfoVO.setUserId(userId);
+ ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
+ if (!ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
+ communityUserInfoVO.setVolunteerCreateAt(comMngVolunteerMngVO.getCreateAt());
+ }
+ Integer isPartymember = sysUserDO.getIsPartymember();
+ if (isPartymember.intValue() == 1) {
+ communityUserInfoVO.setPoliticalOutlook(1);
+ } else {
+ communityUserInfoVO.setPoliticalOutlook(3);
+ }
+ communityUserInfoVO.setIsVolunteer(sysUserDO.getIsVolunteer());
+ List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
+ if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
+ List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
+ comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
+ ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
+ BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
+ comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
+ });
+ communityUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+ }
+ 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).eq(SysUserDO::getType,1));
+ 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("123456");
- System.out.println(encode);
+// String encode = new BCryptPasswordEncoder().encode("lbsq123456");
+// System.out.println(encode);
+
+ List<Date> dates = new ArrayList<>();
+ Date date = new Date();
+ for (int i = 6; i >= 0; i--) {
+ Date date1 = DateUtils.addDays(date, -i);
+ dates.add(date1);
+ }
+ System.out.println(dates);
+
+// BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+// 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("sys_flag", 1).or().eq("community_id", communityId));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+ return R.ok(list);
+ }
+
+ @Override
+ public R getSysUserVOByAccount(String account, Integer type) {
+ LambdaQueryWrapper<SysUserDO> query = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, account);
+ query.eq(SysUserDO::getType, type);
+ SysUserDO sysUserDO = userDao.selectOne(query);
+ if (ObjectUtils.isEmpty(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ SysUserVO sysUserVO = new SysUserVO();
+ BeanUtils.copyProperties(sysUserDO, sysUserVO);
+ return R.ok(sysUserVO);
+ }
+
+ /**
+ * 新增SysUser
+ *
+ * @param storeVO 请求参数
+ * @return 新增结果
+ */
+ @Override
+ public R addSysUser(ShopStoreVO storeVO) {
+
+ SysUserDO sysUserDO = new SysUserDO();
+ Long communityId = 0L;
+ //新增社区高级管理员角色
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ sysRoleDO.setCommunityId(0L);
+ sysRoleDO.setRoleName(storeVO.getName());
+ sysRoleDO.setRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(storeVO.getLoginUserId());
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert < 0) {
+ return R.fail();
+ }
+ //新角色设置所有权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(communityId);
+ menuRoleVO.setRoleId(sysRoleDO.getRoleId());
+ this.putMenuRole(menuRoleVO);
+
+ //sys_user 表
+ String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
+ BeanUtils.copyProperties(storeVO, sysUserDO);
+ sysUserDO.setAccount(storeVO.getStoreAccount());
+ sysUserDO.setType(5);
+ sysUserDO.setAreaId(null);
+ sysUserDO.setStatus(1);
+ sysUserDO.setPhone(storeVO.getPhone());
+ sysUserDO.setName(storeVO.getContacts());
+ sysUserDO.setPassword(encode);
+ try {
+ insert = userDao.insert(sysUserDO);
+ //把SysUserId赋值给店铺
+ if (sysUserDO.getUserId() != null) {
+ userDao.updateStoreByPhone(storeVO.getPhone(), sysUserDO.getUserId());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("新增后台用户报错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ userDao.deleteStoreByPhoneAndStatus(storeVO.getPhone());
+ roleDAO.deleteByRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
+ return R.fail("手机号已经存在");
+ } else if (e.getMessage().contains("union_account_type")) {
+ return R.fail("账户已经存在");
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 修改SysUser用户信息
+ *
+ * @param storeVO 请求参数
+ * @return 修改结果
+ */
+ @Override
+ public R editSysUser(ShopStoreVO storeVO) {
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, storeVO.getPhone())
+ .eq(SysUserDO::getType, 5));
+ if (sysUserDO1 == null) {
+ return R.fail("未查询到后台管理用户！");
+ }
+ String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
+ sysUserDO1.setPassword(encode);
+ if (userDao.updateById(sysUserDO1) > 0) {
+ return R.ok();
+ }
+ return R.fail("密码修改失败");
+ }
+
+ /**
+ * 修改用户小程序首页活动提示
+ *
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ public R editUserTips(SysUserEditTipsDTO userEditTipsDTO) {
+ //查询用户信息
+ SysUserDO userDO = userDao.selectById(userEditTipsDTO.getUserId());
+ if (userDO == null) {
+ return R.fail("未查询到用户信息");
+ }
+ //修改用户信息
+ userDO.setIsTips(userEditTipsDTO.getIsTips());
+ userDao.updateById(userDO);
+ if (userDao.updateById(userDO) > 0) {
+ return R.ok();
+ } else {
+ return R.fail();
+ }
+ }
+
+ @Override
+ public R getUserArchives(Long userId) {
+ //查询用户信息
+ SysUserDO userDO = userDao.selectById(userId);
+ if (userDO == null) {
+ return R.fail("未查询到用户信息");
+ }
+ UserArchivesVO userArchivesVO = new UserArchivesVO();
+ BeanUtils.copyProperties(userDO, userArchivesVO);
+ userArchivesVO.setUserId(userDO.getUserId());
+ return R.ok(userArchivesVO);
+ }
+
+ @Override
+ public R updateUserArchives(UpdateUserArchivesVO userArchivesVO) {
+ if(userArchivesVO.getUserId()==null){
+ return R.fail("未查询到用户信息");
+ }
+ userDao.updateUserArchives(userArchivesVO);
+ return R.ok();
+ }
+
+ /**
+ * 修改app用户密码
+ * @param userInfoAppDTO 请求参数
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO){
+ if(userInfoAppDTO.getOldPassword().equals(userInfoAppDTO.getNewPassword())){
+ return R.fail("新密码不可与原密码相同");
+ }
+ //查询用户信息
+ SysUserDO userDO = userDao.selectById(userInfoAppDTO.getUserId());
+ if (userDO == null) {
+ return R.fail("未查询到用户信息");
+ }
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+ if (!passwordEncoder.matches(userInfoAppDTO.getOldPassword(),userDO.getPassword())) {
+ return R.fail("原密码错误");
+ }
+ if(!userInfoAppDTO.getNewPassword().equals(userInfoAppDTO.getConfirmPassword())){
+ return R.fail("两次输入的新密码不一致");
+ }
+ userDO.setPassword(passwordEncoder.encode(userInfoAppDTO.getNewPassword()));
+ if (userDao.updateById(userDO) > 0) {
+ return R.ok();
+ } else {
+ 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){
+ this.userDao.addLcMember(eventGridMemberAddDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ }
+
+ //网格员关联楼栋
+ 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
+ gridMember.setLcMemberId(this.userDao.getLcMemberId(gridMember.getUserId()));
+
+ //查询网格员关联楼栋信息
+ 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){
+ //关联现有的网格员信息
+ this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
+ }
+ //清除原网格员与楼栋关联关系
+ 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();
+ }
}
}
--
Gitblit v1.7.1