From fc66079daa6c25101d0fbc4808d9b12879ef0c5a Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 14 Mar 2024 09:25:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B9=E7=94=A8=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84SysUser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_admin/controller/UserController.java | 2 +- .../main/java/com/shxy/xymanager_common/entity/SysUser.java | 4 ++++ .../shxy/xymanager_common/threadlocal/UserContextHolder.java | 2 +- .../com/shxy/xymanager_framework/filter/UrlAuthFilter.java | 2 +- .../com/shxy/xymanager_framework/filter/UserInfoFilter.java | 2 +- .../com/shxy/xymanager_service/impl/SysUserServiceImpl.java | 4 ++-- .../com/shxy/xymanager_service/impl/TerminalServiceImpl.java | 3 +-- .../java/com/shxy/xymanager_service/impl/UserServiceImpl.java | 4 ++-- .../com/shxy/xymanager_service/service/SysUserService.java | 2 +- 9 files changed, 14 insertions(+), 11 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java index e6aa7ac..2bc2364 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java @@ -4,7 +4,7 @@ import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.PermissionDetail; import com.shxy.xymanager_common.bean.ServiceStatus; -import com.shxy.xymanager_common.bean.SysUser; +import com.shxy.xymanager_common.entity.SysUser; import com.shxy.xymanager_common.entity.TbPermission; import com.shxy.xymanager_common.model.PermissionModel; import com.shxy.xymanager_common.threadlocal.UserContextHolder; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java index cdda438..bbd44ec 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/SysUser.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_common.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.shxy.xymanager_common.bean.PermissionDetail; import io.swagger.annotations.ApiModelProperty; import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.Data; @@ -51,4 +52,7 @@ public class SysUser { private Date updateTime; + @ApiModelProperty(value="权限信息") + PermissionDetail permission; + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/threadlocal/UserContextHolder.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/threadlocal/UserContextHolder.java index 211eb7a..1f9e5dd 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/threadlocal/UserContextHolder.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/threadlocal/UserContextHolder.java @@ -1,6 +1,6 @@ package com.shxy.xymanager_common.threadlocal; -import com.shxy.xymanager_common.bean.SysUser; +import com.shxy.xymanager_common.entity.SysUser; import org.springframework.core.NamedInheritableThreadLocal; public class UserContextHolder { diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UrlAuthFilter.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UrlAuthFilter.java index 3eca3f6..ddaeb45 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UrlAuthFilter.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UrlAuthFilter.java @@ -1,7 +1,7 @@ package com.shxy.xymanager_framework.filter; -import com.shxy.xymanager_common.bean.SysUser; +import com.shxy.xymanager_common.entity.SysUser; import com.shxy.xymanager_common.config.SecurityConfig; import com.shxy.xymanager_common.threadlocal.UserContextHolder; import com.shxy.xymanager_service.service.SysUserService; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UserInfoFilter.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UserInfoFilter.java index 3d13a8e..20eed41 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UserInfoFilter.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/filter/UserInfoFilter.java @@ -1,7 +1,7 @@ package com.shxy.xymanager_framework.filter; -import com.shxy.xymanager_common.bean.SysUser; import com.shxy.xymanager_common.config.SecurityConfig; +import com.shxy.xymanager_common.entity.SysUser; import com.shxy.xymanager_common.threadlocal.UserContextHolder; import com.shxy.xymanager_common.util.TokenUtil; import com.shxy.xymanager_service.service.SysUserService; diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java index 10acae4..1142957 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java @@ -99,8 +99,8 @@ public class SysUserServiceImpl implements SysUserService { } @Override - public SysUser selectUserById(Integer userId) { - return sysUserMapperDao.selectByPrimaryKey(userId); + public com.shxy.xymanager_common.entity.SysUser selectUserById(Integer userId) { + return sysUserDao.selectByPrimaryKey(userId); } @Override diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index 3ddf529..af94350 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -8,7 +8,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; -import com.shxy.xymanager_common.bean.SysUser; import com.shxy.xymanager_common.constant.Constants; import com.shxy.xymanager_common.dto.*; import com.shxy.xymanager_common.entity.*; @@ -713,7 +712,7 @@ public class TerminalServiceImpl implements TerminalService { if (BeanUtil.isEmpty(sysUser)) { Asserts.fail("用户不存在"); } - Integer uid = sysUser.getUserId(); + Integer uid = sysUser.getUid(); if (uid == null) { Asserts.fail("用户不存在"); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UserServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UserServiceImpl.java index 021566b..f9bf59d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UserServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UserServiceImpl.java @@ -3,7 +3,7 @@ package com.shxy.xymanager_service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.shxy.xymanager_common.bean.PermissionDetail; -import com.shxy.xymanager_common.bean.SysUser; +import com.shxy.xymanager_common.entity.SysUser; import com.shxy.xymanager_common.dto.TerminalsAndStatusDto; import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.enums.CommonStatus; @@ -60,7 +60,7 @@ public class UserServiceImpl implements UserService { if (BeanUtil.isEmpty(sysUser)) { Asserts.fail("用户不存在"); } - Integer uid = sysUser.getUserId(); + Integer uid = sysUser.getUid(); if (uid == null) { Asserts.fail("用户不存在"); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java index 0a0b1c7..bb97337 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SysUserService.java @@ -32,7 +32,7 @@ public interface SysUserService { * @param userId 用户ID * @return 用户对象信息 */ - SysUser selectUserById(Integer userId); + com.shxy.xymanager_common.entity.SysUser selectUserById(Integer userId); ServiceBody addUser(SysUserVo vo);