Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 055bc15b by chamberone
Options

feat: 添加角色信息

1 parent 5365be9a
Inline Side-by-side
Showing with 44 additions and 20 deletions
project-interface/src/main/java/com/dituhui/pea/pojo/ResourceInfo.java
...@@ -26,11 +26,6 @@ public class ResourceInfo { ...@@ -26,11 +26,6 @@ public class ResourceInfo {
*/ */
private String extra; private String extra;
/** /**
* 团队id
*/
@NotBlank(message = "团队ID不能为空!")
private String teamId;
/**
* 描述 * 描述
*/ */
private String description; private String description;
......
project-interface/src/main/java/com/dituhui/pea/pojo/RoleInfo.java
...@@ -22,11 +22,6 @@ public class RoleInfo { ...@@ -22,11 +22,6 @@ public class RoleInfo {
@NotBlank(message = "角色名称不能为空!") @NotBlank(message = "角色名称不能为空!")
private String name; private String name;
/** /**
* 团队id
*/
@NotBlank(message = "团队ID不能为空!")
private String teamId;
/**
* 角色组id * 角色组id
*/ */
private String groupId; private String groupId;
......
project-interface/src/main/java/com/dituhui/pea/pojo/UserLoginDTO.java
package com.dituhui.pea.pojo; package com.dituhui.pea.pojo;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
...@@ -19,5 +21,8 @@ public class UserLoginDTO { ...@@ -19,5 +21,8 @@ public class UserLoginDTO {
private String avatar; private String avatar;
private String wechat; private String wechat;
private String token; private String token;
private List<RoleInfo> roles;
private List<ResourceInfo> resource;
} }
project-user/src/main/java/com/dituhui/pea/user/dao/RoleDao.java
...@@ -9,10 +9,8 @@ import org.springframework.data.repository.CrudRepository; ...@@ -9,10 +9,8 @@ import org.springframework.data.repository.CrudRepository;
/** /**
* 角色表(Role)表数据库访问层 * 角色表(Role)表数据库访问层
* *
* @author zl
* @since 2020-12-09 15:33:38
*/ */
public interface RoleDao extends JpaRepository<RoleEntity, String>, public interface RoleDao extends JpaRepository<RoleEntity, String>,
JpaSpecificationExecutor<RoleEntity>, CrudRepository<RoleEntity, String> { JpaSpecificationExecutor<RoleEntity>, CrudRepository<RoleEntity, String> {
} }
project-user/src/main/java/com/dituhui/pea/user/dao/UserRoleDao.java
...@@ -23,7 +23,13 @@ public interface UserRoleDao extends JpaRepository<UserRoleEntity, String>, ...@@ -23,7 +23,13 @@ public interface UserRoleDao extends JpaRepository<UserRoleEntity, String>,
* @return * @return
*/ */
List<UserRoleEntity> findByRoleId(String roleId); List<UserRoleEntity> findByRoleId(String roleId);
/**
* 根据用户ID查询
* @param roleId 角色ID
* @return
*/
List<UserRoleEntity> findByUserId(String userId);
/** /**
* 根据角色ID和用户ID删除 * 根据角色ID和用户ID删除
......
project-user/src/main/java/com/dituhui/pea/user/service/UserService.java
...@@ -2,6 +2,7 @@ package com.dituhui.pea.user.service; ...@@ -2,6 +2,7 @@ package com.dituhui.pea.user.service;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.persistence.criteria.Path; import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
...@@ -12,18 +13,24 @@ import org.springframework.data.jpa.domain.Specification; ...@@ -12,18 +13,24 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.alibaba.nacos.common.utils.CollectionUtils;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.enums.RedisKeyGroup; import com.dituhui.pea.enums.RedisKeyGroup;
import com.dituhui.pea.enums.StatusCodeEnum; import com.dituhui.pea.enums.StatusCodeEnum;
import com.dituhui.pea.enums.ThirdPartyEnum; import com.dituhui.pea.enums.ThirdPartyEnum;
import com.dituhui.pea.exception.BusinessException; import com.dituhui.pea.exception.BusinessException;
import com.dituhui.pea.pojo.RoleInfo;
import com.dituhui.pea.pojo.ThirdUserInfo; import com.dituhui.pea.pojo.ThirdUserInfo;
import com.dituhui.pea.pojo.UserInfo; import com.dituhui.pea.pojo.UserInfo;
import com.dituhui.pea.pojo.UserLoginDTO; import com.dituhui.pea.pojo.UserLoginDTO;
import com.dituhui.pea.user.commom.RedisService; import com.dituhui.pea.user.commom.RedisService;
import com.dituhui.pea.user.constant.TextConstant; import com.dituhui.pea.user.constant.TextConstant;
import com.dituhui.pea.user.dao.RoleDao;
import com.dituhui.pea.user.dao.UserDao; import com.dituhui.pea.user.dao.UserDao;
import com.dituhui.pea.user.dao.UserRoleDao;
import com.dituhui.pea.user.entity.RoleEntity;
import com.dituhui.pea.user.entity.UserEntity; import com.dituhui.pea.user.entity.UserEntity;
import com.dituhui.pea.user.entity.UserRoleEntity;
import com.dituhui.pea.user.factory.ThirdStrategy; import com.dituhui.pea.user.factory.ThirdStrategy;
import com.dituhui.pea.user.factory.ThirdStrategyFactory; import com.dituhui.pea.user.factory.ThirdStrategyFactory;
import com.dituhui.pea.user.utils.TextHelper; import com.dituhui.pea.user.utils.TextHelper;
...@@ -47,7 +54,7 @@ public class UserService { ...@@ -47,7 +54,7 @@ public class UserService {
/** /**
* 失效时间ms * 失效时间ms
*/ */
private static final int aliveTime = 7200000; private static final int LIVE_TIME_MILLIS = 7200000;
@Autowired @Autowired
UserDao userDao; UserDao userDao;
...@@ -58,17 +65,35 @@ public class UserService { ...@@ -58,17 +65,35 @@ public class UserService {
@Autowired @Autowired
private RedisService redisService; private RedisService redisService;
@Autowired
UserRoleDao userRoleDao;
@Autowired
RoleDao roleDao;
public Result<?> userLogin(String account, String password) { public Result<?> userLogin(String account, String password) {
UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password)); UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password));
log.info("{}:{}:{}:{}", account, password, SecureUtil.md5(password), user); log.info("{}/{} login", account, password);
if (null != user) { if (null != user) {
// 生成token // 生成token
UserLoginDTO userDTO = BeanUtil.copyProperties(user, UserLoginDTO.class);
// 生成token
String uuid = IdUtil.simpleUUID(); String uuid = IdUtil.simpleUUID();
// 2小时 long timestamp = System.currentTimeMillis() + LIVE_TIME_MILLIS;
long timestamp = System.currentTimeMillis() + aliveTime;
redisService.set(RedisKeyGroup.authToken + ":" + uuid, user, timestamp); redisService.set(RedisKeyGroup.authToken + ":" + uuid, user, timestamp);
UserLoginDTO userDTO = BeanUtil.copyProperties(user, UserLoginDTO.class);
// 获取角色
List<UserRoleEntity> userRoles = userRoleDao.findByUserId(user.getId());
if (CollectionUtils.isNotEmpty(userRoles)) {
List<RoleEntity> roles = roleDao
.findAllById(userRoles.stream().map(r -> r.getRoleId()).collect(Collectors.toList()));
if (CollectionUtils.isNotEmpty(roles)) {
userDTO.setRoles(roles.stream().map(r -> BeanUtil.copyProperties(r, RoleInfo.class))
.collect(Collectors.toList()));
}
}
// 获取资源
userDTO.setToken(uuid); userDTO.setToken(uuid);
return Result.success(userDTO); return Result.success(userDTO);
} else { } else {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!