From 1608b66fad0d8f2d6644b925ffa862019d78d8bd Mon Sep 17 00:00:00 2001 From: ShiSiWei <12764015+ssw_1_0@user.noreply.gitee.com> Date: Thu, 26 Oct 2023 14:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 54 +++++++++++++------ .../com/four/system/mapper/SysUserMapper.java | 22 +++++++- .../system/service/ISysPermissionService.java | 10 ++-- .../four/system/service/ISysUserService.java | 7 ++- .../service/impl/SysUserServiceImpl.java | 17 ++++-- .../resources/mapper/system/SysUserMapper.xml | 17 ++++-- 6 files changed, 95 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/four/system/controller/SysUserController.java b/src/main/java/com/four/system/controller/SysUserController.java index 03b9319..e35f901 100644 --- a/src/main/java/com/four/system/controller/SysUserController.java +++ b/src/main/java/com/four/system/controller/SysUserController.java @@ -110,24 +110,45 @@ public class SysUserController extends BaseController /** * 获取当前用户信息 */ + + + + @InnerAuth + @GetMapping("/info/{userName}") + public R info (@PathVariable("userName") String userName) + { + SysUser sysUser = userService.selectUserByUserName(userName); + if(StringUtils.isNull(sysUser)){ + return R.fail("用户名或密码错误"); + } + + Set roles = permissionService.getRolePermission(sysUser); + + Set permission = permissionService.getMenuPermission(sysUser); + LoginUser sysUserVo = new LoginUser(); + sysUserVo.setSysUser(sysUser); + sysUserVo.setRoles(roles); + sysUserVo.setPermissions(permission); + return R.ok(sysUserVo); + + } + @InnerAuth - @GetMapping("/info/{email}") - public R info(@PathVariable("email") String email) - { - SysUser sysUser = userService.selectUserByUserName(email); - if (StringUtils.isNull(sysUser)) - { - return R.fail("用户名或密码错误"); - } - // 角色集合 + @GetMapping("infoByEmail/{email}") + public R getUserInfoByEmail(@PathVariable("email") String email){ + SysUser sysUser = userService.selectByEmail(email); + if(StringUtils.isNull(sysUser)){ + return R.fail("邮箱或密码错误"); + } Set roles = permissionService.getRolePermission(sysUser); - // 权限集合 - Set permissions = permissionService.getMenuPermission(sysUser); - LoginUser sysUserVo = new LoginUser(); - sysUserVo.setSysUser(sysUser); - sysUserVo.setRoles(roles); - sysUserVo.setPermissions(permissions); - return R.ok(sysUserVo); + + + Set permission = permissionService.getMenuPermission(sysUser); + LoginUser loginUser = new LoginUser(); + loginUser.setSysUser(sysUser); + loginUser.setRoles(roles); + loginUser.setPermissions(permission); + return R.ok(loginUser); } /** @@ -169,6 +190,7 @@ public class SysUserController extends BaseController return ajax; } + /** * 根据用户编号获取详细信息 */ diff --git a/src/main/java/com/four/system/mapper/SysUserMapper.java b/src/main/java/com/four/system/mapper/SysUserMapper.java index e8ca7e3..88b0b2f 100644 --- a/src/main/java/com/four/system/mapper/SysUserMapper.java +++ b/src/main/java/com/four/system/mapper/SysUserMapper.java @@ -1,6 +1,8 @@ package com.four.system.mapper; import java.util.List; + +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import com.four.system.api.domain.SysUser; @@ -9,6 +11,8 @@ import com.four.system.api.domain.SysUser; * * @author ruoyi */ +@SuppressWarnings("all") +@Mapper public interface SysUserMapper { /** @@ -41,7 +45,7 @@ public interface SysUserMapper * @param email 用户名 * @return 用户对象信息 */ - public SysUser selectUserByUserName(String email); + /** * 通过用户ID查询用户 @@ -124,4 +128,20 @@ public interface SysUserMapper * @return 结果 */ public SysUser checkEmailUnique(String email); + + /** + * 校验用户名称是否唯一 + * + * @param userName 用户名称 + * @return 结果 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 校验用户名称是否唯一 + * + * @param email 用户名称 + * @return 结果 + */ + public SysUser selectByEmail(String email); } diff --git a/src/main/java/com/four/system/service/ISysPermissionService.java b/src/main/java/com/four/system/service/ISysPermissionService.java index 0966b0d..97a4279 100644 --- a/src/main/java/com/four/system/service/ISysPermissionService.java +++ b/src/main/java/com/four/system/service/ISysPermissionService.java @@ -6,23 +6,23 @@ import com.four.system.api.domain.SysUser; /** * 权限信息 服务层 - * + * * @author ruoyi */ public interface ISysPermissionService { /** * 获取角色数据权限 - * - * @param userId 用户Id + * + * @param user 用户Id * @return 角色权限信息 */ public Set getRolePermission(SysUser user); /** * 获取菜单数据权限 - * - * @param userId 用户Id + * + * @param user 用户Id * @return 菜单权限信息 */ public Set getMenuPermission(SysUser user); diff --git a/src/main/java/com/four/system/service/ISysUserService.java b/src/main/java/com/four/system/service/ISysUserService.java index 60d0b9e..313684f 100644 --- a/src/main/java/com/four/system/service/ISysUserService.java +++ b/src/main/java/com/four/system/service/ISysUserService.java @@ -40,7 +40,7 @@ public interface ISysUserService * @param email 用户名 * @return 用户对象信息 */ - public SysUser selectUserByUserName(String email); + /** * 通过用户ID查询用户 @@ -203,4 +203,9 @@ public interface ISysUserService * @return 结果 */ public String importUser(List userList, Boolean isUpdateSupport, String operName); + + + SysUser selectUserByUserName(String userName); + + SysUser selectByEmail(String email); } diff --git a/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java index 1de29c2..e8bb770 100644 --- a/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/four/system/service/impl/SysUserServiceImpl.java @@ -36,6 +36,7 @@ import com.four.system.service.ISysUserService; * @author ruoyi */ @Service +@SuppressWarnings("all") public class SysUserServiceImpl implements ISysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); @@ -106,11 +107,7 @@ public class SysUserServiceImpl implements ISysUserService * @param email 用户名 * @return 用户对象信息 */ - @Override - public SysUser selectUserByUserName(String email) - { - return userMapper.selectUserByUserName(email); - } + /** * 通过用户ID查询用户 @@ -542,4 +539,14 @@ public class SysUserServiceImpl implements ISysUserService return successMsg.toString(); } + @Override + public SysUser selectUserByUserName(String userName) { + return userMapper.selectUserByUserName(userName); + } + + @Override + public SysUser selectByEmail(String email) { + return userMapper.selectByEmail(email); + } + } diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml index 89a8666..4bf38ea 100644 --- a/src/main/resources/mapper/system/SysUserMapper.xml +++ b/src/main/resources/mapper/system/SysUserMapper.xml @@ -136,10 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - + + + + + + + insert into sys_user( user_id,