four
/
modules-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加用户名密码登录

master
ShiSiWei 2023-10-26 14:57:29 +08:00
parent 16b7d99012
commit 1608b66fad
6 changed files with 95 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/com/four/system/controller/SysUserController.java
View File

@ -110,24 +110,45 @@ public class SysUserController extends BaseController
/**
* 获取当前用户信息
*/
@InnerAuth
@GetMapping("/info/{userName}")
public R<LoginUser> info (@PathVariable("userName") String userName)
{
SysUser sysUser = userService.selectUserByUserName(userName);
if(StringUtils.isNull(sysUser)){
return R.fail("用户名或密码错误");
}
Set<String> roles = permissionService.getRolePermission(sysUser);
Set<String> 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<LoginUser> info(@PathVariable("email") String email)
{
SysUser sysUser = userService.selectUserByUserName(email);
if (StringUtils.isNull(sysUser))
{
return R.fail("用户名或密码错误");
}
// 角色集合
@GetMapping("infoByEmail/{email}")
public R<LoginUser> getUserInfoByEmail(@PathVariable("email") String email){
SysUser sysUser = userService.selectByEmail(email);
if(StringUtils.isNull(sysUser)){
return R.fail("邮箱或密码错误");
}
Set<String> roles = permissionService.getRolePermission(sysUser);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser);
sysUserVo.setRoles(roles);
sysUserVo.setPermissions(permissions);
return R.ok(sysUserVo);
Set<String> 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;
}
/**
* 根据用户编号获取详细信息
*/

22
src/main/java/com/four/system/mapper/SysUserMapper.java
View File

@ -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);
}

4
src/main/java/com/four/system/service/ISysPermissionService.java
View File

@ -14,7 +14,7 @@ public interface ISysPermissionService
/**
* 获取角色数据权限
*
* @param userId 用户Id
* @param user 用户Id
* @return 角色权限信息
*/
public Set<String> getRolePermission(SysUser user);
@ -22,7 +22,7 @@ public interface ISysPermissionService
/**
* 获取菜单数据权限
*
* @param userId 用户Id
* @param user 用户Id
* @return 菜单权限信息
*/
public Set<String> getMenuPermission(SysUser user);

7
src/main/java/com/four/system/service/ISysUserService.java
View File

@ -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<SysUser> userList, Boolean isUpdateSupport, String operName);
SysUser selectUserByUserName(String userName);
SysUser selectByEmail(String email);
}

17
src/main/java/com/four/system/service/impl/SysUserServiceImpl.java
View File

@ -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);
}
}

17
src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -136,10 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.email = #{email} and u.del_flag = '0'
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
@ -158,6 +157,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
<select id="selectUserByUserName" resultType="com.four.system.api.domain.SysUser">
<include refid="selectUserVo"/>
where u.user_name = #{userName} and u.del_flag = '0'
</select>
<select id="selectByEmail" resultType="com.four.system.api.domain.SysUser">
<include refid="selectUserVo"/>
where u.email = #{email} and u.del_flag = '0'
</select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>