clay/fateverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
clay
2025-11-08 18:11:16 +08:00
parent 94438d1271
commit b423ea902c
57 changed files with 841 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/admin-api/src/main/java/cn/fateverse/admin/dto/UserDto.java
View File

@@ -1,6 +1,6 @@
package cn.fateverse.admin.dto;
import cn.fateverse.common.core.entity.UserBase;
import cn.fateverse.common.core.entity.User;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -83,8 +83,8 @@ public class UserDto{
private List<Long> roleIds;
public UserBase toUser() {
return UserBase.builder()
public User toUser() {
return User.builder()
.userId(userId)
.deptId(deptId)
.userName(userName)

15
admin/admin-api/src/main/java/cn/fateverse/admin/dubbo/DubboUserService.java
View File

@@ -1,7 +1,8 @@
package cn.fateverse.admin.dubbo;
import cn.fateverse.common.core.entity.User;
import cn.fateverse.admin.vo.UserVo;
import cn.fateverse.common.core.entity.UserDetail;
import org.springframework.security.core.userdetails.UserDetails;
import java.util.List;
@@ -17,7 +18,7 @@ public interface DubboUserService {
* @param username 用户名称
* @return 用户信息
*/
User getUserByUsername(String username);
UserVo getUserByUsername(String username);
/**
* 根据用户id查询用户信息
@@ -25,7 +26,7 @@ public interface DubboUserService {
* @param userId 用户id
* @return 用户信息
*/
User getUserByUserId(Long userId);
UserVo getUserByUserId(Long userId);
/**
* 根据roleId查询用户列表
@@ -57,4 +58,12 @@ public interface DubboUserService {
* @return 所有用户的id
*/
List<Long> searchAllUserIds();
/**
* 通过用户名获取用户详细信息
*
* @param userName 用户名
* @return {@link UserDetails }
*/
UserDetail getUserDetailsByUserName(String userName);
}

4
admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserChooseVo.java
View File

@@ -1,7 +1,7 @@
package cn.fateverse.admin.vo;
import cn.fateverse.admin.entity.Role;
import cn.fateverse.admin.entity.Dept;
import cn.fateverse.common.core.entity.Dept;
import cn.fateverse.common.core.entity.Role;
import lombok.Builder;
import lombok.Data;

5
admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserDetailVo.java
View File

@@ -1,7 +1,7 @@
package cn.fateverse.admin.vo;
import cn.fateverse.admin.entity.User;
import cn.fateverse.common.core.entity.Option;
import cn.fateverse.common.core.entity.UserDetail;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
@@ -14,11 +14,10 @@ import java.util.List;
* @date 2022/11/4
*/
@Data
@Builder
@ApiModel("用户详细信息")
public class UserDetailVo {
@ApiModelProperty("用户基本细腻系")
private User user;
private UserDetail user;
@ApiModelProperty("用户所在的岗位")
private List<Long> postIds;