Ver código fonte

1、获取用户当前角色

machaoyi 1 ano atrás
pai
commit
9be00e7446

+ 35 - 23
.idea/workspace.xml

@@ -4,27 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、token使用redis持久化集成&#10;2、菜单和部门列表展示所有信息">
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/controller/SysUserRoleController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRole.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRoleAddVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/SysUserRoleService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java" afterDir="false" />
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、用户绑定角色&#10;2、用户接口包修改">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/system/entity/UserForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/entity/UserForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/system/web/login.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/Auth/web/login.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/SysUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/UserAddVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserAddVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/UserDetailPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserDetailPO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/UserEditVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserEditVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/entity/UserSearchVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/entity/UserSearchVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/mapper/SysUserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/mapper/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/service/SysUserService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/user/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/SysUserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/SysUserRoleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -116,6 +100,7 @@
     <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="application" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.ctsi.Application" />
+      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -138,7 +123,7 @@
       <updated>1704693898384</updated>
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
-      <workItem from="1704932572547" duration="7946000" />
+      <workItem from="1704932572547" duration="9505000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -196,7 +181,31 @@
       <option name="project" value="LOCAL" />
       <updated>1704935786229</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="1、登录接口包修改">
+      <option name="closed" value="true" />
+      <created>1704941939725</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1704941939725</updated>
+    </task>
+    <task id="LOCAL-00009" summary="1、用户角色表">
+      <option name="closed" value="true" />
+      <created>1704941962280</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1704941962280</updated>
+    </task>
+    <task id="LOCAL-00010" summary="1、用户绑定角色&#10;2、用户接口包修改">
+      <option name="closed" value="true" />
+      <created>1704941988474</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1704941988474</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -211,7 +220,10 @@
     <MESSAGE value="1、部门列表树型结构构建" />
     <MESSAGE value="1、角色表" />
     <MESSAGE value="1、token使用redis持久化集成&#10;2、菜单和部门列表展示所有信息" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、token使用redis持久化集成&#10;2、菜单和部门列表展示所有信息" />
+    <MESSAGE value="1、登录接口包修改" />
+    <MESSAGE value="1、用户角色表" />
+    <MESSAGE value="1、用户绑定角色&#10;2、用户接口包修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、用户绑定角色&#10;2、用户接口包修改" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 18 - 1
application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java

@@ -148,7 +148,24 @@ public class SysUserController{
              return ApiResult.success(sysUserRoleService.save(sysUserRoleAddVO));
          } catch (Exception e) {
              log.error(e.getMessage());
-             return ApiResult.failure("新增数据失败",null);
+             return ApiResult.failure("用户角色绑定失败",null);
+         }
+     }
+
+     /**
+      * 获取用户角色信息
+      *
+      * @param id 用户id
+      * @return 实例对象
+      */
+     @ApiOperation("获取用户角色信息")
+     @GetMapping("/getUserRoles")
+     public ApiResult<SysUserRoleAddVO> getUserRoles(Long id){
+         try {
+             return ApiResult.success(sysUserRoleService.getUserRoles(id));
+         } catch (Exception e) {
+             log.error(e.getMessage());
+             return ApiResult.failure("获取用户角色信息失败",null);
          }
      }
 }

+ 2 - 0
application/src/main/java/com/ctsi/SysUserRole/service/SysUserRoleService.java

@@ -51,4 +51,6 @@ public interface SysUserRoleService{
     boolean deleteById(Long id);
 
     SysUserRoleAddVO save(SysUserRoleAddVO sysUserRoleAddVO);
+
+    SysUserRoleAddVO getUserRoles(Long id);
 }

+ 25 - 1
application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java

@@ -11,7 +11,11 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWra
 import com.ctsi.SysUserRole.entity.SysUserRole;
 import com.ctsi.SysUserRole.mapper.SysUserRoleMapper;
 import com.ctsi.SysUserRole.service.SysUserRoleService;
- /**
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
  * 用户角色表;(sys_user_role)表服务实现类
  * @author : machaoyi
  * @date : 2024-1-11
@@ -112,4 +116,24 @@ public class SysUserRoleServiceImpl implements SysUserRoleService{
          }
          return sysUserRoleAddVO;
      }
+
+     /**
+      * 获取用户角色
+      *
+      * @param id userid
+      * @return 实例对象
+      */
+     public SysUserRoleAddVO getUserRoles(Long id){
+         LambdaQueryWrapper<SysUserRole> queryWrapper = new LambdaQueryWrapper<>();
+         queryWrapper.eq(SysUserRole::getUserId,id);
+         List<SysUserRole> sysUserRoleList = sysUserRoleMapper.selectList(queryWrapper);
+         SysUserRoleAddVO sysUserRoleAddVO = new SysUserRoleAddVO();
+         sysUserRoleAddVO.setUserId(id);
+         List<Long> roleId = new ArrayList<>();
+         for (SysUserRole sysUserRole : sysUserRoleList) {
+             roleId.add(sysUserRole.getRoleId());
+         }
+         sysUserRoleAddVO.setRoleId(roleId);
+         return sysUserRoleAddVO;
+     }
 }