machaoyi 1 год назад
Родитель
Сommit
4c65c71156
31 измененных файлов с 80 добавлено и 89 удалено
  1. 13 7
      .idea/workspace.xml
  2. 0 1
      application/src/main/java/com/ctsi/Application.java
  3. 2 2
      application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java
  4. 3 2
      application/src/main/java/com/ctsi/SysMenu/entity/SysMenu.java
  5. 0 1
      application/src/main/java/com/ctsi/SysMenu/entity/SysMenuSearchPO.java
  6. 1 2
      application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java
  7. 5 7
      application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java
  8. 2 2
      application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java
  9. 3 2
      application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java
  10. 0 1
      application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java
  11. 1 2
      application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.java
  12. 5 8
      application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java
  13. 2 2
      application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java
  14. 3 2
      application/src/main/java/com/ctsi/SysRole/entity/SysRole.java
  15. 1 1
      application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.java
  16. 4 4
      application/src/main/java/com/ctsi/SysRole/service/impl/SysRoleServiceImpl.java
  17. 2 3
      application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java
  18. 3 2
      application/src/main/java/com/ctsi/SysUser/entity/SysUser.java
  19. 1 1
      application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.java
  20. 8 8
      application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java
  21. 2 3
      application/src/main/java/com/ctsi/SysUserDetail/controller/SysUserDetailController.java
  22. 3 3
      application/src/main/java/com/ctsi/SysUserDetail/entity/SysUserDetail.java
  23. 1 1
      application/src/main/java/com/ctsi/SysUserDetail/mapper/SysUserDetailMapper.java
  24. 4 4
      application/src/main/java/com/ctsi/SysUserDetail/service/impl/SysUserDetailServiceImpl.java
  25. 2 3
      application/src/main/java/com/ctsi/SysUserRole/controller/SysUserRoleController.java
  26. 3 3
      application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRole.java
  27. 0 3
      application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRoleAddVO.java
  28. 1 1
      application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.java
  29. 5 6
      application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java
  30. 0 1
      application/src/main/java/com/ctsi/config/SwaggerConfig.java
  31. 0 1
      application/src/main/java/com/ctsi/handler/GlobalExceptionHandler.java

+ 13 - 7
.idea/workspace.xml

@@ -4,11 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、用户绑定角色&#10;2、用户接口包修改">
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、获取用户当前角色">
       <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/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" />
@@ -123,7 +120,7 @@
       <updated>1704693898384</updated>
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
-      <workItem from="1704932572547" duration="9505000" />
+      <workItem from="1704932572547" duration="11003000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -205,7 +202,15 @@
       <option name="project" value="LOCAL" />
       <updated>1704941988474</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="1、获取用户当前角色">
+      <option name="closed" value="true" />
+      <created>1704943380798</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1704943380798</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -223,7 +228,8 @@
     <MESSAGE value="1、登录接口包修改" />
     <MESSAGE value="1、用户角色表" />
     <MESSAGE value="1、用户绑定角色&#10;2、用户接口包修改" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、用户绑定角色&#10;2、用户接口包修改" />
+    <MESSAGE value="1、获取用户当前角色" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、获取用户当前角色" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 0 - 1
application/src/main/java/com/ctsi/Application.java

@@ -2,7 +2,6 @@ package com.ctsi;
 
 import cn.dev33.satoken.SaManager;
 import cn.hutool.system.HostInfo;
-import org.apache.ibatis.annotations.Mapper;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 2 - 2
application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java

@@ -1,7 +1,9 @@
 package com.ctsi.SysMenu.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.SysMenu.entity.SysMenu;
 import com.ctsi.SysMenu.entity.SysMenuSearchPO;
+import com.ctsi.SysMenu.service.SysMenuService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
@@ -9,8 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysMenu.entity.SysMenu;
-import com.ctsi.SysMenu.service.SysMenuService;
 
 import javax.annotation.Resource;
 

+ 3 - 2
application/src/main/java/com/ctsi/SysMenu/entity/SysMenu.java

@@ -1,11 +1,12 @@
 package com.ctsi.SysMenu.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;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.util.Date;
 

+ 0 - 1
application/src/main/java/com/ctsi/SysMenu/entity/SysMenuSearchPO.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**

+ 1 - 2
application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java

@@ -1,13 +1,12 @@
 package com.ctsi.SysMenu.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.SysMenu.entity.SysMenu;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.SysMenu.entity.SysMenu;
 
  /**
  * 菜单;(sys_menu)表数据库访问层

+ 5 - 7
application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java

@@ -1,18 +1,16 @@
 package com.ctsi.SysMenu.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.ctsi.SysMenu.entity.SysMenuSearchPO;
-import com.ctsi.SysOrg.entity.SysOrgSearchPO;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.SysMenu.entity.SysMenu;
+import com.ctsi.SysMenu.entity.SysMenuSearchPO;
 import com.ctsi.SysMenu.mapper.SysMenuMapper;
 import com.ctsi.SysMenu.service.SysMenuService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 

+ 2 - 2
application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java

@@ -1,7 +1,9 @@
 package com.ctsi.SysOrg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.SysOrg.entity.SysOrg;
 import com.ctsi.SysOrg.entity.SysOrgSearchPO;
+import com.ctsi.SysOrg.service.SysOrgService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
@@ -9,8 +11,6 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysOrg.entity.SysOrg;
-import com.ctsi.SysOrg.service.SysOrgService;
 
 import javax.annotation.Resource;
 

+ 3 - 2
application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java

@@ -1,11 +1,12 @@
 package com.ctsi.SysOrg.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;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.util.Date;
 

+ 0 - 1
application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**

+ 1 - 2
application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.java

@@ -1,13 +1,12 @@
 package com.ctsi.SysOrg.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.SysOrg.entity.SysOrg;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.SysOrg.entity.SysOrg;
 
  /**
  * 部门信息表;(sys_org)表数据库访问层

+ 5 - 8
application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java

@@ -1,19 +1,16 @@
 package com.ctsi.SysOrg.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.annotation.OrderBy;
-import com.ctsi.SysOrg.entity.SysOrgSearchPO;
-import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.SysOrg.entity.SysOrg;
+import com.ctsi.SysOrg.entity.SysOrgSearchPO;
 import com.ctsi.SysOrg.mapper.SysOrgMapper;
 import com.ctsi.SysOrg.service.SysOrgService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 

+ 2 - 2
application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java

@@ -1,6 +1,8 @@
 package com.ctsi.SysRole.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.SysRole.entity.SysRole;
+import com.ctsi.SysRole.service.SysRoleService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
@@ -8,8 +10,6 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysRole.entity.SysRole;
-import com.ctsi.SysRole.service.SysRoleService;
 
 import javax.annotation.Resource;
 

+ 3 - 2
application/src/main/java/com/ctsi/SysRole/entity/SysRole.java

@@ -1,11 +1,12 @@
 package com.ctsi.SysRole.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;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 import java.util.Date;
 

+ 1 - 1
application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.SysRole.entity.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.SysRole.entity.SysRole;
 
  /**
  * 角色表;(sys_role)表数据库访问层

+ 4 - 4
application/src/main/java/com/ctsi/SysRole/service/impl/SysRoleServiceImpl.java

@@ -1,15 +1,15 @@
 package com.ctsi.SysRole.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-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.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.SysRole.entity.SysRole;
 import com.ctsi.SysRole.mapper.SysRoleMapper;
 import com.ctsi.SysRole.service.SysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
  /**
  * 角色表;(sys_role)表服务实现类
  * @author : machaoyi

+ 2 - 3
application/src/main/java/com/ctsi/SysUser/controller/SysUserController.java

@@ -1,13 +1,13 @@
 package com.ctsi.SysUser.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.SysUser.entity.*;
+import com.ctsi.SysUser.service.SysUserService;
 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.SysUser.entity.*;
 import com.ctsi.utils.ApiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysUser.service.SysUserService;
 
 import javax.annotation.Resource;
 

+ 3 - 2
application/src/main/java/com/ctsi/SysUser/entity/SysUser.java

@@ -1,12 +1,13 @@
 package com.ctsi.SysUser.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ctsi.utils.LongtoStringSerialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 
  /**

+ 1 - 1
application/src/main/java/com/ctsi/SysUser/mapper/SysUserMapper.java

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

+ 8 - 8
application/src/main/java/com/ctsi/SysUser/service/impl/SysUserServiceImpl.java

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

+ 2 - 3
application/src/main/java/com/ctsi/SysUserDetail/controller/SysUserDetailController.java

@@ -1,15 +1,14 @@
 package com.ctsi.SysUserDetail.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.SysUserDetail.entity.SysUserDetail;
+import com.ctsi.SysUserDetail.service.SysUserDetailService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
-import com.ctsi.SysUserDetail.service.SysUserDetailService;
 
 import javax.annotation.Resource;
 

+ 3 - 3
application/src/main/java/com/ctsi/SysUserDetail/entity/SysUserDetail.java

@@ -1,13 +1,13 @@
 package com.ctsi.SysUserDetail.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;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
-import java.util.Date;
 
  /**
  * 用户信息表;

+ 1 - 1
application/src/main/java/com/ctsi/SysUserDetail/mapper/SysUserDetailMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.SysUserDetail.entity.SysUserDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.SysUserDetail.entity.SysUserDetail;
 
  /**
  * 用户信息表;(sys_user_detail)表数据库访问层

+ 4 - 4
application/src/main/java/com/ctsi/SysUserDetail/service/impl/SysUserDetailServiceImpl.java

@@ -1,15 +1,15 @@
 package com.ctsi.SysUserDetail.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-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.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.SysUserDetail.entity.SysUserDetail;
 import com.ctsi.SysUserDetail.mapper.SysUserDetailMapper;
 import com.ctsi.SysUserDetail.service.SysUserDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
  /**
  * 用户信息表;(sys_user_detail)表服务实现类
  * @author : machaoyi

+ 2 - 3
application/src/main/java/com/ctsi/SysUserRole/controller/SysUserRoleController.java

@@ -1,15 +1,14 @@
 package com.ctsi.SysUserRole.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ctsi.SysUserRole.entity.SysUserRole;
+import com.ctsi.SysUserRole.service.SysUserRoleService;
 import com.ctsi.entity.FramePage;
 import com.ctsi.utils.ApiResult;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
-import com.ctsi.SysUserRole.entity.SysUserRole;
-import com.ctsi.SysUserRole.service.SysUserRoleService;
 
 import javax.annotation.Resource;
 

+ 3 - 3
application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRole.java

@@ -1,13 +1,13 @@
 package com.ctsi.SysUserRole.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;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
-import java.util.Date;
 
  /**
  * 用户角色表;

+ 0 - 3
application/src/main/java/com/ctsi/SysUserRole/entity/SysUserRoleAddVO.java

@@ -1,9 +1,6 @@
 package com.ctsi.SysUserRole.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;
 import io.swagger.annotations.ApiModelProperty;
 

+ 1 - 1
application/src/main/java/com/ctsi/SysUserRole/mapper/SysUserRoleMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ctsi.SysUserRole.entity.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.ctsi.SysUserRole.entity.SysUserRole;
 
  /**
  * 用户角色表;(sys_user_role)表数据库访问层

+ 5 - 6
application/src/main/java/com/ctsi/SysUserRole/service/impl/SysUserRoleServiceImpl.java

@@ -1,16 +1,15 @@
 package com.ctsi.SysUserRole.service.impl;
 
-import cn.hutool.core.util.StrUtil;
-import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-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.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ctsi.SysUserRole.entity.SysUserRole;
+import com.ctsi.SysUserRole.entity.SysUserRoleAddVO;
 import com.ctsi.SysUserRole.mapper.SysUserRoleMapper;
 import com.ctsi.SysUserRole.service.SysUserRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;

+ 0 - 1
application/src/main/java/com/ctsi/config/SwaggerConfig.java

@@ -4,7 +4,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.oas.annotations.EnableOpenApi;
 import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;

+ 0 - 1
application/src/main/java/com/ctsi/handler/GlobalExceptionHandler.java

@@ -1,6 +1,5 @@
 package com.ctsi.handler;
 
-import cn.dev33.satoken.util.SaResult;
 import com.ctsi.utils.ApiResult;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;