1、用户绑定角色

2、用户接口包修改

.idea/workspace.xml

@@ -4,18 +4,27 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、部门列表树型结构构建">
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/entity/SysRole.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/service/SysRoleService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/service/impl/SysRoleServiceImpl.java" afterDir="false" />
+    <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" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/resources/application.yml" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -96,6 +105,7 @@
       <recent name="C:\Users\setin\IdeaProjects\GeneralFrame\application\src\main\java\com\ctsi" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.ctsi.SysUserRole.entity" />
       <recent name="com.ctsi.SysMenu.entity" />
       <recent name="com.ctsi.SysOrg.entity" />
       <recent name="com.ctsi.user.entity" />
@@ -128,7 +138,7 @@
       <updated>1704693898384</updated>
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
-      <workItem from="1704932572547" duration="3081000" />
+      <workItem from="1704932572547" duration="7946000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -170,7 +180,23 @@
       <option name="project" value="LOCAL" />
       <updated>1704874225958</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="1、角色表">
+      <option name="closed" value="true" />
+      <created>1704935729107</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1704935729107</updated>
+    </task>
+    <task id="LOCAL-00007" summary="1、token使用redis持久化集成&#10;2、菜单和部门列表展示所有信息">
+      <option name="closed" value="true" />
+      <created>1704935786229</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1704935786229</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -183,7 +209,9 @@
     <MESSAGE value="1、修改登录接口的userName字段&#10;2、long类型的id使用string字符串传递给前端&#10;3、优化用户相关接口&#10;4、新增用户详情表&#10;5、新增mybatis-plus-join" />
     <MESSAGE value="1、菜单接口、部门接口" />
     <MESSAGE value="1、部门列表树型结构构建" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、部门列表树型结构构建" />
+    <MESSAGE value="1、角色表" />
+    <MESSAGE value="1、token使用redis持久化集成&#10;2、菜单和部门列表展示所有信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、token使用redis持久化集成&#10;2、菜单和部门列表展示所有信息" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

application/src/main/java/com/ctsi/user/controller/SysUserController.java → application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java

@@ -1,10 +1,13 @@
-package com.ctsi.user.controller;
+package com.ctsi.SysUser.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.SysUserDetail.entity.SysUserDetail;
 import com.ctsi.SysUserDetail.service.SysUserDetailService;
+import com.ctsi.SysUserRole.entity.SysUserRole;
+import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
+import com.ctsi.SysUserRole.service.SysUserRoleService;
 import com.ctsi.entity.FramePage;
-import com.ctsi.user.entity.*;
+import com.ctsi.SysUser.entity.*;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,7 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.user.service.SysUserService;
+import com.ctsi.SysUser.service.SysUserService;
 
 import javax.annotation.Resource;
 
@@ -30,6 +33,8 @@ public class SysUserController{
     private SysUserService sysUserService;
     @Resource
     private SysUserDetailService sysUserDetailService;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
     private static final Logger log = LoggerFactory.getLogger(SysUserController.class);
     
     /** 
@@ -129,4 +134,21 @@ public class SysUserController{
             return ApiResult.failure("删除数据失败",null);
         }
     }
+
+     /**
+      * 用户角色绑定
+      *
+      * @param sysUserRoleAddVO 实例对象
+      * @return 实例对象
+      */
+     @ApiOperation("用户角色绑定")
+     @PostMapping("/userRoleAdd")
+     public ApiResult<SysUserRoleAddVO> userRoleAdd(@RequestBody SysUserRoleAddVO sysUserRoleAddVO){
+         try {
+             return ApiResult.success(sysUserRoleService.save(sysUserRoleAddVO));
+         } catch (Exception e) {
+             log.error(e.getMessage());
+             return ApiResult.failure("新增数据失败",null);
+         }
+     }
 }

application/src/main/java/com/ctsi/user/entity/SysUser.java → application/src/main/java/com/ctsi/SysUser/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.ctsi.user.entity;
+package com.ctsi.SysUser.entity;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.ctsi.utils.LongtoStringSerialize;

application/src/main/java/com/ctsi/user/entity/UserAddVO.java → application/src/main/java/com/ctsi/SysUser/entity/UserAddVO.java

@@ -1,11 +1,9 @@
-package com.ctsi.user.entity;
+package com.ctsi.SysUser.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 @ApiModel("用户新增信息")
 @Data
 public class UserAddVO {

application/src/main/java/com/ctsi/user/entity/UserDetailPO.java → application/src/main/java/com/ctsi/SysUser/entity/UserDetailPO.java

@@ -1,7 +1,6 @@
-package com.ctsi.user.entity;
+package com.ctsi.SysUser.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;

application/src/main/java/com/ctsi/user/entity/UserEditVO.java → application/src/main/java/com/ctsi/SysUser/entity/UserEditVO.java

@@ -1,4 +1,4 @@
-package com.ctsi.user.entity;
+package com.ctsi.SysUser.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ctsi.utils.LongtoStringSerialize;

application/src/main/java/com/ctsi/user/entity/UserSearchVO.java → application/src/main/java/com/ctsi/SysUser/entity/UserSearchVO.java

@@ -1,8 +1,5 @@
-package com.ctsi.user.entity;
+package com.ctsi.SysUser.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ctsi.utils.LongtoStringSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

application/src/main/java/com/ctsi/user/mapper/SysUserMapper.java → application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.java

@@ -1,4 +1,4 @@
-package com.ctsi.user.mapper;
+package com.ctsi.SysUser.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.user.entity.SysUser;
+import com.ctsi.SysUser.entity.SysUser;
 
  /**
  * 用户表;(sys_user)表数据库访问层

application/src/main/java/com/ctsi/user/mapper/SysUserMapper.xml → application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.ctsi.user.mapper.SysUserMapper">
-     <select id="selectByPage" resultType="com.ctsi.user.entity.SysUser">
+<mapper namespace="com.ctsi.SysUser.mapper.SysUserMapper">
+     <select id="selectByPage" resultType="com.ctsi.SysUser.entity.SysUser">
         select * from sys_user ${ew.customSqlSegment}
     </select>
 </mapper>

application/src/main/java/com/ctsi/user/service/SysUserService.java → application/src/main/java/com/ctsi/SysUser/service/SysUserService.java

@@ -1,9 +1,9 @@
-package com.ctsi.user.service;
+package com.ctsi.SysUser.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ctsi.user.entity.SysUser;
-import com.ctsi.user.entity.UserDetailPO;
-import com.ctsi.user.entity.UserSearchVO;
+import com.ctsi.SysUser.entity.SysUser;
+import com.ctsi.SysUser.entity.UserDetailPO;
+import com.ctsi.SysUser.entity.UserSearchVO;
 
 /**
  * 用户表;(sys_user)表服务接口

application/src/main/java/com/ctsi/user/service/impl/SysUserServiceImpl.java → application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ctsi.user.service.impl;
+package com.ctsi.SysUser.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.ctsi.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.user.entity.UserDetailPO;
-import com.ctsi.user.entity.UserSearchVO;
+import com.ctsi.SysUser.entity.UserDetailPO;
+import com.ctsi.SysUser.entity.UserSearchVO;
 import com.ctsi.utils.PasswordEncoderUtil;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,9 +12,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.ctsi.user.entity.SysUser;
-import com.ctsi.user.mapper.SysUserMapper;
-import com.ctsi.user.service.SysUserService;
+import com.ctsi.SysUser.entity.SysUser;
+import com.ctsi.SysUser.mapper.SysUserMapper;
+import com.ctsi.SysUser.service.SysUserService;
  /**
  * 用户表;(sys_user)表服务实现类
  * @author : machaoyi