From dc62949a49a3d3414fec4ac7ed358a7acbe7baab Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 15 一月 2021 17:01:43 +0800
Subject: [PATCH] 短信加入万能验证码
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 189 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 175 insertions(+), 14 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 895f3b9..cc173a4 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
@@ -6,17 +6,17 @@
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.NoticeReadDTO;
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.IndexDataKanbanVO;
-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.*;
+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.RealNameUtil;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -64,6 +64,10 @@
private SysUserFeedbackDAO sysUserFeedbackDAO;
@Resource
private SysUserNoticeDAO sysUserNoticeDAO;
+ @Resource
+ private SysRoleMenuDAO sysRoleMenuDAO;
+ @Resource
+ private SysMenuDAO sysMenuDAO;
/**
@@ -79,9 +83,9 @@
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid));
boolean empty = ObjectUtils.isEmpty(sysUserDO);
int num = 0;
+ Date date = new Date();
if (empty) {
SysUserDO sysUserDO1 = new SysUserDO();
- Date date = new Date();
String encode = new BCryptPasswordEncoder().encode(UserConstants.PASSWORD);
sysUserDO1.setOpenid(openid);
sysUserDO1.setUnionid(unionid);
@@ -96,6 +100,7 @@
sysUserDO.setUnionid(unionid);
sysUserDO.setSessionKey(sessionKey);
sysUserDO.setPassword(encode);
+ sysUserDO.setLastLoginTime(date);
sysUserDO.setType(1);
num = userDao.updateById(sysUserDO);
}
@@ -210,6 +215,17 @@
set.add(sysRoleDO.getRoleKey());
});
loginUserInfoVO.setRoles(set);
+ }
+// 志愿者状态
+ String phone = sysUserDO.getPhone();
+ if (!ObjectUtils.isEmpty(phone)) {
+ ComMngVolunteerMngVO comMngVolunteerMngVO= userDao.selectVolunteerMngByPhone(phone);
+ if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
+ loginUserInfoVO.setVolunteerStatus(0);
+ }else{
+ int state = comMngVolunteerMngVO.getState().intValue();
+ loginUserInfoVO.setVolunteerStatus(state);
+ }
}
return R.ok(loginUserInfoVO);
}
@@ -462,16 +478,23 @@
*/
@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();
- sysUserDO.setName(loginUserInfoVO.getName());
- sysUserDO.setIdCard(loginUserInfoVO.getIdCard());
+ sysUserDO.setName(name);
+ sysUserDO.setIdCard(idCard);
sysUserDO.setSex(loginUserInfoVO.getSex());
sysUserDO.setBirthday(loginUserInfoVO.getBirthday());
sysUserDO.setJob(loginUserInfoVO.getJob());
sysUserDO.setUserId(loginUserInfoVO.getUserId());
sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
sysUserDO.setFaceState(0);
- SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, loginUserInfoVO.getIdCard()));
+ SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
if (!ObjectUtils.isEmpty(sysUserDO1)) {
return R.fail("身份证已经存在");
}
@@ -509,7 +532,9 @@
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
String code = valueOperations.get(key);
if (!code.equals(smsCode)) {
- return R.fail("验证码错误");
+ if(!smsCode.equals("777333")){
+ return R.fail("验证码错误");
+ }
}
SysUserDO sysUserDO=new SysUserDO();
sysUserDO.setUserId(userPhoneVO.getUserId());
@@ -629,7 +654,7 @@
}
/**
- * 新增运营后台账户
+ * 新增运营、社区后台账户
*
* @param administratorsUserVO 账户信息
* @return 新增结果
@@ -638,7 +663,29 @@
@Transactional(rollbackFor = Exception.class)
public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {
SysUserDO sysUserDO=new SysUserDO();
- SysRoleDO roleDO = roleDAO.selectById(administratorsUserVO.getRoleId());
+ 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);
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert>0) {
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+ roleId=sysRoleDO1.getRoleId();
+// 新角色设置所有权限
+ MenuRoleVO menuRoleVO=new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(communityId);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
+ SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
}
@@ -652,8 +699,11 @@
e.printStackTrace();
log.error("新增后台用户报错【{}】",e.getMessage());
if (e.getMessage().contains("union_phone_type")) {
- return R.fail("手机号已经存在");
+ 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()));
@@ -670,7 +720,57 @@
}
/**
- * 编辑运营后台账户
+ * 设置角色的权限
+ *
+ * @param menuRoleVO 用户设置的权限id
+ * @return 设置结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public R putMenuRole(MenuRoleVO menuRoleVO) {
+ List<Long>menuIds=new ArrayList<>();
+ Long roleId = menuRoleVO.getRoleId();
+ Integer isAll = menuRoleVO.getIsAll();
+ Long communityId = menuRoleVO.getCommunityId();
+ if (isAll.intValue()==1) {
+ List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 1l).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);
+ });
+ }
+ });
+ }
+ }
+// 获取所有权限id
+ List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, communityId).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 编辑账户内容
* @return 编辑结果
@@ -1113,8 +1213,69 @@
return R.ok(indexDataKanbanVO);
}
+ /**
+ * 社区管理后台数据看板
+ *
+ * @param communityId 社区id
+ * @return 看板用户数据
+ */
+ @Override
+ public R indexDataCommunityBackstage(Long communityId) {
+ IndexDataVO indexDataVO=userDao.indexDataCommunityBackstage(communityId);
+ return R.ok(indexDataVO);
+ }
+
+ /**
+ * 定时任务维护用户持续登录时间
+ *
+ * @return 维护结果
+ */
+ @Override
+ public R timedTaskContinuousLandingDays() {
+ int num=userDao.timedTaskContinuousLandingDays();
+ if (num>0) {
+ log.info("定时任务维护用户持续登录时间，维护用户数量【{}】",num);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 新增用户通知
+ *
+ * @param sysUserNoticeVO 通知内容
+ * @return 新增结果
+ */
+ @Override
+ public R addNotice(SysUserNoticeVO sysUserNoticeVO) {
+ SysUserNoticeDO sysUserNoticeDO=new SysUserNoticeDO();
+ BeanUtils.copyProperties(sysUserNoticeVO,sysUserNoticeDO);
+ int insert = sysUserNoticeDAO.insert(sysUserNoticeDO);
+ if (insert>0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 修改用户的党员状态
+ *
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserIsPartymember(String idCard) {
+ SysUserDO sysUserDO=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();
+ }
+ return R.fail();
+ }
+
public static void main(String[] args) {
- String encode = new BCryptPasswordEncoder().encode("123456");
+ String encode = new BCryptPasswordEncoder().encode("admin123456");
System.out.println(encode);
}
}
--
Gitblit v1.7.1