功能提交，大后端使用 全局唯一id,对大后端进行处理

common/fire-dto/src/main/java/com/fire/dto/system/District.java

@@ -21,7 +21,7 @@ public class District {
      * 主键
      */
     @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 父类编号，也就是城市省会编号

common/fire-dto/src/main/java/com/fire/dto/system/SysDept.java

@@ -31,7 +31,7 @@ public class SysDept extends Model<SysDept> {
      * 部门主键ID
      */
     @TableId(value = "dept_id", type = IdType.INPUT)
-    private Integer deptId;
+    private Long deptId;
 
     /**
      * 部门名称
@@ -42,7 +42,7 @@ public class SysDept extends Model<SysDept> {
     /**
      * 上级部门
      */
-    private Integer parentId;
+    private Long parentId;
 
     /**
      * 排序

common/fire-dto/src/main/java/com/fire/dto/system/SysDict.java

@@ -26,7 +26,7 @@ public class SysDict implements Serializable {
      * 编号
      */
     @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 字典名称

common/fire-dto/src/main/java/com/fire/dto/system/SysJob.java

@@ -28,7 +28,7 @@ private static final long serialVersionUID=1L;
      * 主键
      */
     @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 岗位名称

common/fire-dto/src/main/java/com/fire/dto/system/SysMenu.java

@@ -31,7 +31,7 @@ public class SysMenu extends Model<SysMenu> {
      * 菜单ID
      */
     @TableId(value = "menu_id", type = IdType.INPUT)
-    private Integer menuId;
+    private Long menuId;
 
     /**
      * 菜单名称
@@ -56,7 +56,7 @@ public class SysMenu extends Model<SysMenu> {
     /**
      * 父菜单ID
      */
-    private Integer parentId;
+    private Long parentId;
 
     /**
      * 图标

common/fire-dto/src/main/java/com/fire/dto/system/SysRole.java

@@ -32,7 +32,7 @@ public class SysRole extends Model<SysRole> {
      * 角色主键
      */
     @TableId(value = "role_id", type = IdType.INPUT)
-    private Integer roleId;
+    private Long roleId;
 
 
     /**
@@ -70,6 +70,6 @@ public class SysRole extends Model<SysRole> {
      * 部门ids
      */
     @TableField(exist = false)
-    private List<Integer> roleDepts;
+    private List<Long> roleDepts;
 
 }

common/fire-dto/src/main/java/com/fire/dto/system/SysRoleDept.java

@@ -27,17 +27,17 @@ public class SysRoleDept extends Model<SysRoleDept> {
      * 部门主键ID
      */
     @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 角色ID
      */
-    private Integer roleId;
+    private Long roleId;
 
     /**
      * 部门ID
      */
-    private Integer deptId;
+    private Long deptId;
 
 
 }

common/fire-dto/src/main/java/com/fire/dto/system/SysRoleMenu.java

@@ -27,17 +27,17 @@ public class SysRoleMenu extends Model<SysRoleMenu> {
      * 主键ID
      */
     @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 角色ID
      */
-    private Integer roleId;
+    private Long roleId;
 
     /**
      * 菜单ID
      */
-    private Integer menuId;
+    private Long menuId;
 
 
 }

common/fire-dto/src/main/java/com/fire/dto/system/SysUser.java

@@ -30,7 +30,8 @@ public class SysUser extends Model<SysUser> {
      * 主键ID
      */
     @TableId(value = "user_id", type = IdType.INPUT)
-    private Integer userId;
+    private Long userId;
+
 
     /**
      * 用户名
@@ -45,12 +46,12 @@ public class SysUser extends Model<SysUser> {
     /**
      * 部门ID
      */
-    private Integer deptId;
+    private Long deptId;
 
     /**
      * 岗位ID
      */
-    private Integer jobId;
+    private Long jobId;
 
     /**
      * 邮箱

common/fire-dto/src/main/java/com/fire/dto/system/SysUserRole.java

@@ -28,17 +28,17 @@ public class SysUserRole extends Model<SysUserRole> {
      * 主键ID
      */
     @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 用户ID
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 角色ID
      */
-    private Integer roleId;
+    private Long roleId;
 
 
     /**

modules/admin/src/main/java/com/fire/admin/dto/RoleDTO.java

@@ -18,14 +18,14 @@ public class RoleDTO {
 
     private static final long serialVersionUID = 1L;
 
-    private Integer roleId;
+    private Long roleId;
     private String roleName;
     private String roleCode;
     private String roleDesc;
     private String delFlag;
     private int dsType;
     List<SysRoleMenu> roleMenus;
-    List<Integer> roleDepts;
+    List<Long> roleDepts;
 
 
 }

modules/admin/src/main/java/com/fire/admin/dto/UserDTO.java

@@ -15,17 +15,17 @@ import java.util.List;
 @Data
 public class UserDTO implements Serializable {
 
-    private Integer userId;
+    private Long userId;
     private String username;
     private String password;
-    private Integer deptId;
+    private Long deptId;
     private String phone;
     private String email;
     private String avatar;
     private String lockFlag;
     private String delFlag;
-    private List<Integer> roleList;
-    private List<Integer> deptList;
+    private List<Long> roleList;
+    private List<Long> deptList;
     /**
      * 新密码
      */

modules/admin/src/main/java/com/fire/admin/mapper/SysMenuMapper.java

@@ -20,6 +20,6 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
 
     @Select("select m.perms from sys_menu m, sys_user u, sys_user_role ur, sys_role_menu rm\n" + "        where u.user_id = #{user_id} and u.user_id = ur.user_id\n" + "          and ur.role_id = rm.role_id and rm.menu_id = m.menu_id")
-    List<String> findPermsByUserId(Integer userId);
+    List<String> findPermsByUserId(Long userId);
 
 }

modules/admin/src/main/java/com/fire/admin/mapper/SysRoleMapper.java

@@ -32,7 +32,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      * @return
      */
     @Select("select m.menu_id,m.name,m.type,m.parent_id,m.sort,m.perms from sys_menu m, sys_role_menu rm where rm.role_id = #{roleId} and m.menu_id = rm.menu_id")
-    List<SysMenu> findMenuListByRoleId(int roleId);
+    List<SysMenu> findMenuListByRoleId(Long roleId);
 
     /**
      * 通过用户ID，查询角色信息
@@ -41,5 +41,5 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      * @return
      */
     @Select("SELECT r.* FROM sys_role r, sys_user_role ur WHERE r.role_id = ur.role_id AND r.del_flag = 0 and  ur.user_id IN (#{userId})")
-    List<SysRole> listRolesByUserId(Integer userId);
+    List<SysRole> listRolesByUserId(Long userId);
 }

modules/admin/src/main/java/com/fire/admin/mapper/SysRoleMenuMapper.java

@@ -22,6 +22,6 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
      * @Date 11:21 2019-05-10
      **/
     @Select("SELECT rm.menu_id FROM sys_role_menu rm,sys_user_role ur,sys_user u WHERE u.user_id = #{userId} AND u.user_id = ur.user_id AND rm.role_id = ur.role_id")
-    List<Integer> getMenuIdByUserId(Integer userId);
+    List<Long> getMenuIdByUserId(Long userId);
 
 }

modules/admin/src/main/java/com/fire/admin/mapper/SysUserRoleMapper.java

@@ -21,5 +21,5 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
     int insert(SysUserRole entity);
 
     @Select("SELECT r.role_name,ur.role_id \n" + "FROM (sys_role r LEFT JOIN sys_user_role ur ON r.role_id = ur.role_id ) \n" + "LEFT JOIN sys_user u ON u.user_id = ur.user_id WHERE u.user_id = #{userId}")
-    List<SysUserRole> selectUserRoleListByUserId(Integer userId);
+    List<SysUserRole> selectUserRoleListByUserId(Long userId);
 }

modules/admin/src/main/java/com/fire/admin/rest/SysDeptController.java

@@ -40,7 +40,7 @@ public class SysDeptController {
     @PostMapping
     @PreAuthorize("hasAuthority('sys:dept:add')")
     public BaseRestResponse save(@RequestBody SysDept sysDept) {
-        sysDept.setDeptId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
+        sysDept.setDeptId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
         return new BaseRestResponse(deptService.save(sysDept));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/SysDictController.java

@@ -40,7 +40,7 @@ public class SysDictController {
     @PreAuthorize("hasAuthority('sys:dict:add')")
     @PostMapping
     public BaseRestResponse add(@RequestBody SysDict sysDict) {
-        sysDict.setId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
+        sysDict.setId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
         return new BaseRestResponse(dictService.save(sysDict));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/SysMenuController.java

@@ -41,7 +41,7 @@ public class SysMenuController {
     @PreAuthorize("hasAuthority('sys:menu:add')")
     @PostMapping
     public BaseRestResponse save(@RequestBody SysMenu menu) {
-        menu.setMenuId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
+        menu.setMenuId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
         return new BaseRestResponse(menuService.save(menu));
     }
 
@@ -68,7 +68,7 @@ public class SysMenuController {
      */
     @GetMapping("/getMenus")
     public BaseRestResponse getMenus() {
-        return new BaseRestResponse(menuService.selectMenuTree(0));
+        return new BaseRestResponse(menuService.selectMenuTree(0L));
     }
 
     /**

modules/admin/src/main/java/com/fire/admin/rest/SysRoleController.java

@@ -57,7 +57,7 @@ public class SysRoleController {
      *@date: 2020/8/31 15:46
    */
     @GetMapping("/findRoleMenus/{roleId}")
-    public  BaseRestResponse findRoleMenus(@PathVariable("roleId") Integer roleId) {
+    public  BaseRestResponse findRoleMenus(@PathVariable("roleId") Long roleId) {
         return new BaseRestResponse(roleService.findMenuListByRoleId(roleId));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/SysUserController.java

@@ -80,7 +80,7 @@ public class SysUserController {
      */
     @DeleteMapping("/{userId}")
     @PreAuthorize("hasAuthority('sys:user:delete')")
-    public BaseRestResponse delete(@PathVariable("userId") Integer userId) {
+    public BaseRestResponse delete(@PathVariable("userId") Long userId) {
         return  new BaseRestResponse(userService.removeUser(userId));
     }
 
@@ -94,7 +94,7 @@ public class SysUserController {
      */
     @PutMapping("/{userId}")
     @PreAuthorize("hasAuthority('sys:user:rest')")
-    public BaseRestResponse restPass(@PathVariable("userId") Integer userId) {
+    public BaseRestResponse restPass(@PathVariable("userId") Long userId) {
         return  new BaseRestResponse(userService.restPass(userId));
     }
 

modules/admin/src/main/java/com/fire/admin/security/UserDetailsServiceImpl.java

@@ -55,7 +55,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
      * @param userId
      * @return
      */
-    private Collection<? extends GrantedAuthority> getUserAuthorities(int userId) {
+    private Collection<? extends GrantedAuthority> getUserAuthorities(Long userId) {
         // 获取用户拥有的角色
         // 用户权限列表，根据用户拥有的权限标识与如 @PreAuthorize("hasAuthority('sys:menu:view')") 标注的接口对比，决定是否可以调用接口
         // 权限集合

modules/admin/src/main/java/com/fire/admin/service/ISysDeptService.java

@@ -52,7 +52,7 @@ public interface ISysDeptService extends IService<SysDept> {
      *@Author: liu liu
      *@date: 2020/8/31 15:35
    */
-    String selectDeptNameByDeptId(int deptId);
+    String selectDeptNameByDeptId(Long deptId);
 
    /**
      *@Description: TODO 根据部门名称查询
@@ -70,7 +70,7 @@ public interface ISysDeptService extends IService<SysDept> {
       *@Author: liu liu
       *@date: 2020/8/31 15:35
     */
-    List<Integer> selectDeptIds(int deptId);
+    List<Long> selectDeptIds(Long deptId);
 
    /**
      *@Description: TODO 获取部门树

modules/admin/src/main/java/com/fire/admin/service/ISysMenuService.java

@@ -41,7 +41,7 @@ public interface ISysMenuService extends IService<SysMenu> {
       *@Author: liu liu
       *@date: 2020/8/31 15:42
     */
-    List<SysMenu> selectMenuTree(Integer uid);
+    List<SysMenu> selectMenuTree(Long uid);
 
     /**
       *@Description: TODO 根据父id查询菜单
@@ -50,7 +50,7 @@ public interface ISysMenuService extends IService<SysMenu> {
       *@Author: liu liu
       *@date: 2020/8/31 15:43
     */
-    SysMenu getMenuById(Integer parentId);
+    SysMenu getMenuById(Long parentId);
 
     /**
       *@Description: TODO 根据用户id查询权限
@@ -59,5 +59,5 @@ public interface ISysMenuService extends IService<SysMenu> {
       *@Author: liu liu
       *@date: 2020/8/31 15:43
     */
-    List<String> findPermsByUserId(Integer userId);
+    List<String> findPermsByUserId(Long userId);
 }

modules/admin/src/main/java/com/fire/admin/service/ISysRoleDeptService.java

@@ -22,5 +22,5 @@ public interface ISysRoleDeptService extends IService<SysRoleDept> {
     * @Author: liuliu
     * @Date: 2021/5/13 18:58
     */
-    List<SysRoleDept> getRoleDeptIds(int roleId);
+    List<SysRoleDept> getRoleDeptIds(Long roleId);
 }

modules/admin/src/main/java/com/fire/admin/service/ISysRoleMenuService.java

@@ -21,6 +21,6 @@ public interface ISysRoleMenuService extends IService<SysRoleMenu> {
     * @Author: liuliu
     * @Date: 2021/5/13 18:58
     */
-    List<Integer> getMenuIdByUserId(Integer userId);
+    List<Long> getMenuIdByUserId(Long userId);
     
 }

modules/admin/src/main/java/com/fire/admin/service/ISysRoleService.java

@@ -61,7 +61,7 @@ public interface ISysRoleService extends IService<SysRole> {
       *@Author: liu liu
       *@date: 2020/8/31 15:47
     */
-    List<SysMenu> findMenuListByRoleId(int roleId);
+    List<SysMenu> findMenuListByRoleId(Long roleId);
 
    /**
      *@Description: TODO 通过用户ID，查询角色信息
@@ -70,5 +70,5 @@ public interface ISysRoleService extends IService<SysRole> {
      *@Author: liu liu
      *@date: 2020/8/31 15:47
    */
-    List<SysRole> findRolesByUserId(Integer userId);
+    List<SysRole> findRolesByUserId(Long userId);
 }

modules/admin/src/main/java/com/fire/admin/service/ISysUserRoleService.java

@@ -22,5 +22,5 @@ public interface ISysUserRoleService extends IService<SysUserRole> {
     * @Author: liuliu
     * @Date: 2021/5/13 18:56
     */
-    List<SysUserRole> selectUserRoleListByUserId(Integer userId);
+    List<SysUserRole> selectUserRoleListByUserId(Long userId);
 }

modules/admin/src/main/java/com/fire/admin/service/ISysUserService.java

@@ -52,7 +52,7 @@ public interface ISysUserService extends IService<SysUser> {
      *@Author: liu liu
      *@date: 2020/8/31 15:51
    */
-    boolean removeUser(Integer userId);
+    boolean removeUser(Long userId);
 
    /**
      *@Description: TODO  重置密码
@@ -61,7 +61,7 @@ public interface ISysUserService extends IService<SysUser> {
      *@Author: liu liu
      *@date: 2020/8/31 15:51
    */
-    boolean restPass(Integer userId);
+    boolean restPass(Long userId);
 
     /**
       *@Description: TODO 通过用户名查找用户个人信息
@@ -79,7 +79,7 @@ public interface ISysUserService extends IService<SysUser> {
      *@Author: liu liu
      *@date: 2020/8/31 15:52
    */
-    Set<String> findPermsByUserId(Integer userId);
+    Set<String> findPermsByUserId(Long userId);
 
     /**
       *@Description: TODO 通过用户id查询角色集合
@@ -88,7 +88,7 @@ public interface ISysUserService extends IService<SysUser> {
       *@Author: liu liu
       *@date: 2020/8/31 15:52
     */
-    Set<String> findRoleIdByUserId(Integer userId);
+    Set<String> findRoleIdByUserId(Long userId);
 
     /**
       *@Description: TODO 账户密码登录
@@ -147,5 +147,5 @@ public interface ISysUserService extends IService<SysUser> {
       *@Author: liu liu
       *@date: 2020/9/2 15:13
     */
-    int findType(Integer userId);
+    int findType(Long userId);
 }

modules/admin/src/main/java/com/fire/admin/service/impl/SysDeptServiceImpl.java

@@ -40,7 +40,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     @Override
     public List<SysDept> selectDeptList() {
         List<SysDept> depts = baseMapper.selectList(Wrappers.<SysDept>lambdaQuery().select(SysDept::getDeptId, SysDept::getName, SysDept::getParentId, SysDept::getSort, SysDept::getCreateTime));
-        List<SysDept> sysDepts = depts.stream().filter(sysDept -> sysDept.getParentId() == 0 || ObjectUtil.isNull(sysDept.getParentId())).peek(sysDept -> sysDept.setLevel(0)).collect(Collectors.toList());
+        List<SysDept> sysDepts = depts.stream().filter(sysDept -> sysDept.getParentId() .equals(0L)  || ObjectUtil.isNull(sysDept.getParentId())).peek(sysDept -> sysDept.setLevel(0)).collect(Collectors.toList());
         PreUtil.findChildren(sysDepts, depts);
         return sysDepts;
     }
@@ -73,9 +73,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     @Override
     public boolean removeById(Serializable id) {
         // 部门层级删除
-        List<Integer> idList = this.list(Wrappers.<SysDept>query().lambda().eq(SysDept::getParentId, id)).stream().map(SysDept::getDeptId).collect(Collectors.toList());
+        List<Long> idList = this.list(Wrappers.<SysDept>query().lambda().eq(SysDept::getParentId, id)).stream().map(SysDept::getDeptId).collect(Collectors.toList());
         // 删除自己
-        idList.add((Integer) id);
+        idList.add((Long) id);
         return super.removeByIds(idList);
     }
 
@@ -87,7 +87,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      *@date: 2020/8/31 15:35
      */
     @Override
-    public String selectDeptNameByDeptId(int deptId) {
+    public String selectDeptNameByDeptId(Long deptId) {
         return baseMapper.selectOne(Wrappers.<SysDept>query().lambda().select(SysDept::getName).eq(SysDept::getDeptId, deptId)).getName();
     }
 
@@ -111,9 +111,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      *@date: 2020/8/31 15:35
      */
     @Override
-    public List<Integer> selectDeptIds(int deptId) {
+    public List<Long> selectDeptIds(Long deptId) {
         SysDept department = this.getDepartment(deptId);
-        List<Integer> deptIdList = new ArrayList<>();
+        List<Long> deptIdList = new ArrayList<Long>();
         if (department != null) {
             deptIdList.add(department.getDeptId());
             addDeptIdList(deptIdList, department);
@@ -131,7 +131,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     @Override
     public List<DeptTreeVo> getDeptTree() {
         List<SysDept> depts = baseMapper.selectList(Wrappers.<SysDept>query().select("dept_id", "name", "parent_id", "sort", "create_time"));
-        List<DeptTreeVo> collect = depts.stream().filter(sysDept -> sysDept.getParentId() == 0 || ObjectUtil.isNull(sysDept.getParentId())).map(sysDept -> {
+        List<DeptTreeVo> collect = depts.stream().filter(sysDept -> sysDept.getParentId() .equals(0L)  || ObjectUtil.isNull(sysDept.getParentId())).map(sysDept -> {
             DeptTreeVo deptTreeVo = new DeptTreeVo();
             deptTreeVo.setId(sysDept.getDeptId());
             deptTreeVo.setLabel(sysDept.getName());
@@ -151,9 +151,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
       *@Author: liu liu
       *@date: 2020/8/31 15:37
     */
-    private SysDept getDepartment(Integer deptId) {
+    private SysDept getDepartment(Long deptId) {
         List<SysDept> departments = baseMapper.selectList(Wrappers.<SysDept>query().select("dept_id", "name", "parent_id", "sort", "create_time"));
-        Map<Integer, SysDept> map = departments.stream().collect(Collectors.toMap(SysDept::getDeptId, department -> department));
+        Map<Long, SysDept> map = departments.stream().collect(Collectors.toMap(SysDept::getDeptId, department -> department));
 
         for (SysDept dept : map.values()) {
             SysDept parent = map.get(dept.getParentId());
@@ -166,7 +166,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         return map.get(deptId);
     }
 
-    private void addDeptIdList(List<Integer> deptIdList, SysDept department) {
+    private void addDeptIdList(List<Long> deptIdList, SysDept department) {
         List<SysDept> children = department.getChildren();
         if (children != null) {
             for (SysDept d : children) {

modules/admin/src/main/java/com/fire/admin/service/impl/SysMenuServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fire.admin.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -66,19 +67,19 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      *@date: 2020/8/31 15:42
      */
     @Override
-    public List<SysMenu> selectMenuTree(Integer uid) {
+    public List<SysMenu> selectMenuTree(Long uid) {
 
         LambdaQueryWrapper<SysMenu> sysMenuLambdaQueryWrapper = Wrappers.<SysMenu>query().lambda();
         sysMenuLambdaQueryWrapper.select(SysMenu::getMenuId, SysMenu::getName, SysMenu::getPerms, SysMenu::getPath, SysMenu::getParentId, SysMenu::getComponent, SysMenu::getIsFrame, SysMenu::getIcon, SysMenu::getSort, SysMenu::getType, SysMenu::getDelFlag);
         // 所有人有权限看到 只是没有权限操作而已 暂定这样
-        if (uid != 0) {
-            List<Integer> menuIdList = roleMenuService.getMenuIdByUserId(uid);
+        if (!uid .equals(0L)) {
+            List<Long> menuIdList = roleMenuService.getMenuIdByUserId(uid);
             sysMenuLambdaQueryWrapper.in(SysMenu::getMenuId, menuIdList);
         }
         List<SysMenu> sysMenus = new ArrayList<>();
         List<SysMenu> menus = baseMapper.selectList(sysMenuLambdaQueryWrapper);
         menus.forEach(menu -> {
-            if (menu.getParentId() == null || menu.getParentId() == 0) {
+            if (ObjectUtil.isEmpty(menu.getParentId())  || menu.getParentId() .equals(0L) ) {
                 menu.setLevel(0);
                 if (PreUtil.exists(sysMenus, menu)) {
                     sysMenus.add(menu);
@@ -98,7 +99,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      *@date: 2020/8/31 15:43
      */
     @Override
-    public SysMenu getMenuById(Integer parentId) {
+    public SysMenu getMenuById(Long parentId) {
         return baseMapper.selectOne(Wrappers.<SysMenu>lambdaQuery().select(SysMenu::getType).eq(SysMenu::getMenuId, parentId));
     }
 
@@ -110,13 +111,13 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      *@date: 2020/8/31 15:43
      */
     @Override
-    public List<String> findPermsByUserId(Integer userId) {
+    public List<String> findPermsByUserId(Long userId) {
         return baseMapper.findPermsByUserId(userId);
     }
 
     @Override
     public BaseRestResponse removeMenuById(Serializable id) {
-        List<Integer> idList = this.list(Wrappers.<SysMenu>query().lambda().eq(SysMenu::getParentId, id)).stream().map(SysMenu::getMenuId).collect(Collectors.toList());
+        List<Long> idList = this.list(Wrappers.<SysMenu>query().lambda().eq(SysMenu::getParentId, id)).stream().map(SysMenu::getMenuId).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(idList)) {
             return new BaseRestResponse<>("菜单含有下级不能删除");
         }
@@ -133,7 +134,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     private void verifyForm(SysMenu menu) {
         //上级菜单类型
         int parentType = MenuConstant.MenuType.CATALOG.getValue();
-        if (menu.getParentId() != 0) {
+        if (!menu.getParentId() .equals( 0L)) {
             SysMenu parentMenu = getMenuById(menu.getParentId());
             parentType = parentMenu.getType();
         }

modules/admin/src/main/java/com/fire/admin/service/impl/SysRoleDeptServiceImpl.java

@@ -22,7 +22,7 @@ public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptMapper, SysRo
 
 
     @Override
-    public List<SysRoleDept> getRoleDeptIds(int roleId) {
+    public List<SysRoleDept> getRoleDeptIds(Long roleId) {
         return baseMapper.selectList(Wrappers.<SysRoleDept>lambdaQuery().select(SysRoleDept::getDeptId).eq(SysRoleDept::getRoleId,roleId));
     }
 }

modules/admin/src/main/java/com/fire/admin/service/impl/SysRoleMenuServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.List;
 public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements ISysRoleMenuService {
 
     @Override
-    public List<Integer> getMenuIdByUserId(Integer userId) {
+    public List<Long> getMenuIdByUserId(Long userId) {
         return baseMapper.getMenuIdByUserId(userId);
     }
 }

modules/admin/src/main/java/com/fire/admin/service/impl/SysRoleServiceImpl.java

@@ -56,10 +56,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public boolean saveRoleMenu(RoleDTO roleDto) {
         SysRole sysRole = new SysRole();
-        sysRole.setRoleId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
+        sysRole.setRoleId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
         BeanUtils.copyProperties(roleDto, sysRole);
         baseMapper.insertRole(sysRole);
-        Integer roleId = sysRole.getRoleId();
+        Long roleId = sysRole.getRoleId();
         //维护角色菜单
         List<SysRoleMenu> roleMenus = roleDto.getRoleMenus();
         if (CollectionUtil.isNotEmpty(roleMenus)) {
@@ -133,7 +133,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      *@date: 2020/8/31 15:47
      */
     @Override
-    public List<SysMenu> findMenuListByRoleId(int roleId) {
+    public List<SysMenu> findMenuListByRoleId(Long roleId) {
         return baseMapper.findMenuListByRoleId(roleId);
     }
 
@@ -145,7 +145,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
      *@date: 2020/8/31 15:47
      */
     @Override
-    public List<SysRole> findRolesByUserId(Integer userId) {
+    public List<SysRole> findRolesByUserId(Long userId) {
         return baseMapper.listRolesByUserId(userId);
     }
 

modules/admin/src/main/java/com/fire/admin/service/impl/SysUserRoleServiceImpl.java

@@ -26,7 +26,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
 
 
     @Override
-    public List<SysUserRole> selectUserRoleListByUserId(Integer userId) {
+    public List<SysUserRole> selectUserRoleListByUserId(Long userId) {
         return baseMapper.selectUserRoleListByUserId(userId);
     }
 }

modules/admin/src/main/java/com/fire/admin/service/impl/SysUserServiceImpl.java

@@ -91,7 +91,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = new SysUser();
         BeanUtils.copyProperties(userDto, sysUser);
         // 默认密码 123456
-       sysUser.setUserId( jedisCluster.incr(GLOBAL_ID_INCR.key()).intValue());
+       sysUser.setUserId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
         sysUser.setPassword(PreUtil.encode("123456"));
         log.info("新增用户数据为：【{}】", sysUser.toString());
         baseMapper.insertUser(sysUser);
@@ -138,7 +138,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean removeUser(Integer userId) {
+    public boolean removeUser(Long userId) {
         baseMapper.deleteById(userId);
         return userRoleService.remove(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, userId));
     }
@@ -151,7 +151,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @date: 2020/8/31 15:51
      */
     @Override
-    public boolean restPass(Integer userId) {
+    public boolean restPass(Long userId) {
         return baseMapper.updateById(new SysUser().setPassword("123456").setUserId(userId)) > 0;
     }
 
@@ -180,7 +180,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @date: 2020/8/31 15:52
      */
     @Override
-    public Set<String> findPermsByUserId(Integer userId) {
+    public Set<String> findPermsByUserId(Long userId) {
         return menuService.findPermsByUserId(userId).stream().filter(StrUtil::isNotEmpty).collect(Collectors.toSet());
     }
 
@@ -192,7 +192,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @date: 2020/8/31 15:52
      */
     @Override
-    public Set<String> findRoleIdByUserId(Integer userId) {
+    public Set<String> findRoleIdByUserId(Long userId) {
         return userRoleService.selectUserRoleListByUserId(userId).stream().map(sysUserRole -> "ROLE_" + sysUserRole.getRoleId()).collect(Collectors.toSet());
     }
 
@@ -234,7 +234,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (ObjectUtil.isNotNull(securityUser)) {
             throw new BaseException("手机号已被注册");
         }
-        userDTO.setDeptId(6);
+        userDTO.setDeptId(6L);
         userDTO.setLockFlag("0");
         SysUser sysUser = new SysUser();
         // 对象拷贝
@@ -243,7 +243,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUser.setPassword(PreUtil.encode(userDTO.getPassword()));
         baseMapper.insertUser(sysUser);
         SysUserRole sysUserRole = new SysUserRole();
-        sysUserRole.setRoleId(14);
+        sysUserRole.setRoleId(14L);
         sysUserRole.setUserId(sysUser.getUserId());
         return userRoleService.save(sysUserRole);
     }
@@ -308,7 +308,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @date: 2020/9/2 15:13
      */
     @Override
-    public int findType(Integer userId) {
+    public int findType(Long userId) {
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
         /*wrapper.select(SysUser::getType).eq(SysUser::getUserId, userId);
         return baseMapper.selectOne(wrapper).getType();*/

modules/admin/src/main/java/com/fire/admin/util/JwtUtil.java

@@ -10,6 +10,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.stereotype.Component;
+
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
@@ -55,15 +56,15 @@ public class JwtUtil {
     private String authTokenStart;
 
     /**
-    * @Description:  TODO  生成令牌
-    * @Param: [userDetail]
-    * @return: java.lang.String
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:18
-    */
+     * @Description: TODO  生成令牌
+     * @Param: [userDetail]
+     * @return: java.lang.String
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:18
+     */
     public static String generateToken(PreSecurityUser userDetail) {
         Map<String, Object> claims = new HashMap<>(3);
-        claims.put(USERID,userDetail.getUserId());
+        claims.put(USERID, userDetail.getUserId());
         claims.put(USERNAME, userDetail.getUsername());
         claims.put(CREATED, new Date());
         claims.put(AUTHORITIES, userDetail.getAuthorities());
@@ -72,12 +73,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO  从数据声明生成令牌
-    * @Param: [claims] 数据声明
-    * @return: java.lang.String 令牌
-    * @Author: liuliu
-    * @Date: 2021/5/11 18:07
-    */
+     * @Description: TODO  从数据声明生成令牌
+     * @Param: [claims] 数据声明
+     * @return: java.lang.String 令牌
+     * @Author: liuliu
+     * @Date: 2021/5/11 18:07
+     */
     private static String generateToken(Map<String, Object> claims) {
         Date expirationDate = new Date(System.currentTimeMillis() + EXPIRE_TIME);
         return Jwts.builder().setClaims(claims).setExpiration(expirationDate).signWith(SignatureAlgorithm.HS512, SECRET).compact();
@@ -85,12 +86,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO 从令牌中获取用户名
-    * @Param: [token]
-    * @return: java.lang.String
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:18
-    */
+     * @Description: TODO 从令牌中获取用户名
+     * @Param: [token]
+     * @return: java.lang.String
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:18
+     */
     public static String getUsernameFromToken(String token) {
         Claims claims = getClaimsFromToken(token);
         return claims.getSubject();
@@ -98,12 +99,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO 根据请求令牌获取登录认证信息
-    * @Param: [request]
-    * @return: com.fire.admin.util.PreSecurityUser
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:19
-    */
+     * @Description: TODO 根据请求令牌获取登录认证信息
+     * @Param: [request]
+     * @return: com.fire.admin.util.PreSecurityUser
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:19
+     */
     public PreSecurityUser getUserFromToken(HttpServletRequest request) {
         // 获取请求携带的令牌
         String token = getToken(request);
@@ -121,7 +122,8 @@ public class JwtUtil {
             }
             // 解析对应的权限以及用户id
             Object authors = claims.get(AUTHORITIES);
-            Integer userId = (Integer)claims.get(USERID);
+            Long userId = Long.parseLong(claims.get(USERID).toString());
+            //Integer userId = (Integer) claims.get(USERID);
             Set<String> perms = new HashSet<>();
             if (authors instanceof List) {
                 for (Object object : (List) authors) {
@@ -129,9 +131,9 @@ public class JwtUtil {
                 }
             }
             Collection<? extends GrantedAuthority> authorities = AuthorityUtils.createAuthorityList(perms.toArray(new String[0]));
-            if (validateToken(token, username)){
+            if (validateToken(token, username)) {
                 // 未把密码放到jwt
-                return new PreSecurityUser(userId,username,"",authorities);
+                return new PreSecurityUser(userId, username, "", authorities);
             }
         }
         return null;
@@ -139,12 +141,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO 从令牌中获取数据声明
-    * @Param: [token]  令牌
-    * @return: io.jsonwebtoken.Claims 数据声明
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:19
-    */
+     * @Description: TODO 从令牌中获取数据声明
+     * @Param: [token]  令牌
+     * @return: io.jsonwebtoken.Claims 数据声明
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:19
+     */
     private static Claims getClaimsFromToken(String token) {
         Claims claims;
         try {
@@ -157,12 +159,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO  验证令牌
-    * @Param:  token
-    * @return: java.lang.Boolean
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:19
-    */
+     * @Description: TODO  验证令牌
+     * @Param: token
+     * @return: java.lang.Boolean
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:19
+     */
     private static Boolean validateToken(String token, String username) {
         String userName = getUsernameFromToken(token);
         return (userName.equals(username) && !isTokenExpired(token));
@@ -170,12 +172,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO  刷新令牌
-    * @Param: [token]
-    * @return: java.lang.String
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:20
-    */
+     * @Description: TODO  刷新令牌
+     * @Param: [token]
+     * @return: java.lang.String
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:20
+     */
     public static String refreshToken(String token) {
         String refreshedToken;
         try {
@@ -190,12 +192,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO 判断令牌是否过期
-    * @Param: token 令牌
-    * @return: java.lang.Boolean 是否过期
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:20
-    */
+     * @Description: TODO 判断令牌是否过期
+     * @Param: token 令牌
+     * @return: java.lang.Boolean 是否过期
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:20
+     */
     private static Boolean isTokenExpired(String token) {
         try {
             Claims claims = getClaimsFromToken(token);
@@ -208,12 +210,12 @@ public class JwtUtil {
 
 
     /**
-    * @Description:  TODO 获取请求token
-    * @Param: [request]
-    * @return: java.lang.String
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:20
-    */
+     * @Description: TODO 获取请求token
+     * @Param: [request]
+     * @return: java.lang.String
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:20
+     */
     private String getToken(HttpServletRequest request) {
         String token = request.getHeader(tokenHeader);
         if (StrUtil.isNotEmpty(token)) {

modules/admin/src/main/java/com/fire/admin/util/PreSecurityUser.java

@@ -23,14 +23,14 @@ public class PreSecurityUser implements UserDetails {
     private static final long serialVersionUID = 1L;
 
 
-    private Integer userId;
+    private Long userId;
     private String username;
     private String password;
     private Collection<? extends GrantedAuthority> authorities;
 
 
-    public  PreSecurityUser(Integer userId, String username, String password, Collection<? extends GrantedAuthority> authorities) {
-        this.userId = userId;
+    public  PreSecurityUser(Long userId, String username, String password, Collection<? extends GrantedAuthority> authorities) {
+        this.userId =userId;
         this.username = username;
         this.password = password;
         this.authorities = authorities;

modules/admin/src/main/java/com/fire/admin/util/PreUtil.java

@@ -1,5 +1,6 @@
 package com.fire.admin.util;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fire.admin.vo.DeptTreeVo;
 import com.fire.admin.vo.MenuMetaVo;
@@ -33,26 +34,27 @@ public class PreUtil {
                 MenuVo menuVo = new MenuVo();
                 menuVo.setName(sysMenu.getName());
                 menuVo.setPath(sysMenu.getPath());
-                // 如果不是外链
+                // TODO  如果不是外链
                 if (sysMenu.getIsFrame()) {
-                    if (sysMenu.getParentId().equals(0)) {
-                        //一级目录需要加斜杠，不然访问 会跳转404页面
-                        menuVo.setPath("/" + sysMenu.getPath());
+                    if (sysMenu.getParentId().equals(0L)) {
+                        // TODO一级目录需要加斜杠，不然访问 会跳转404页面
+                        menuVo.setPath("/".concat(sysMenu.getPath()));
                         menuVo.setComponent(StrUtil.isEmpty(sysMenu.getComponent()) ? "Layout" : sysMenu.getComponent());
                     } else if (!StrUtil.isEmpty(sysMenu.getComponent())) {
                         menuVo.setComponent(sysMenu.getComponent());
                     }
                 }
+
                 menuVo.setMeta(new MenuMetaVo(sysMenu.getName(), sysMenu.getIcon()));
                 if (menuDTOList != null && menuDTOList.size() != 0 && sysMenu.getType() == 0) {
                     menuVo.setChildren(buildMenus(menuDTOList));
-                    // 处理是一级菜单并且没有子菜单的情况
-                } else if (sysMenu.getParentId().equals(0)) {
+                    //  TODO 处理是一级菜单并且没有子菜单的情况
+                } else if (sysMenu.getParentId().equals(0L)) {
                     menuVo.setAlwaysShow(false);
                     menuVo.setRedirect("noredirect");
                     MenuVo menuVo1 = new MenuVo();
                     menuVo1.setMeta(menuVo.getMeta());
-                    // 非外链
+                    // TODO  非外链
                     if (sysMenu.getIsFrame()) {
                         menuVo1.setPath("index");
                         menuVo1.setName(menuVo.getName());
@@ -75,13 +77,13 @@ public class PreUtil {
 
 
     /**
-    * @Description:  TODO  遍历菜单
-    * @Param: [menuList, menus, menuType]
-    * @return: void
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:24
-    */
-    public void findChildren(List<SysMenu> menuList, List<SysMenu> menus, int menuType) {
+     * @Description: TODO  遍历菜单
+     * @Param: [menuList, menus, menuType]
+     * @return: void
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:24
+     */
+    public void findChildren(List<SysMenu> menuList, List<SysMenu> menus, Integer menuType) {
         for (SysMenu sysMenu : menuList) {
             List<SysMenu> children = new ArrayList<>();
             for (SysMenu menu : menus) {
@@ -89,7 +91,7 @@ public class PreUtil {
                     // 如果是获取类型不需要按钮，且菜单类型是按钮的，直接过滤掉
                     continue;
                 }
-                if (sysMenu.getMenuId() != null && sysMenu.getMenuId().equals(menu.getParentId())) {
+                if (ObjectUtil.isNotEmpty(sysMenu.getMenuId()) && sysMenu.getMenuId().equals(menu.getParentId())) {
                     menu.setParentName(sysMenu.getName());
                     menu.setLevel(sysMenu.getLevel() + 1);
                     if (exists(children, menu)) {
@@ -105,12 +107,12 @@ public class PreUtil {
 
 
     /**
-    * @Description:  TODO  构建部门tree
-    * @Param: [sysDepts, depts]
-    * @return: void
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:25
-    */
+     * @Description: TODO  构建部门tree
+     * @Param: [sysDepts, depts]
+     * @return: void
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:25
+     */
     public void findChildren(List<SysDept> sysDepts, List<SysDept> depts) {
 
         for (SysDept sysDept : sysDepts) {
@@ -129,12 +131,12 @@ public class PreUtil {
 
 
     /**
-    * @Description:  TODO  构建部门tree
-    * @Param: [sysDepts, depts]
-    * @return: void
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:25
-    */
+     * @Description: TODO  构建部门tree
+     * @Param: [sysDepts, depts]
+     * @return: void
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:25
+     */
     public void findChildren1(List<DeptTreeVo> sysDepts, List<SysDept> depts) {
 
         for (DeptTreeVo sysDept : sysDepts) {
@@ -142,7 +144,7 @@ public class PreUtil {
             sysDept.setLabel(sysDept.getLabel());
             List<DeptTreeVo> children = new ArrayList<>();
             for (SysDept dept : depts) {
-                if (sysDept.getId() == dept.getParentId()) {
+                if (sysDept.getId().equals(dept.getParentId())) {
                     DeptTreeVo deptTreeVo1 = new DeptTreeVo();
                     deptTreeVo1.setLabel(dept.getName());
                     deptTreeVo1.setId(dept.getDeptId());
@@ -156,12 +158,12 @@ public class PreUtil {
 
 
     /**
-    * @Description:  TODO  判断菜单是否存在
-    * @Param: [sysMenus, sysMenu]
-    * @return: boolean
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:25
-    */
+     * @Description: TODO  判断菜单是否存在
+     * @Param: [sysMenus, sysMenu]
+     * @return: boolean
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:25
+     */
     public boolean exists(List<SysMenu> sysMenus, SysMenu sysMenu) {
         boolean exist = false;
         for (SysMenu menu : sysMenus) {
@@ -174,12 +176,12 @@ public class PreUtil {
 
 
     /**
-    * @Description:  TODO  生成BCryptPasswordEncoder密码
-    * @Param: [rawPass]
-    * @return: java.lang.String
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:25
-    */
+     * @Description: TODO  生成BCryptPasswordEncoder密码
+     * @Param: [rawPass]
+     * @return: java.lang.String
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:25
+     */
     public String encode(String rawPass) {
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         return passwordEncoder.encode(rawPass);
@@ -187,12 +189,12 @@ public class PreUtil {
 
 
     /**
-    * @Description:  TODO   校验密码
-    * @Param: [newPass, passwordEncoderOldPass]
-    * @return: boolean
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:25
-    */
+     * @Description: TODO   校验密码
+     * @Param: [newPass, passwordEncoderOldPass]
+     * @return: boolean
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:25
+     */
     public boolean validatePass(String newPass, String passwordEncoderOldPass) {
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         return passwordEncoder.matches(newPass, passwordEncoderOldPass);
@@ -200,12 +202,12 @@ public class PreUtil {
 
 
     /**
-    * @Description:  TODO  不重复的验证码
-    * @Param: [i]
-    * @return: java.lang.String
-    * @Author: liuliu
-    * @Date: 2021/5/13 18:26
-    */
+     * @Description: TODO  不重复的验证码
+     * @Param: [i]
+     * @return: java.lang.String
+     * @Author: liuliu
+     * @Date: 2021/5/13 18:26
+     */
     public String codeGen(int i) {
         char[] codeSequence = {'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', 'L', 'K', 'J', 'H', 'G', 'F', 'D', 'S', 'A', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
         Random random = new Random();

modules/admin/src/main/java/com/fire/admin/vo/DeptTreeVo.java

@@ -19,7 +19,7 @@ import java.util.List;
 @ToString
 public class DeptTreeVo {
 
-    private int id;
+    private Long id;
     private String label;
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<DeptTreeVo> children;

modules/admin/src/main/java/com/fire/admin/vo/MenuVo.java

@@ -5,13 +5,7 @@ import lombok.Data;
 
 import java.util.List;
 
-/**
- * @Classname menuVo
- * @Description TODO
- * @Author 李号东 lihaodongmail@163.com
- * @Date 2019-05-05 16:38
- * @Version 1.0
- */
+
 @Data
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class MenuVo {