From dad5e5fd2abbf5d77d23f1b9a4500a9ae9bf274d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:27:45 +0800
Subject: [PATCH] 仁和东区代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 2102 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 1,701 insertions(+), 401 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 e111781..99c1530 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
@@ -1,34 +1,24 @@
package com.panzhihua.service_user.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.UserConstants;
-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.user.EexcelUserDTO;
-import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
-import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
-import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
-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.partybuilding.ActivityManagerVO;
-import com.panzhihua.common.model.vos.user.*;
-import com.panzhihua.common.utlis.IdCard;
-import com.panzhihua.common.utlis.RealNameUtil;
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
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.UserService;
-import lombok.extern.slf4j.Slf4j;
+import com.panzhihua.service_user.entity.SysAppConfig;
+import com.panzhihua.service_user.entity.SysTemplateConfig;
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;
@@ -36,11 +26,91 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.ExportUserDTO;
+import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditAdminDTO;
+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.EexcelUserDTO;
+import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
+import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
+import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.model.vos.AppletUserInfoVO;
+import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
+import com.panzhihua.common.model.vos.IndexDataKanbanVO;
+import com.panzhihua.common.model.vos.IndexDataVO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.community.IndexUserCommunityVo;
+import com.panzhihua.common.model.vos.community.IndexUserStatisticsVo;
+import com.panzhihua.common.model.vos.community.IndexUserStreetVo;
+import com.panzhihua.common.model.vos.grid.GridMemberVO;
+import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
+import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.model.vos.user.ChangePasswordVO;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
+import com.panzhihua.common.model.vos.user.CommunityUserInfoVO;
+import com.panzhihua.common.model.vos.user.MenuRoleVO;
+import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
+import com.panzhihua.common.model.vos.user.SysOperLogVO;
+import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
+import com.panzhihua.common.model.vos.user.SysUserFeedbackVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
+import com.panzhihua.common.model.vos.user.UserArchivesVO;
+import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.utlis.IdCard;
+import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.Snowflake;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.utlis.WxUtil;
+import com.panzhihua.common.utlis.WxXCXTempSend;
+import com.panzhihua.service_user.model.dos.ComActFourMember;
+import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
+import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
+import com.panzhihua.service_user.model.dos.EventGridMemberBuildingRelationDO;
+import com.panzhihua.service_user.model.dos.LcCompareCodeMemberDO;
+import com.panzhihua.service_user.model.dos.SysMenuDO;
+import com.panzhihua.service_user.model.dos.SysOperLogDO;
+import com.panzhihua.service_user.model.dos.SysRoleDO;
+import com.panzhihua.service_user.model.dos.SysRoleMenuDO;
+import com.panzhihua.service_user.model.dos.SysUserAgreementDO;
+import com.panzhihua.service_user.model.dos.SysUserDO;
+import com.panzhihua.service_user.model.dos.SysUserFeedbackDO;
+import com.panzhihua.service_user.model.dos.SysUserInputDO;
+import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
+import com.panzhihua.service_user.model.dos.SysUserRoleDO;
+import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
+import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
+import com.panzhihua.service_user.service.UserService;
+
+import cn.hutool.core.util.IdcardUtil;
+import lombok.extern.slf4j.Slf4j;
+
+// import com.panzhihua.common.service.grid.GridService;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -77,19 +147,53 @@
private SysMenuDAO sysMenuDAO;
@Resource
private SysUserInputDAO sysUserInputDAO;
+ @Resource
+ private EventGridMemberBuildingRelationService buildingRelationService;
+ @Resource
+ private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
+ @Resource
+ private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
+ @Resource
+ private ComActFourMemberDao comActFourMemberDao;
+ @Resource
+ private SysAppConfigDao sysAppConfigDao;
+ @Resource
+ private SysTemplateConfigDao sysTemplateConfigDao;
+ // @Resource
+ // private GridService gridService;
+ public static void main(String[] args) {
+ // 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);
+ }
/**
* 小程序微信用户信息更新
*
- * @param openid 小程序唯一ID
- * @param sessionKey 会话密钥
- * @param unionid 用户在开放平台的唯一标识符
+ * @param openid
+ * 小程序唯一ID
+ * @param sessionKey
+ * 会话密钥
+ * @param unionid
+ * 用户在开放平台的唯一标识符
* @return token
*/
@Override
public R updateInsertUser(String openid, String sessionKey, String unionid) {
- SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid));
+ SysUserDO sysUserDO =
+ userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid));
boolean empty = ObjectUtils.isEmpty(sysUserDO);
int num = 0;
Date date = new Date();
@@ -123,10 +227,14 @@
/**
* 维护小程序用户基本信息 头像 昵称 性别
*
- * @param userId 数据库用户ID
- * @param nickName 昵称
- * @param gender 性别
- * @param avatarUrl 头像
+ * @param userId
+ * 数据库用户ID
+ * @param nickName
+ * 昵称
+ * @param gender
+ * 性别
+ * @param avatarUrl
+ * 头像
* @return 维护结果
*/
@Override
@@ -147,8 +255,10 @@
/**
* 维护微信用户手机号
*
- * @param userId 数据库ID
- * @param purePhoneNumber 没有区号的手机号
+ * @param userId
+ * 数据库ID
+ * @param purePhoneNumber
+ * 没有区号的手机号
* @return 维护结果
*/
@Override
@@ -157,10 +267,10 @@
sysUserDO.setPhone(purePhoneNumber);
sysUserDO.setUserId(userId);
userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
- userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
+ userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
int i = userDao.updateById(sysUserDO);
if (i > 0) {
- return R.ok();
+ return R.ok(purePhoneNumber);
} else {
return R.fail("维护微信手机号失败");
}
@@ -169,33 +279,50 @@
/**
* 认证中心获取平台用户信息
*
- * @param name 登录账户
- * @param type 用户类型 用户类型 1 小程序 2 运营平台 3 社区平台
+ * @param name
+ * 登录账户
+ * @param type
+ * 用户类型 用户类型 1 小程序 2 运营平台 3 社区平台
* @return 用户基本信息、角色
*/
@Override
public R<LoginUserInfoVO> getUserInfo(String name, int type) {
SysUserDO sysUserDO = null;
if (1 == type) {
- sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name));
+ 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);// 暂时 身份证判断实名制
+ if(sysUserDO.getCommunityId()!=null){
+ ComActVO comActVO = userDao.selectCommunity(sysUserDO.getCommunityId());
+ loginUserInfoVO.setCommunityId(sysUserDO.getCommunityId());
+ if(comActVO!=null){
+ loginUserInfoVO.setComActVO(comActVO);
+ SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
+ if(sysAppConfig!=null){
+ loginUserInfoVO.setAppId(sysAppConfig.getAppId());
+ loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
+ }
+ }
+ }
+ List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
+ Set<String> set = new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
roleDOList.forEach(sysRoleDO -> {
set.add(sysRoleDO.getRoleKey());
@@ -207,7 +334,8 @@
/**
* 三端获取用户信息
*
- * @param userId 用户ID
+ * @param userId
+ * 用户ID
* @return 用户基本信息、角色
*/
@Override
@@ -217,34 +345,75 @@
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);
+ loginUserInfoVO.setIsFourMember(2);
+ loginUserInfoVO.setIsCommunityWorker(2);
+ loginUserInfoVO.setIsPropertyWorker(2);
+ // 志愿者状态
String phone = sysUserDO.getPhone();
+ Long userCommunityId = sysUserDO.getCommunityId();
+ if (userCommunityId != null) {
+ ComActVO comActVO = userDao.selectCommunity(userCommunityId);
+ if (comActVO != null) {
+ loginUserInfoVO.setCommunityName(comActVO.getName());
+ loginUserInfoVO.setComActVO(comActVO);
+ SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
+ if(sysAppConfig!=null){
+ loginUserInfoVO.setAppId(sysAppConfig.getAppId());
+ loginUserInfoVO.setAppSecret(sysAppConfig.getSecret());
+ }
+ }
+ }
if (!ObjectUtils.isEmpty(phone)) {
- ComMngVolunteerMngVO comMngVolunteerMngVO= userDao.selectVolunteerMngByPhone(phone);
+ ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
loginUserInfoVO.setVolunteerStatus(0);
- }else{
+ } else {
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
}
+ //是否四长四员
+ Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
+ if(countFourMember>0){
+ loginUserInfoVO.setIsFourMember(1);
+ }
+ //是否是社区物业人员
+ int countPropertyWorker = userDao.countPropertyWorker(Long.parseLong(userId), userCommunityId);
+ if (countPropertyWorker > 0) {
+ loginUserInfoVO.setIsPropertyWorker(1);
+ }
+ // 是否是"管理员"或者 本社区 "社区团队"、"党委成员"
+ 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);
+ loginUserInfoVO.setIsCommunityWorker(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);
}
/**
* 修改用户登录密码
*
- * @param changePasswordVO 新密码
+ * @param changePasswordVO
+ * 新密码
* @return 修改结果
*/
@Override
@@ -258,16 +427,16 @@
return R.fail("新密码与原密码不能相同");
}
BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
- if( !encoder.matches(oldPassword,dataPassowrd)){
+ if (!encoder.matches(oldPassword, dataPassowrd)) {
return R.fail("原密码错误");
}
- SysUserDO sysUserDO=new SysUserDO();
+ 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();
@@ -276,22 +445,25 @@
/**
* 某社区后台人员查询
*
- * @param param 名字
- * @param communityId 社区id
+ * @param param
+ * 名字
+ * @param communityId
+ * 社区id
* @return 人员集合
*/
@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);
@@ -301,9 +473,24 @@
}
/**
+ * 微心愿搜索社区团队人员列表
+ *
+ * @param param
+ * 请求参数
+ * @param communityId
+ * 社区id
+ * @return 社区团队人员列表
+ */
+ @Override
+ public R listActivityManager2(String param, Long communityId) {
+ return R.ok(userDao.getServiceTeamList(param, communityId));
+ }
+
+ /**
* 分页查询人脸识别
*
- * @param loginUserInfoVO 查询参数
+ * @param loginUserInfoVO
+ * 查询参数
* @return 分页集合
*/
@Override
@@ -311,10 +498,10 @@
Page page = new Page<>();
Long pageNum = loginUserInfoVO.getPageNum();
Long pageSize = loginUserInfoVO.getPageSize();
- if (null==pageNum||0==pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (null==pageSize||0==pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
@@ -326,16 +513,17 @@
/**
* 编辑人脸采集数据通过、驳回、删除
*
- * @param loginUserInfoVO 操作信息
+ * @param loginUserInfoVO
+ * 操作信息
* @return 操作结果
*/
@Override
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;
@@ -347,14 +535,14 @@
default:
break;
}
- int num=0;
- if (operationType==3) {
-// num=userDao.deleteById(userId);
- num=userDao.updateFaceState(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();
@@ -363,23 +551,49 @@
/**
* 分页查询人口管理
*
- * @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()));
+
+ if (StringUtils.isNotEmpty(record.getTags())) {
+ StringBuffer sb = new StringBuffer();
+ sb.append(record.getTags() + ",");
+ if (record.getIsPartymember().equals(1)) {
+ if (!sb.toString().contains("党员")){
+ sb.append("党员,");
+ }
+ }
+ if (record.getIsVolunteer().equals(1)) {
+ if (!sb.toString().contains("志愿者")) {
+ sb.append("志愿者,");
+ }
+ }
+ String tags = sb.toString();
+ record.setTags(tags.substring(0, tags.length() - 1));
+ }else {
+ StringBuffer sb = new StringBuffer();
+ if (record.getIsPartymember().equals(1)) {
+ sb.append("党员,");
+ }
+ if (record.getIsVolunteer().equals(1)) {
+ sb.append("志愿者,");
+ }
+ String tags = sb.toString();
+ if (tags.length() > 0) {
+ record.setTags(tags.substring(0, tags.length() - 1));
+ } else {
+ record.setTags("无");
+ }
+ }
+ });
return R.ok(iPage);
}
@@ -390,66 +604,72 @@
*/
@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<ComMngUserTagDO>()
+ .eq(ComMngUserTagDO::getSysFlag,1));
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
+ * @param userId
+ * 用户id
* @return 人员详情
*/
@Override
public R detailUser(Long userId) {
- LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
- if(userId<100000000l){
+ 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));
+
+ 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<>();
+ List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
- ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
- BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
+ ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
+ BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
});
loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
}
- }else{
- //导入社区人员
+ } else {
+ // 导入社区人员
SysUserInputDO sysUserInputDO = sysUserInputDAO.selectById(userId - 100000000);
if (ObjectUtils.isEmpty(sysUserInputDO)) {
return R.fail("人员不存在");
}
String name1 = sysUserInputDO.getName();
- BeanUtils.copyProperties(sysUserInputDO,loginUserInfoVO);
+ 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));
+ 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<>();
+ 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(sysUserInputDO1.getIdCard());
+ ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
+ comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard()));
comMngFamilyInfoVO.setName(name);
- comMngFamilyInfoVO.setPhone(sysUserInputDO1.getPhone());
- if (isRent.intValue()==0) {
+ comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone()));
+ if (isRent.intValue() == 0) {
comMngFamilyInfoVO.setRelationship("家人");
- }else{
+ } else {
comMngFamilyInfoVO.setRelationship("合租");
}
comMngFamilyInfoVO.setAge(IdCard.IdNOToAge(sysUserInputDO1.getIdCard()));
@@ -459,26 +679,34 @@
}
}
- ComActVO comActVO=userDao.selectCommunity(loginUserInfoVO.getCommunityId());
+ ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
if (!ObjectUtils.isEmpty(comActVO)) {
loginUserInfoVO.setCommunityName(comActVO.getName());
}
+ //是否是社区物业人员
+ int countPropertyWorker = userDao.countPropertyWorker(userId, loginUserInfoVO.getCommunityId());
+ loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0);
+ loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
+ loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
return R.ok(loginUserInfoVO);
}
/**
* 设置用户标签
*
- * @param loginUserInfoVO 标签信息
+ * @param loginUserInfoVO
+ * 标签信息
* @return 设置结果
*/
@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 (StringUtils.isNotEmpty(loginUserInfoVO.getTags()) && !"无".equals(loginUserInfoVO.getTags())) {
+ sysUserDO.setTags(loginUserInfoVO.getTags());
+ }
+ int update = userDao.putUserTag(sysUserDO);
+ if (update > 0) {
return R.ok();
}
return R.fail();
@@ -487,16 +715,70 @@
/**
* 修改用户志愿者状态
*
- * @param phone 志愿者手机号
+ * @param phone
+ * 志愿者手机号
* @param type
*/
@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();
}
@@ -504,21 +786,23 @@
/**
* 用户绑定社区、小区
*
- * @param loginUserInfoVO 社区小区数据
+ * @param loginUserInfoVO
+ * 社区小区数据
* @return 绑定结果
*/
@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.ok(sysUserDO);
}
return R.fail();
}
@@ -526,33 +810,72 @@
/**
* 用户实名认证
*
- * @param loginUserInfoVO 认证数据
+ * @param loginUserInfoVO
+ * 认证数据
* @return 认证结果
*/
@Override
public R putUserAuthentication(LoginUserInfoVO loginUserInfoVO) {
- //接入第三方实名认证
+ // 接入第三方实名认证
String idCard = loginUserInfoVO.getIdCard();
String name = loginUserInfoVO.getName();
- boolean b = RealNameUtil.authentication(idCard, name);
- if (!b) {
- return R.fail("身份认证失败：公安系统认证错误");
- }
- SysUserDO sysUserDO=new SysUserDO();
+ 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(loginUserInfoVO.getSex());
- sysUserDO.setBirthday(loginUserInfoVO.getBirthday());
- sysUserDO.setJob(loginUserInfoVO.getJob());
+ // 通过身份证号判断性别以及出生日期
+ sysUserDO.setSex(IdCard.sex(idCard));
+ sysUserDO.setBirthday(IdcardUtil.getBirthDate(idCard));
+ 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));
+ 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());
+ }
+
+ SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
+ if (user != null) {
+ // 实名认证成功推送订阅消息给用户
+ try {
+ WxXCXTempSend util = new WxXCXTempSend();
+ String accessToken = util.getAppAccessToken();
+ SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, loginUserInfoVO.getComActVO()).eq(SysTemplateConfig::getType,5));
+ // 用户实名认证推送消息
+ WxUtil.sendSubscribeRZSH(user.getOpenid(), accessToken, "实名认证",
+ com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(), "认证成功",sysTemplateConfig.getTemplateId());
+ } catch (Exception e) {
+ log.error("推送用户订阅消息失败，失败原因：" + e.getMessage());
+ }
+ }
return R.ok();
}
return R.fail();
@@ -561,7 +884,8 @@
/**
* 修改用户手机号
*
- * @param userPhoneVO 手机号信息
+ * @param userPhoneVO
+ * 手机号信息
* @return 修改结果
*/
@Override
@@ -579,24 +903,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)) {
- if(!smsCode.equals("777333")){
+ 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();
@@ -605,51 +929,52 @@
/**
* 修改用户信息
*
- * @param loginUserInfoVO 修改内容
+ * @param loginUserInfoVO
+ * 修改内容
* @return 修改结果
*/
@Override
public R putUser(LoginUserInfoVO loginUserInfoVO) {
Integer faceState = loginUserInfoVO.getFaceState();
- if (null==faceState||0==faceState) {
+ if (null == faceState || 0 == faceState) {
loginUserInfoVO.setFaceState(null);
}
Integer isPartymember = loginUserInfoVO.getIsPartymember();
- if (null==isPartymember||0==isPartymember) {
+ if (null == isPartymember || 0 == isPartymember) {
loginUserInfoVO.setIsPartymember(null);
}
Integer isVolunteer = loginUserInfoVO.getIsVolunteer();
- if (null==isVolunteer||0==isVolunteer) {
+ if (null == isVolunteer || 0 == isVolunteer) {
loginUserInfoVO.setIsVolunteer(null);
}
Integer operationType = loginUserInfoVO.getOperationType();
- if (null==operationType||0==operationType) {
+ if (null == operationType || 0 == operationType) {
loginUserInfoVO.setOperationType(null);
}
Integer sex = loginUserInfoVO.getSex();
- if (null==sex||0==sex) {
+ if (null == sex || 0 == sex) {
loginUserInfoVO.setSex(null);
}
Integer status = loginUserInfoVO.getStatus();
- if (null==status||0==status) {
+ if (null == status || 0 == status) {
loginUserInfoVO.setStatus(null);
}
Integer type = loginUserInfoVO.getType();
- if (null==type||0==type) {
+ if (null == type || 0 == type) {
loginUserInfoVO.setType(null);
}
Long communityId = loginUserInfoVO.getCommunityId();
- if (null==communityId||0==communityId) {
+ 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);
+ 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();
@@ -658,17 +983,20 @@
/**
* 家庭成员列表
*
- * @param userId 登录用户
+ * @param userId
+ * 登录用户
* @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);
});
}
@@ -678,19 +1006,23 @@
/**
* 新增家庭成员
*
- * @param comMngFamilyInfoVO 家庭成员基本信息
+ * @param comMngFamilyInfoVO
+ * 家庭成员基本信息
* @return 增加结果
*/
@Override
public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
- 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()));
+ 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();
@@ -699,15 +1031,17 @@
/**
* 编辑家庭成员
*
- * @param comMngFamilyInfoVO 家庭成员信息
+ * @param comMngFamilyInfoVO
+ * 家庭成员信息
* @return 编辑结果
*/
@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();
@@ -716,29 +1050,37 @@
/**
* 新增运营、社区后台账户
*
- * @param administratorsUserVO 账户信息
+ * @param administratorsUserVO
+ * 账户信息
* @return 新增结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {
- SysUserDO sysUserDO=new SysUserDO();
+ SysUserDO sysUserDO = new SysUserDO();
Long roleId = administratorsUserVO.getRoleId();
- Long communityId = administratorsUserVO.getCommunityId();
- if (roleId.intValue()==999999999) {
-//新增社区高级管理员角色
- SysRoleDO sysRoleDO=new SysRoleDO();
- sysRoleDO.setCommunityId(communityId);
- sysRoleDO.setRoleName("超级管理员");
- sysRoleDO.setRoleKey("chaojiguanliyuan"+communityId);
+ 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();
+ 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);
@@ -751,29 +1093,98 @@
}
String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
administratorsUserVO.setPassword(encode);
- BeanUtils.copyProperties(administratorsUserVO,sysUserDO);
+ BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
int insert = 0;
try {
insert = userDao.insert(sysUserDO);
} catch (Exception e) {
e.printStackTrace();
- log.error("新增后台用户报错【{}】",e.getMessage());
+ log.error("新增后台用户报错【{}】", e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
throw new ServiceException("手机号已经存在");
- }else if(e.getMessage().contains("union_account_type")){
+ } else if (e.getMessage().contains("union_account_type")) {
+ throw new ServiceException("账户已经存在");
+ }else if(e.getMessage().contains("23000")){
+ 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("账户已经存在");
+ }else if(e.getMessage().contains("23000")){
+ 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(userId);
+ }
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
+ SysUserDO sysUserDO = new SysUserDO();
+ Long roleId = administratorsUserVO.getRoleId();
+ 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 sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getPhone, administratorsUserVO.getPhone()));
+ 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 sysUserRoleDO = new SysUserRoleDO();
sysUserRoleDO.setUserId(userId);
sysUserRoleDO.setRoleId(roleDO.getRoleId());
int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
- if (insert1>0) {
- return R.ok();
+ if (insert1 > 0) {
+ return R.ok(userId);
}
}
return R.fail();
@@ -782,69 +1193,91 @@
/**
* 设置角色的权限
*
- * @param menuRoleVO 用户设置的权限id
+ * @param menuRoleVO
+ * 用户设置的权限id
* @return 设置结果
*/
@Transactional(rollbackFor = Exception.class)
public R putMenuRole(MenuRoleVO menuRoleVO) {
- List<Long>menuIds=new ArrayList<>();
+ 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);
-// });
-// }
-// });
+ // 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());
+
+ List<SysRoleMenuDO> sysRoleMenuDOList = sysRoleMenuDAO.selectList(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId).in(SysRoleMenuDO::getMenuId, menuIds));
+ if (!sysRoleMenuDOList.isEmpty()) {
+ menuIds = menuIds.stream().filter(menuId -> !sysRoleMenuDOList.stream()
+ .anyMatch(sysRoleMenuDO -> sysRoleMenuDO.getMenuId().equals(menuId))).collect(Collectors.toList());
+ }
+ if (!menuIds.isEmpty()) {
+ sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
+ }
+// for (int i = 0; i < menuIds.size(); i++) {
+// SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda()
+// .eq(SysRoleMenuDO::getMenuId, menuIds.get(i)).eq(SysRoleMenuDO::getRoleId, roleId));
+// if (sysRoleMenuDO == null) {
+// sysRoleMenuDO = new SysRoleMenuDO();
+// sysRoleMenuDO.setMenuId(menuIds.get(i));
+// sysRoleMenuDO.setRoleId(roleId);
+// sysRoleMenuDAO.insert(sysRoleMenuDO);
+// }
// }
-// }
-
-// 菜单写死不重新生成菜单 todo 所有注释上面自动生成新菜单功能
-
-// 获取所有权限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);
}
-
return R.ok();
}
/**
* 编辑运营、社区后台账户
*
- * @param administratorsUserVO 编辑账户内容
+ * @param administratorsUserVO
+ * 编辑账户内容
* @return 编辑结果
*/
@Override
public R putUserBackstage(AdministratorsUserVO administratorsUserVO) {
- SysUserDO sysUserDO=new SysUserDO();
+ SysUserDO sysUserDO = new SysUserDO();
Long roleId = administratorsUserVO.getRoleId();
- SysRoleDO roleDO=null;
- if (null!=roleId&&0!=roleId) {
- roleDO = roleDAO.selectById(roleId);
+ SysRoleDO roleDO = null;
+ if (null != roleId && 0 != roleId) {
+ roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
}
@@ -854,24 +1287,25 @@
String encode = new BCryptPasswordEncoder().encode(password);
administratorsUserVO.setPassword(encode);
}
- BeanUtils.copyProperties(administratorsUserVO,sysUserDO);
- int update=0;
+ BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
+ int update = 0;
try {
- update = userDao.updateById(sysUserDO);
+ update = userDao.updateById(sysUserDO);
} catch (Exception e) {
e.printStackTrace();
- log.error("编辑后台用户出错【{}】",e.getMessage());
+ log.error("编辑后台用户出错【{}】", e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
return R.fail("此手机号已被占用，请更换其他手机号码");
}
}
- if (update>0&&null!=roleDO) {
- SysUserRoleDO sysUserRoleDO=new SysUserRoleDO();
+ 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) {
+ int update1 = sysUserRoleDAO.update(sysUserRoleDO, new UpdateWrapper<SysUserRoleDO>().lambda()
+ .eq(SysUserRoleDO::getUserId, administratorsUserVO.getUserId()));
+ if (update1 > 0) {
return R.ok();
- }else{
+ } else {
sysUserRoleDO.setUserId(administratorsUserVO.getUserId());
sysUserRoleDAO.insert(sysUserRoleDO);
}
@@ -882,7 +1316,8 @@
/**
* 删除后台用户
*
- * @param administratorsUserVO 用户主键
+ * @param administratorsUserVO
+ * 用户主键
* @return 删除结果
*/
@Override
@@ -895,15 +1330,16 @@
}
Long communityId = sysUserDO.getCommunityId();
Long communityId1 = administratorsUserVO.getCommunityId();
- if (communityId1.intValue()!=communityId.intValue()) {
+ 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) {
+ // 删除用户角色关系
+ if (delete > 0) {
+ int delete1 =
+ sysUserRoleDAO.delete(new QueryWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, userId));
+ if (delete1 == 0) {
return R.fail("用户没有角色关系");
}
}
@@ -913,7 +1349,8 @@
/**
* 分页查询后台用户
*
- * @param administratorsUserVO 查询参数
+ * @param administratorsUserVO
+ * 查询参数
* @return 后台用户
*/
@Override
@@ -921,10 +1358,10 @@
Page page = new Page<>();
Long pageNum = administratorsUserVO.getPageNum();
Long pageSize = administratorsUserVO.getPageSize();
- if (null==pageNum||pageNum==0) {
+ if (null == pageNum || pageNum == 0) {
pageNum = 1l;
}
- if (null==pageSize||pageSize==0) {
+ if (null == pageSize || pageSize == 0) {
pageSize = 10l;
}
page.setSize(pageSize);
@@ -936,24 +1373,26 @@
/**
* 保存操作日志
*
- * @param operlog 日志内容
+ * @param operlog
+ * 日志内容
* @return 保存结果
*/
@Override
public R addOperLog(SysOperLogVO operlog) {
- SysOperLogDO sysOperLogDO=new SysOperLogDO();
- BeanUtils.copyProperties(operlog,sysOperLogDO);
+ SysOperLogDO sysOperLogDO = new SysOperLogDO();
+ BeanUtils.copyProperties(operlog, sysOperLogDO);
int insert = sysOperLogDAO.insert(sysOperLogDO);
- if (insert>0) {
+ if (insert > 0) {
return R.ok();
}
- return R.fail();
+ return R.fail();
}
/**
* 分页展示操作日志
*
- * @param sysOperLogVO 分页参数
+ * @param sysOperLogVO
+ * 分页参数
* @return 分页集合
*/
@Override
@@ -961,10 +1400,10 @@
Page page = new Page<>();
Long pageNum = sysOperLogVO.getPageNum();
Long pageSize = sysOperLogVO.getPageSize();
- if (null==pageNum||pageNum==0) {
+ if (null == pageNum || pageNum == 0) {
pageNum = 1l;
}
- if (null==pageSize||pageSize==0) {
+ if (null == pageSize || pageSize == 0) {
pageSize = 10l;
}
page.setSize(pageSize);
@@ -979,15 +1418,16 @@
* @return 协议集合
*/
@Override
- public R listAgreement() {
- List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(null);
+ 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<>();
+ List<SysUserAgreementVO> sysUserAgreementVOS = new ArrayList<>();
sysUserAgreementDOS.forEach(sysUserAgreementDO -> {
- SysUserAgreementVO sysUserAgreementVO=new SysUserAgreementVO();
- BeanUtils.copyProperties(sysUserAgreementDO,sysUserAgreementVO);
+ SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
+ BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
sysUserAgreementVOS.add(sysUserAgreementVO);
});
return R.ok(sysUserAgreementVOS);
@@ -996,15 +1436,16 @@
/**
* 编辑用户协议
*
- * @param sysUserAgreementVO 编辑内容
+ * @param sysUserAgreementVO
+ * 编辑内容
* @return 编辑结果
*/
@Override
public R putAgreement(SysUserAgreementVO sysUserAgreementVO) {
- SysUserAgreementDO sysUserAgreementDO=new SysUserAgreementDO();
- BeanUtils.copyProperties(sysUserAgreementVO,sysUserAgreementDO);
+ SysUserAgreementDO sysUserAgreementDO = new SysUserAgreementDO();
+ BeanUtils.copyProperties(sysUserAgreementVO, sysUserAgreementDO);
int update = sysUserAgreementDAO.updateById(sysUserAgreementDO);
- if (update==0) {
+ if (update == 0) {
return R.fail("协议不存在");
}
return R.ok();
@@ -1013,19 +1454,21 @@
/**
* 用户标签
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 标签集合
*/
@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();
}
- List<ComMngUserTagVO> comMngUserTagVOList=new ArrayList<>();
+ List<ComMngUserTagVO> comMngUserTagVOList = new ArrayList<>();
comMngUserTagDOS.forEach(comMngUserTagDO -> {
- ComMngUserTagVO comMngUserTagVO=new ComMngUserTagVO();
- BeanUtils.copyProperties(comMngUserTagDO,comMngUserTagVO);
+ ComMngUserTagVO comMngUserTagVO = new ComMngUserTagVO();
+ BeanUtils.copyProperties(comMngUserTagDO, comMngUserTagVO);
comMngUserTagVOList.add(comMngUserTagVO);
});
return R.ok(comMngUserTagVOList);
@@ -1034,7 +1477,8 @@
/**
* 新增删除用户标签
*
- * @param systemmanagementConfigVO 操作内容
+ * @param systemmanagementConfigVO
+ * 操作内容
* @return 操作结果
*/
@Override
@@ -1043,15 +1487,15 @@
Long communityId = systemmanagementConfigVO.getCommunityId();
List<ComMngUserTagVO> comMngUserTagVOList = systemmanagementConfigVO.getComMngUserTagVOList();
if (!ObjectUtils.isEmpty(comMngUserTagVOList)) {
- comMngUserTagDAO.delete(null);
+ comMngUserTagDAO.delete(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId,communityId));
comMngUserTagVOList.forEach(comMngUserTagVO -> {
- ComMngUserTagDO comMngUserTagDO=new ComMngUserTagDO();
+ ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
comMngUserTagDO.setCommunityId(communityId);
comMngUserTagDO.setTagName(comMngUserTagVO.getTagName());
comMngUserTagDAO.insert(comMngUserTagDO);
});
return R.ok();
- }else {
+ } else {
return R.fail("用户标签不能为空");
}
@@ -1060,7 +1504,8 @@
/**
* 分页查询小程序用户
*
- * @param pageUserAppletsBackstageDTO 查询参数
+ * @param pageUserAppletsBackstageDTO
+ * 查询参数
* @return 分页集合
*/
@Override
@@ -1077,18 +1522,19 @@
/**
* 编辑用户状态
*
- * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用
+ * @param pageUserAppletsBackstageDTO
+ * 启用或者禁用 1 启用 2 禁用
* @return 编辑结果
*/
@Override
public R putUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) {
Long userId = pageUserAppletsBackstageDTO.getUserId();
Integer status = pageUserAppletsBackstageDTO.getStatus();
- SysUserDO sysUserDO=new SysUserDO();
+ SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(userId);
sysUserDO.setStatus(status);
int update = userDao.updateById(sysUserDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail("用户不存在");
@@ -1097,13 +1543,14 @@
/**
* 调试接口--清除昵称、社区、小区
*
- * @param userId 登录用户id
+ * @param userId
+ * 登录用户id
* @return 清除结果
*/
@Override
public R deleteUserTest(Long userId) {
- int num=userDao.deleteUserTest(userId);
- if (num>0) {
+ int num = userDao.deleteUserTest(userId);
+ if (num > 0) {
return R.ok();
}
return R.fail("清除失败");
@@ -1112,28 +1559,31 @@
/**
* 用户协议和隐私政策
*
- * @param type 所属app 1居民端app 2网格员端app 3商家端app
+ * @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));
+ SysUserAgreementDO sysUserAgreementDO = sysUserAgreementDAO
+ .selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type));
return R.ok(sysUserAgreementDO);
}
/**
* 意见反馈
*
- * @param sysUserFeedbackDTO 反馈内容
+ * @param sysUserFeedbackDTO
+ * 反馈内容
* @return 反馈结果
*/
@Override
public R addFeedback(SysUserFeedbackDTO sysUserFeedbackDTO) {
- SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
- BeanUtils.copyProperties(sysUserFeedbackDTO,sysUserFeedbackDO);
+ SysUserFeedbackDO sysUserFeedbackDO = new SysUserFeedbackDO();
+ BeanUtils.copyProperties(sysUserFeedbackDTO, sysUserFeedbackDO);
sysUserFeedbackDO.setPhotoPath(sysUserFeedbackDTO.getPhotoPah());
int insert = sysUserFeedbackDAO.insert(sysUserFeedbackDO);
- if (insert>0) {
+ if (insert > 0) {
return R.ok();
}
return R.fail();
@@ -1142,18 +1592,22 @@
/**
* 分页通知列表
*
- * @param pageDTO 分页参数
+ * @param pageDTO
+ * 分页参数
* @return 分页结果
*/
@Override
public R pageNotice(PageDTO pageDTO) {
- Long userId=pageDTO.getUserId();
+ 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));
+ 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();
@@ -1161,42 +1615,45 @@
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);
+ Map<String, Object> map = new HashMap<>(2);
+ map.put("page", iPage);
+ map.put("unreadNum", integer);
return R.ok(map);
}
/**
* 通知已读
*
- * @param noticeReadDTO 通知已读
+ * @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()) {
+ 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{
+ 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);
+ num = sysUserNoticeDAO.updateById(sysUserNoticeDO);
}
- if (num>0) {
+ if (num > 0) {
return R.ok();
}
- return R.fail("通知不存在");
+ return R.fail("通知不存在");
}
/**
* 分页查询用户意见反馈
*
- * @param pageFeedBackDTO 分页查询参数
+ * @param pageFeedBackDTO
+ * 分页查询参数
* @return 意见集合
*/
@Override
@@ -1213,21 +1670,23 @@
/**
* 未读消息汇总
*
- * @param userId 登录用户信息
+ * @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));
+ 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);
+ 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);
+ SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+ BeanUtils.copyProperties(sysUserNoticeDO, sysUserNoticeVO);
sysUserNoticeVOList.add(sysUserNoticeVO);
typeList.add(type);
}
@@ -1240,12 +1699,13 @@
/**
* 反馈意见详情
*
- * @param id 反馈主键
+ * @param id
+ * 反馈主键
* @return 反馈详情
*/
@Override
public R detailFeedback(Long id) {
- SysUserFeedbackVO sysUserFeedbackVO=sysUserFeedbackDAO.detailFeedback(id);
+ SysUserFeedbackVO sysUserFeedbackVO = sysUserFeedbackDAO.detailFeedback(id);
return R.ok(sysUserFeedbackVO);
}
@@ -1255,26 +1715,26 @@
* @return 展示数据
*/
@Override
- public R dataKanban() {
- IndexDataKanbanVO indexDataKanbanVO=userDao.selectIndexDataKanban();
- List<DataKanbanDTO> dataKanbanDTOS=userDao.selectCommunityUserOrder();
+ public R dataKanban(String areaCode) {
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(areaCode);
+ List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder(areaCode);
- List<String> communityUserX=new ArrayList<>();
- List<Integer> communityUserY=new ArrayList<>();
- List<String> communityActiveUserX=new ArrayList<>();
- List<Integer> communityActiveUserY=new ArrayList<>();
+ 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();
+ // 获取最近七天数据
+ List<Date> serverndays = this.getServenDays();
serverndays.forEach(date -> {
- // 查询社区活动数量
- DataKanbanDTO dataKanbanDTO=userDao.selectCommunityActiveUserOrder(date);
- communityActiveUserX.add(DateFormatUtils.format(date,"MM-dd"));
+ // 查询社区活动数量
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityActiveUserOrder(date);
+ communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
communityActiveUserY.add(dataKanbanDTO.getNum());
});
indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
@@ -1286,13 +1746,14 @@
/**
* 获取最近七天数据
+ *
* @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);
+ 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;
@@ -1301,12 +1762,14 @@
/**
* 社区管理后台数据看板
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 看板用户数据
*/
@Override
public R indexDataCommunityBackstage(Long communityId) {
- IndexDataVO indexDataVO=userDao.indexDataCommunityBackstage(communityId);
+ IndexDataVO indexDataVO = userDao.indexDataCommunityBackstage(communityId);
+ // 查询后台党员数量
return R.ok(indexDataVO);
}
@@ -1317,9 +1780,9 @@
*/
@Override
public R timedTaskContinuousLandingDays() {
- int num=userDao.timedTaskContinuousLandingDays();
- if (num>0) {
- log.info("定时任务维护用户持续登录时间，维护用户数量【{}】",num);
+ int num = userDao.timedTaskContinuousLandingDays();
+ if (num > 0) {
+ log.info("定时任务维护用户持续登录时间，维护用户数量【{}】", num);
}
return R.ok();
}
@@ -1327,15 +1790,16 @@
/**
* 新增用户通知
*
- * @param sysUserNoticeVO 通知内容
+ * @param sysUserNoticeVO
+ * 通知内容
* @return 新增结果
*/
@Override
public R addNotice(SysUserNoticeVO sysUserNoticeVO) {
- SysUserNoticeDO sysUserNoticeDO=new SysUserNoticeDO();
- BeanUtils.copyProperties(sysUserNoticeVO,sysUserNoticeDO);
+ SysUserNoticeDO sysUserNoticeDO = new SysUserNoticeDO();
+ BeanUtils.copyProperties(sysUserNoticeVO, sysUserNoticeDO);
int insert = sysUserNoticeDAO.insert(sysUserNoticeDO);
- if (insert>0) {
+ if (insert > 0) {
return R.ok();
}
return R.fail();
@@ -1344,51 +1808,84 @@
/**
* 修改用户的党员状态
*
- * @param idCard 身份证号
+ * @param idCard
+ * 身份证号
* @return 修改结果
*/
@Override
public R updateUserIsPartymember(String idCard) {
- SysUserDO sysUserDO=new SysUserDO();
- sysUserDO.setIsPartymember(1);
- int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
- if (update>0) {
- log.info("新增党员修改用户党员状态成功 身份证号【{}】",idCard);
- return R.ok();
+ 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.fail();
+ 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隐私政策
+ * @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));
+ 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);
+ SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
+ BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
return R.ok(sysUserAgreementVO);
}
/**
* 维护用户最后登录时间
*
- * @param userId 用户主键
+ * @param userId
+ * 用户主键
* @return 维护结果
*/
@Override
public R putUserLastLoginTime(Long userId) {
- SysUserDO sysUserDO=new SysUserDO();
+ SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(userId);
sysUserDO.setLastLoginTime(new Date());
int update = userDao.updateById(sysUserDO);
- if (update>0) {
+ if (update > 0) {
return R.ok();
}
return R.fail();
@@ -1397,13 +1894,14 @@
/**
* 删除意见反馈
*
- * @param id 主键
+ * @param id
+ * 主键
* @return 删除结果
*/
@Override
public R deleteFeedback(Long id) {
int delete = sysUserFeedbackDAO.deleteById(id);
- if (delete>0) {
+ if (delete > 0) {
return R.ok();
}
return R.fail();
@@ -1412,20 +1910,21 @@
/**
* 校验小区是否存在
*
- * @param areaName 小区名字
+ * @param areaName
+ * 小区名字
* @return 校验结果
*/
@Override
public R checkAereaName(String areaName) {
- Integer num=userDao.selectCountArea(areaName);
- if (num>0) {
+ Integer num = userDao.selectCountArea(areaName);
+ if (num > 0) {
Integer integer = userDao.selectCountHouse(areaName);
- if (integer>0) {
+ if (integer > 0) {
return R.ok();
- }else{
+ } else {
return R.fail("小区房屋信息未创建,请先在社区平台添加房屋信息");
}
- }else{
+ } else {
return R.fail("小区不存在,请先在社区平台添加小区");
}
}
@@ -1433,21 +1932,25 @@
/**
* 社区人员详情包括导入人员
*
- * @param userId 人员id
+ * @param userId
+ * 人员id
* @return CommunityUserInfoVO
*/
@Override
public CommunityUserInfoVO detailUserComunity(Long userId) {
- CommunityUserInfoVO communityUserInfoVO=new CommunityUserInfoVO();
+ 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(IdCard.birthDay(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);
@@ -1459,18 +1962,19 @@
communityUserInfoVO.setVolunteerCreateAt(comMngVolunteerMngVO.getCreateAt());
}
Integer isPartymember = sysUserDO.getIsPartymember();
- if (isPartymember.intValue()==1) {
+ if (isPartymember.intValue() == 1) {
communityUserInfoVO.setPoliticalOutlook(1);
- }else{
+ } else {
communityUserInfoVO.setPoliticalOutlook(3);
}
communityUserInfoVO.setIsVolunteer(sysUserDO.getIsVolunteer());
- List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
+ List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
+ .selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
- List<ComMngFamilyInfoVO>comMngFamilyInfoVOS=new ArrayList<>();
+ List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
- ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
- BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
+ ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
+ BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
});
communityUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
@@ -1482,29 +1986,825 @@
/**
* 用户搜索了就下载搜索的用户否则下载所有用户
*
- * @param exportUserDTO 用户搜索内容
+ * @param exportUserDTO
+ * 用户搜索内容
* @return List<EexcelUserDTO> excel内容
*/
@Override
public R export(ExportUserDTO exportUserDTO) {
- List<EexcelUserDTO> eexcelUserDTOS=userDao.selectExport(exportUserDTO);
+ List<EexcelUserDTO> eexcelUserDTOS = userDao.selectExport(exportUserDTO);
return R.ok(eexcelUserDTOS);
}
-
- public static void main(String[] args) {
-// 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);
+ @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("用户不存在");
}
- System.out.println(dates);
+ SysUserVO sysUserVO = new SysUserVO();
+ BeanUtils.copyProperties(sysUserDO, sysUserVO);
+ return R.ok(sysUserVO);
+ }
-// BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-// boolean matches = encoder.matches("admin1234567", encode);
-// System.out.println(matches);
+ /**
+ * 查询当前社区所有标签以及预设标签
+ *
+ * @return 标签集合
+ */
+ @Override
+ public R listTags() {
+ List<String> list = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
+ .selectList(null);
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ for (ComMngUserTagDO comMngUserTagDO : comMngUserTagDOS) {
+ if (!list.contains(comMngUserTagDO.getTagName())) {
+ list.add(comMngUserTagDO.getTagName());
+ }
+ }
+// 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.getStoreAccount()).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) {
+ 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();
+ }
+
+ /**
+ * 查询社区后台工作人员列表
+ *
+ * @param communityId
+ * 社区id
+ * @return 社区后台工作人员列表
+ */
+ @Override
+ public R getUserListByCommunityId(Long communityId) {
+ return R.ok(this.userDao.getUserListByCommunityId(communityId));
+ }
+
+ /**
+ * 检查当前用户是否是社区工作人员
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ @Override
+ public R checkCurrentUserIsTeam(String phone, Long communityId) {
+ int result = this.userDao.selectCountTeam(phone, communityId);
+ if (result > 0) {
+ return R.ok(true);
+ }
+ return R.ok(false);
+ }
+
+ @Override
+ public R resetPassword(Long userId) {
+ SysUserDO sysUserDO = new SysUserDO();
+ sysUserDO.setUserId(userId);
+ String encode = new BCryptPasswordEncoder().encode("admin123456");
+ sysUserDO.setPassword(encode);
+ int update = userDao.updateById(sysUserDO);
+ if (update > 0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R resetPasswordPatch(Long[] userId,String password) {
+ if(userId!=null){
+ for(Long user:userId){
+ SysUserDO sysUserDO = new SysUserDO();
+ sysUserDO.setUserId(user);
+ String encode = new BCryptPasswordEncoder().encode(password);
+ sysUserDO.setPassword(encode);
+ userDao.updateById(sysUserDO);
+ }
+ }
+ return R.ok();
+ }
+
+ /**
+ * 便民服务新增商家账号
+ * @param convenientMerchantDTO
+ * @return 商家用户id
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
+ SysUserDO sysUserDO;
+ sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, convenientMerchantDTO.getAccount()));
+ if (nonNull(sysUserDO)) {
+ return R.fail("账户已经存在");
+ }
+ // sys_user 表
+ sysUserDO = new SysUserDO();
+ String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
+ BeanUtils.copyProperties(convenientMerchantDTO, sysUserDO);
+ sysUserDO.setAccount(convenientMerchantDTO.getAccount());
+ sysUserDO.setType(10);
+ sysUserDO.setAreaId(null);
+ sysUserDO.setStatus(1);
+ sysUserDO.setPhone(null);
+ sysUserDO.setName(convenientMerchantDTO.getContacts());
+ sysUserDO.setPassword(encode);
+ try {
+ userDao.insert(sysUserDO);
+ return R.ok(sysUserDO.getUserId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("新增后台用户报错【{}】", e.getMessage());
+ }
+ return R.fail("新增商户发生错误");
+ }
+
+ /**
+ * 修改便民服务商家绑定账号
+ * @param userId 用户id
+ * @param account 修改账户
+ * @return 修改结果
+ */
+ @Override
+ public R putUserAccount(Long userId, String account) {
+ SysUserDO sysUserDO = userDao.selectById(userId);
+ if (isNull(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ sysUserDO.setAccount(account);
+ userDao.updateById(sysUserDO);
+ return R.ok();
+ }
+
+ // /**
+ // * 修改便民服务商家绑定账号
+ // * @param userId 用户id
+ // * @param account 修改账户
+ // * @return 修改结果
+ // */
+ // @Override
+ // public R putUserAccount(Long userId, String account) {
+ // SysUserDO sysUserDO = userDao.selectById(userId);
+ // if (isNull(sysUserDO)) {
+ // return R.fail("用户不存在");
+ // }
+ // String oldAccount = sysUserDO.getAccount();
+ // sysUserDO.setAccount(account);
+ // int result = userDao.updateById(sysUserDO);
+ // if (result > 0) {
+ // SysRoleDO sysRoleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>()
+ // .lambda().eq(SysRoleDO::getRoleKey, Constants.CONVENIENT_MERCHANT_ROLE_KEY + oldAccount));
+ // if (nonNull(sysRoleDO)) {
+ // sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + account);
+ // roleDAO.updateById(sysRoleDO);
+ // }
+ // }
+ // return R.ok();
+ // }
+
+ @Override
+ public R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
+ userDao.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO.getType(), disableOrEnableConvenientMerchantDTO.getUserIds());
+ return R.ok();
+ }
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ @Override
+ public void judgeCommunityTeam(String openid){
+ //查询用户信息
+ SysUserDO userDO = this.userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid,openid));
+ if(userDO != null && StringUtils.isNotEmpty(userDO.getPhone())){
+ if(this.userDao.getCommunityTeamCount(userDO.getPhone()) > 0){
+ this.userDao.judgeCommunityTeam(userDO.getPhone());
+ }
+ }
+ }
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ @Override
+ public R dataKanBans(DataKanBansDto dataKanBansDto){
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(dataKanBansDto.getAreaCode());
+ List<String> communityUserX = new ArrayList<>();
+ List<Integer> communityUserY = new ArrayList<>();
+
+ List<String> communityActiveUserX = new ArrayList<>();
+ List<Integer> communityActiveUserY = new ArrayList<>();
+ List<Integer> communityActiveUserZ = new ArrayList<>();
+
+ List<DataKanbanDTO> dataKanbanDTOS = null;
+ if(dataKanBansDto.getType() != null && dataKanBansDto.getType().equals(DataKanBansDto.type.by)){
+ dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(dataKanBansDto.getAreaCode());
+ }else{
+ dataKanbanDTOS = userDao.selectCommunityUserOrder(dataKanBansDto.getAreaCode());
+ }
+ if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
+ dataKanbanDTOS.forEach(dataKanbanDTO -> {
+ communityUserX.add(dataKanbanDTO.getName());
+ communityUserY.add(dataKanbanDTO.getNum());
+ });
+ }
+
+ // 获取最近二十天数据
+ List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
+ serverndays.forEach(date -> {
+ // 查询社区活动数量
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAreaCode(),date);
+ communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
+ communityActiveUserY.add(dataKanbanDTO.getNum());
+ communityActiveUserZ.add(dataKanbanDTO.getDayNum());
+ });
+ indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX);
+ indexDataKanbanVO.setCommunityAddUserY(communityActiveUserY);
+ indexDataKanbanVO.setCommunityActiveUserY(communityActiveUserZ);
+ indexDataKanbanVO.setCommunityUserX(communityUserX);
+ indexDataKanbanVO.setCommunityUserY(communityUserY);
+ return R.ok(indexDataKanbanVO);
+ }
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @Override
+ public R communityStatistics(String areaCode){
+ //返回结果数据
+ IndexUserStatisticsVo userStatisticsVo = new IndexUserStatisticsVo();
+ //查询所有街道
+ List<IndexUserStreetVo> streetList = userDao.getUserStreetList(areaCode);
+ streetList.forEach(street -> {
+ List<IndexUserCommunityVo> communityList = userDao.getUserCommunityList(street.getStreetId());
+ street.setCommunityList(communityList);
+ });
+ userStatisticsVo.setStreetList(streetList);
+ return R.ok(userStatisticsVo);
+ }
+
+ @Override
+ public R communityStatisticsExport(String areaCode){
+ return R.ok(userDao.getUserCommunityExcelExport(areaCode));
+ }
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ @Override
+ public R getUserInfoByUnionId(String unionId) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getUnionid, unionId));
+ if (isNull(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+ return R.ok(loginUserInfoVO);
}
}
--
Gitblit v1.7.1