diff --git a/base-system-common/pom.xml b/base-system-common/pom.xml index 86c22bf..6f06352 100644 --- a/base-system-common/pom.xml +++ b/base-system-common/pom.xml @@ -8,7 +8,7 @@ base-system 3.6.3 - 3.6.4 + 3.6.5 base-system-common diff --git a/base-system-common/src/main/java/com/health/system/common/domain/User.java b/base-system-common/src/main/java/com/health/system/common/domain/User.java index 60b5e12..d9f6dfc 100644 --- a/base-system-common/src/main/java/com/health/system/common/domain/User.java +++ b/base-system-common/src/main/java/com/health/system/common/domain/User.java @@ -11,60 +11,23 @@ import lombok.Data; @Data public class User { - /* - 用户id - */ + private Integer userId; - - /* - 医院名称 - */ - private String hospitalName; - - /* - 部门id - */ - private Long departmentId; - - /* - 头衔id - */ - private Long titleId; - - /* - 邮箱账户 - */ - private String emailCount; - - /* - 验证码 - */ - private String code; - - /* - 密码 - */ - private String password; - private String userName; - /* - 确认密码 - */ - private String finalPassword; - - /* - 个人简介 - */ - private String userIntroduce; - /* - 个人擅长领域 - */ - private String skilledArea; - - private Long roleId; - + private String password; + private String email; + private String inviteCode; + private String avatar; + private Integer gender; + private Integer height; + private Integer weight; + private Integer age; + private String wechatNumber; + private String hospital; + private Integer deptId; + private Integer titleId; + private String introduce; + private String skilled; private Integer status; - public void setCreateBy(String username) { - } } diff --git a/base-system-common/src/main/java/com/health/system/common/domain/model/LoginUser.java b/base-system-common/src/main/java/com/health/system/common/domain/model/LoginUser.java index 6f7c30a..9801260 100644 --- a/base-system-common/src/main/java/com/health/system/common/domain/model/LoginUser.java +++ b/base-system-common/src/main/java/com/health/system/common/domain/model/LoginUser.java @@ -2,6 +2,7 @@ package com.health.system.common.domain.model; import com.health.common.core.user.CommonBody; import com.health.system.common.domain.SysUser; +import com.health.system.common.domain.User; import lombok.Data; import java.io.Serializable; @@ -24,16 +25,18 @@ public class LoginUser implements Serializable { /** * 用户名id */ - private Long userid; private Integer userId; + //----------------------------------- + private User user; + //------------------------------------------ private CommonBody commonBody; /** * 用户名 */ - private String username; + private String userName; /** * 登录时间 @@ -73,20 +76,20 @@ public class LoginUser implements Serializable { this.token = token; } - public Long getUserid() { - return userid; + public Integer getUserId() { + return userId; } - public void setUserid(Long userid) { - this.userid = userid; + public void setUserId(Integer userid) { + this.userId = userId; } - public String getUsername() { - return username; + public String getUserName() { + return userName; } - public void setUsername(String username) { - this.username = username; + public void setUserName(String username) { + this.userName = username; } public Long getLoginTime() { diff --git a/base-system-remote/pom.xml b/base-system-remote/pom.xml index c0a34d9..36f76f2 100644 --- a/base-system-remote/pom.xml +++ b/base-system-remote/pom.xml @@ -8,7 +8,7 @@ base-system 3.6.3 - 3.6.5 + 3.6.7 base-system-remote diff --git a/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java b/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java index 5dbd0cb..59d13fd 100644 --- a/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java +++ b/base-system-remote/src/main/java/com/health/system/remote/RemoteUserService.java @@ -31,8 +31,8 @@ public interface RemoteUserService { public Result getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); //----------------------------------------------------------------------------------- - @PostMapping("/user/email/info") - public Result emailInfo(@RequestBody EmailLoginUser emailLoginUser,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/user/email/info/{email}") + public Result emailInfo(@PathVariable String email, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 注册用户信息 * diff --git a/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java b/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java index 4406b50..9b00c9b 100644 --- a/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java +++ b/base-system-remote/src/main/java/com/health/system/remote/factory/RemoteUserFallbackFactory.java @@ -33,7 +33,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory emailInfo(EmailLoginUser emailLoginUser, String source) { + public Result emailInfo(String email, String source) { return Result.error("获取用户失败:" + throwable.getMessage()); } diff --git a/base-system-server/pom.xml b/base-system-server/pom.xml index d6f38a7..d95dc46 100644 --- a/base-system-server/pom.xml +++ b/base-system-server/pom.xml @@ -48,7 +48,7 @@ com.health base-system-common - 3.6.4 + 3.6.5 diff --git a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java index 858b366..a2e0b59 100644 --- a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java +++ b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java @@ -122,26 +122,19 @@ public class SysUserController extends BaseController //-------------邮箱获取用户信息------------------ - @PostMapping("/email/info") - public Result emailInfo(@RequestBody EmailLoginUser emailLoginUser){ - System.out.println("收到请求对象是："+emailLoginUser); - //先根据邮箱查询有无此人 - CommonBody commonBody=userService.selectByEmail(emailLoginUser); - if (StringUtils.isNull(commonBody)){ + @PostMapping("/email/info/{email}") + public Result emailInfo(@PathVariable String email){ + System.out.println("收到请求邮箱是："+email); + //先根据邮箱查询有无此人user + User user=userService.selectByEmail(email); + if (StringUtils.isNull(user)){ return Result.error("邮箱不存在"); } - if (StringUtils.isNotEmpty(commonBody.getHospital())){ - System.out.println("是医生"); - commonBody.setRoleId(2); - }else{ - System.out.println("是患者"); - commonBody.setRoleId(1); - } //查询该用户下的所有角色 - Set roles=permissionService.getEmailRolePermission(commonBody); + Set roles=permissionService.getEmailRolePermission(user); System.out.println("所有角色是"+roles); LoginUser loginUserVo = new LoginUser(); - loginUserVo.setCommonBody(commonBody); + loginUserVo.setUser(user); loginUserVo.setRoles(roles); System.out.println("最后的返回对象是:"+loginUserVo); return Result.success(loginUserVo); @@ -189,17 +182,17 @@ public class SysUserController extends BaseController System.out.println("userId是"+SecurityUtils.getUserId()); //--------------------------------------------------------------- - CommonBody commonBody=userService.selectCommonbodyByUserId(SecurityUtils.getUserId()); + User user=userService.selectUserByUserId(SecurityUtils.getUserId()); //------------------------------------------------------------------------- // SysUser user = userService.selectUserById(SecurityUtils.getUserId()); System.out.println(); // 角色集合 - Set roles = permissionService.getEmailRolePermission(commonBody); + Set roles = permissionService.getEmailRolePermission(user); // 权限集合 // Set permissions = permissionService.getMenuPermission(user); Result result = Result.success(); Map map = new LinkedHashMap<>(); - map.put("user", commonBody); + map.put("user", user); map.put("roles", roles); // map.put("permissions", permissions); result.setData(map); diff --git a/base-system-server/src/main/java/com/health/system/server/mapper/SysRoleMapper.java b/base-system-server/src/main/java/com/health/system/server/mapper/SysRoleMapper.java index 0b0f11d..f29ccaa 100644 --- a/base-system-server/src/main/java/com/health/system/server/mapper/SysRoleMapper.java +++ b/base-system-server/src/main/java/com/health/system/server/mapper/SysRoleMapper.java @@ -109,5 +109,5 @@ public interface SysRoleMapper { public int deleteRoleByIds(Long[] roleIds); //0--------------------------------------------------------------- - List selectEmailRoleByUserId(@Param("userId") Integer userId, @Param("roleTag") Integer roleTag); + List selectEmailRoleByUserId(@Param("userId") Integer userId); } diff --git a/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java b/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java index c94df3a..27d865f 100644 --- a/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java +++ b/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java @@ -48,6 +48,8 @@ public interface SysUserMapper { */ public SysUser selectUserByUserName(String userName); +//----------------------------------------------------------- + User selectUserByUserEmail(@Param("email") String email); /** * 通过用户ID查询用户 * @@ -147,8 +149,10 @@ public interface SysUserMapper { int insertNewUser(CommonBody commonBody); //------------------------------------------ - CommonBody selectUserByUserEmail(EmailLoginUser emailLoginUser); + //-------------------------------------------------------------------- - CommonBody selectCommonbodyByUserId(@Param("userId1") int userId1); + User selectUserByUserId(@Param("userId1") int userId1); + + } diff --git a/base-system-server/src/main/java/com/health/system/server/service/ISysPermissionService.java b/base-system-server/src/main/java/com/health/system/server/service/ISysPermissionService.java index b3f44f9..9aca888 100644 --- a/base-system-server/src/main/java/com/health/system/server/service/ISysPermissionService.java +++ b/base-system-server/src/main/java/com/health/system/server/service/ISysPermissionService.java @@ -2,6 +2,7 @@ package com.health.system.server.service; import com.health.common.core.user.CommonBody; import com.health.system.common.domain.SysUser; +import com.health.system.common.domain.User; import java.util.Set; @@ -28,5 +29,5 @@ public interface ISysPermissionService { public Set getMenuPermission(SysUser user); //--------------------------------- - Set getEmailRolePermission(CommonBody commonBody); + Set getEmailRolePermission(User user); } diff --git a/base-system-server/src/main/java/com/health/system/server/service/ISysRoleService.java b/base-system-server/src/main/java/com/health/system/server/service/ISysRoleService.java index bf1f414..2ad03db 100644 --- a/base-system-server/src/main/java/com/health/system/server/service/ISysRoleService.java +++ b/base-system-server/src/main/java/com/health/system/server/service/ISysRoleService.java @@ -175,5 +175,5 @@ public interface ISysRoleService { public int insertAuthUsers(Long roleId, Long[] userIds); //----------------------------------------------------------- - Set selectEmailRoleByUserId(Integer userId, Integer roleId); + Set selectEmailRoleByUserId(Integer userId); } diff --git a/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java b/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java index 8cbc2e8..184b998 100644 --- a/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java +++ b/base-system-server/src/main/java/com/health/system/server/service/ISysUserService.java @@ -47,6 +47,9 @@ public interface ISysUserService */ public SysUser selectUserByUserName(String userName); + + //------------------------- + User selectByEmail(String email); /** * 通过用户ID查询用户 * @@ -212,8 +215,7 @@ public interface ISysUserService int registerNewUser(CommonBody commonBody); - //------------------------- - CommonBody selectByEmail(EmailLoginUser emailLoginUser); - CommonBody selectCommonbodyByUserId(Long userId); + + User selectUserByUserId(Long userId); } diff --git a/base-system-server/src/main/java/com/health/system/server/service/impl/SysPermissionServiceImpl.java b/base-system-server/src/main/java/com/health/system/server/service/impl/SysPermissionServiceImpl.java index 2dc6e5d..2c78e25 100644 --- a/base-system-server/src/main/java/com/health/system/server/service/impl/SysPermissionServiceImpl.java +++ b/base-system-server/src/main/java/com/health/system/server/service/impl/SysPermissionServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.lang.hash.Hash; import com.health.common.core.user.CommonBody; import com.health.system.common.domain.SysRole; import com.health.system.common.domain.SysUser; +import com.health.system.common.domain.User; import com.health.system.server.service.ISysMenuService; import com.health.system.server.service.ISysPermissionService; import com.health.system.server.service.ISysRoleService; @@ -49,9 +50,9 @@ public class SysPermissionServiceImpl implements ISysPermissionService { //-------------------------------------------------- @Override - public Set getEmailRolePermission(CommonBody commonBody) { + public Set getEmailRolePermission(User user) { HashSet roles = new HashSet<>(); - roles.addAll(roleService.selectEmailRoleByUserId(commonBody.getUserId(),commonBody.getRoleId())); + roles.addAll(roleService.selectEmailRoleByUserId(user.getUserId())); return roles; } //---------------------------------------------------------------------------- diff --git a/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java b/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java index be7f4ee..4b7e11a 100644 --- a/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java +++ b/base-system-server/src/main/java/com/health/system/server/service/impl/SysRoleServiceImpl.java @@ -90,9 +90,8 @@ public class SysRoleServiceImpl implements ISysRoleService { //------------------------------------------------------- @Override - public Set selectEmailRoleByUserId(Integer userId,Integer roleTag) { - System.out.println("角色id"+userId+",角色标识"+roleTag); - List roleList=roleMapper.selectEmailRoleByUserId(userId,roleTag); + public Set selectEmailRoleByUserId(Integer userId) { + List roleList=roleMapper.selectEmailRoleByUserId(userId); System.out.println("用户角色集合是:"+roleList); HashSet roleSet = new HashSet<>(); roleSet.addAll(roleList); diff --git a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java index 16e7068..95353ce 100644 --- a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java +++ b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java @@ -581,18 +581,19 @@ public class SysUserServiceImpl implements ISysUserService return userId; } + //---------------------------------------------------- @Override - public CommonBody selectByEmail(EmailLoginUser emailLoginUser) { - CommonBody commonBody= userMapper.selectUserByUserEmail(emailLoginUser); - return commonBody; + public User selectByEmail(String email) { + User user= userMapper.selectUserByUserEmail(email); + return user; } @Override - public CommonBody selectCommonbodyByUserId(Long userId) { + public User selectUserByUserId(Long userId) { int userId1 = userId.intValue(); - CommonBody commonBody= userMapper.selectCommonbodyByUserId(userId1); - return commonBody; + User user= userMapper.selectUserByUserId(userId1); + return user; } } diff --git a/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml b/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml index 4199a76..7eff0c0 100644 --- a/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/base-system-server/src/main/resources/mapper/system/SysRoleMapper.xml @@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT role_name FROM tb_user_role ur LEFT JOIN tb_role r on ur.role_id=r.role_id - where ur.user_id=#{userId} and ur.role_tag=#{roleTag} + where ur.user_id=#{userId} diff --git a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml index 43abf83..e25c1c8 100644 --- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml +++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml @@ -141,17 +141,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + select * from tb_user where email=#{email} - + select * from tb_user where user_id=#{userId1}