From e47afadc0dd55b1a2da6a2a51e157095424b041d Mon Sep 17 00:00:00 2001 From: yujt Date: Wed, 2 Jun 2021 10:19:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/SysUserController.java | 15 +++++++ .../com/elink/esua/epdc/dao/SysUserDao.java | 19 +++++--- .../esua/epdc/service/SysUserService.java | 43 ++++++++++++------- .../epdc/service/impl/SysUserServiceImpl.java | 26 ++++++++--- .../src/main/resources/mapper/SysUserDao.xml | 11 +++++ 5 files changed, 85 insertions(+), 29 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 6b100f4..8d211b5 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -523,6 +523,7 @@ public class SysUserController { public Result> getRoleMembers(SysRoleMembersFormDTO formDTO) { return sysUserService.getRoleMembers(formDTO); } + /** * 获取用户部门多层结构，用户前端显示，请求需携带token - 工作日志使用 * @@ -535,4 +536,18 @@ public class SysUserController { return sysDeptService.getUserDeptOptionByUserId(String.valueOf(SecurityUser.getUserId())); } + + /** + * 查询用户登录时是否需要短信验证码，如果需要手机短信验证，则返回手机号 + * + * @param username + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2021/6/1 09:52 + */ + @GetMapping("getLoginMobile") + public Result> getLoginMobile(String username) { + return new Result().ok(sysUserService.getLoginMobile(username)); + } + } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java index b51eae4..80ceb28 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java @@ -53,33 +53,30 @@ public interface SysUserDao extends BaseDao { List selectListLeaderGridId(@Param("mobile") String mobile); /** - * * 获取部门下的所有用户ID * - * @params [deptId] * @return java.util.List + * @params [deptId] * @author liuchuang * @since 2019/10/29 16:18 */ List selectListOfUserIdsByDeptId(@Param("deptId") Long deptId); /** - * * 根据用户名更新用户微信openId * - * @params [sysUserOpenIdFormDto] * @return void + * @params [sysUserOpenIdFormDto] * @author liuchuang * @since 2019/11/20 9:59 */ void updateOpenIdByUsername(SysUserOpenIdFormDTO sysUserOpenIdFormDto); /** - * * 根据openId获取用户信息 * - * @params [openId] * @return com.elink.esua.epdc.dto.SysUserDTO + * @params [openId] * @author liuchuang * @since 2019/11/20 13:56 */ @@ -116,4 +113,14 @@ public interface SysUserDao extends BaseDao { * @Date: 2020-06-09 */ List getRoleMembers(SysRoleMembersFormDTO dto); + + /** + * 通过用户名，查询用户登录需要验证的手机号 + * + * @param username + * @return java.util.List> + * @author work@yujt.net.cn + * @date 2021/6/1 09:54 + */ + List> getLoginMobile(@Param("username") String username); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java index 2355367..574af70 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -97,6 +97,7 @@ public interface SysUserService extends BaseService { /** * 退出登录 + * * @param userId * @return */ @@ -105,7 +106,7 @@ public interface SysUserService extends BaseService { /** * @Description: 根据部门id，查询部门下的所有用户手机号 * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-01-09 */ @@ -114,36 +115,46 @@ public interface SysUserService extends BaseService { /** * @Description: 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号 * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: zy * @Date: 2020-01-09 */ Result> getSysGridLeaderPhone(Long deptId); /** - * @describe: 判断是否更新头像 - * @author wangtong - * @date 2020/3/30 13:52 - * @param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ + * @param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 判断是否更新头像 + * @author wangtong + * @date 2020/3/30 13:52 + */ Result checkUpdateAvatar(); /** - * @describe: 更新头像 - * @author wangtong - * @date 2020/3/30 16:12 - * @param [avatar] - * @return com.elink.esua.epdc.commons.tools.utils.Result - */ + * @param [avatar] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @describe: 更新头像 + * @author wangtong + * @date 2020/3/30 16:12 + */ Result updateAvatar(String avatar); /** + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result * @describe: 获取成员角色 * @author zhangyuan * @date 2020/3/30 16:12 - * @param dto - * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getRoleMembers(SysRoleMembersFormDTO dto); + + /** + * 查询用户登录时是否需要短信验证码，如果需要手机短信验证，则返回手机号 + * + * @param username + * @return java.util.Map < java.lang.String, java.lang.String> + * @author work@yujt.net.cn + * @date 2021/6/1 09:52 + */ + Map getLoginMobile(String username); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 18280fb..f37e95d 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -253,8 +253,8 @@ public class SysUserServiceImpl extends BaseServiceImpl> getUserPhoneByListDeptId(List deptId) { - Map map = new HashMap<>(); - map.put("deptId",deptId); + Map map = new HashMap<>(); + map.put("deptId", deptId); List list = baseDao.getUserPhoneByListDeptId(map); return new Result>().ok(list); } @@ -268,12 +268,12 @@ public class SysUserServiceImpl extends BaseServiceImpl> getRoleMembers(SysRoleMembersFormDTO dto){ + public Result> getRoleMembers(SysRoleMembersFormDTO dto) { List list = baseDao.getRoleMembers(dto); return new Result>().ok(list); } + + @Override + public Map getLoginMobile(String username) { + List> userList = baseDao.getLoginMobile(username); + if (CollUtil.isEmpty(userList)) { + throw new RenException("账号不存在"); + } + if (userList.size() > NumConstant.ONE) { + throw new RenException("账户名重复，请联系管理员处理"); + } + return userList.get(NumConstant.ZERO); + } } diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml index 8fc7ebe..630035b 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml @@ -177,4 +177,15 @@ ) + +