功能完善： 对大后台进行优化

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -42,7 +43,7 @@ public class SysDept extends Model<SysDept> {
     /**
      * 上级部门
      */
-    private Long parentId;
+    private Integer parentId;
 
     /**
      * 排序

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
@@ -65,6 +67,7 @@ public class SysRole extends Model<SysRole> {
      */
     private String delFlag;
 
+
     /**
      * 非数据库字段
      * 部门ids

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

@@ -22,7 +22,7 @@ import java.util.List;
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 
 
-    @Insert("insert into sys_role (role_name,role_code,role_desc,ds_type,ds_scope) values (#{roleName}, #{roleCode},#{roleDesc},#{dsType},#{dsScope})")
+    @Insert("insert into sys_role (role_id,role_name,role_code,role_desc) values (#{roleId},#{roleName}, #{roleCode},#{roleDesc})")
     @Options(useGeneratedKeys = true, keyProperty = "roleId", keyColumn = "role_id")
     Boolean insertRole(SysRole sysRole);
 

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

@@ -1,10 +1,14 @@
 package com.fire.admin.rest;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fire.admin.dto.DeptDTO;
 import com.fire.admin.service.ISysDeptService;
 import com.fire.dto.response.BaseRestResponse;
 import com.fire.dto.system.SysDept;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -22,6 +26,8 @@ import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
  */
 @RestController
 @RequestMapping("/dept")
+@Api(tags = "部门相关的接口")
+@Slf4j
 public class SysDeptController {
 
     @Autowired
@@ -31,26 +37,27 @@ public class SysDeptController {
     private JedisCluster jedisCluster;
 
     /**
-      *@Description: TODO 保存部门信息
-      *@Param:
-      *@return:
-      *@Author: liu liu
-      *@date: 2020/8/31 15:33
-    */
+     * @Description: TODO 保存部门信息
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:33
+     */
     @PostMapping
     @PreAuthorize("hasAuthority('sys:dept:add')")
     public BaseRestResponse save(@RequestBody SysDept sysDept) {
-        sysDept.setDeptId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
+        sysDept.setDeptId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
+        sysDept.setParentId(ObjectUtil.isEmpty(sysDept.getParentId()) ? 4 : null);
         return new BaseRestResponse(deptService.save(sysDept));
     }
 
-   /**
-     *@Description: TODO 获取部门信息
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:33
-   */
+    /**
+     * @Description: TODO 获取部门信息
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:33
+     */
     @GetMapping
     @PreAuthorize("hasAuthority('sys:dept:view')")
     public BaseRestResponse getDeptList() {
@@ -58,41 +65,42 @@ public class SysDeptController {
     }
 
     /**
-      *@Description: TODO 获取部门树
-      *@Param:
-      *@return:
-      *@Author: liu liu
-      *@date: 2020/8/31 15:33
-    */
+     * @Description: TODO 获取部门树
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:33
+     */
     @GetMapping("/tree")
+    @ApiOperation(value = "部门树")
     public BaseRestResponse getDeptTree() {
         return new BaseRestResponse(deptService.getDeptTree());
     }
 
 
-  /**
-    *@Description: TODO 更新部门信息
-    *@Param:
-    *@return:
-    *@Author: liu liu
-    *@date: 2020/8/31 15:33
-  */
+    /**
+     * @Description: TODO 更新部门信息
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:33
+     */
     @PutMapping
     @PreAuthorize("hasAuthority('sys:dept:update')")
     public BaseRestResponse update(@RequestBody DeptDTO deptDto) {
         return new BaseRestResponse(deptService.updateDeptById(deptDto));
     }
 
-  /**
-    *@Description: TODO 根据id删除部门信息
-    *@Param:
-    *@return:
-    *@Author: liu liu
-    *@date: 2020/8/31 15:34
-  */
+    /**
+     * @Description: TODO 根据id删除部门信息
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:34
+     */
     @DeleteMapping("/{id}")
     @PreAuthorize("hasAuthority('sys:dept:delete')")
-    public BaseRestResponse delete(@PathVariable("id") Integer id) {
+    public BaseRestResponse delete(@PathVariable("id") Long id) {
         return new BaseRestResponse(deptService.removeById(id));
     }
 

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

@@ -84,7 +84,7 @@ public class SysRoleController {
     */
     @DeleteMapping("/{roleId}")
     @PreAuthorize("hasAuthority('sys:role:delete')")
-    public  BaseRestResponse delete(@PathVariable("roleId") Integer roleId) {
+    public  BaseRestResponse delete(@PathVariable("roleId") Long roleId) {
         return new BaseRestResponse(roleService.removeById(roleId));
     }
 }

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

@@ -1,16 +1,17 @@
 package com.fire.admin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.dto.DeptDTO;
-
 import com.fire.admin.mapper.SysDeptMapper;
 import com.fire.admin.service.ISysDeptService;
 import com.fire.admin.util.PreUtil;
 import com.fire.admin.vo.DeptTreeVo;
 import com.fire.dto.system.SysDept;
-import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,46 +29,51 @@ import java.util.stream.Collectors;
  * @create: 2020-08-26 15:45
  */
 @Service
+@Slf4j
 public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService {
 
     /**
-     *@Description: TODO 查询部门信息
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:34
+     * @Description: TODO 查询部门信息
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:34
      */
     @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() .equals(0L)  || ObjectUtil.isNull(sysDept.getParentId())).peek(sysDept -> sysDept.setLevel(0)).collect(Collectors.toList());
+        depts.forEach(dep -> {
+        });
+        List<SysDept> sysDepts = depts.stream().filter(sysDept -> sysDept.getParentId().equals(4) || ObjectUtil.isNull(sysDept.getParentId())).peek(sysDept -> sysDept.setLevel(0)).collect(Collectors.toList());
         PreUtil.findChildren(sysDepts, depts);
         return sysDepts;
     }
 
 
     /**
-     *@Description: TODO 更新部门
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:35
+     * @Description: TODO 更新部门
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:35
      */
     @Override
     public boolean updateDeptById(DeptDTO entity) {
+        log.info("部门修改传递参数为：【{}】", entity.toString());
         SysDept sysDept = new SysDept();
-        BeanUtils.copyProperties(entity, sysDept);
+        BeanUtil.copyProperties(entity, sysDept);
         sysDept.setUpdateTime(LocalDateTime.now());
+        log.info("部门修改信息为：【{}】", sysDept.toString());
         return this.updateById(sysDept);
     }
 
 
     /**
-     *@Description: TODO 删除部门
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:35
+     * @Description: TODO 删除部门
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:35
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -76,15 +82,16 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         List<Long> idList = this.list(Wrappers.<SysDept>query().lambda().eq(SysDept::getParentId, id)).stream().map(SysDept::getDeptId).collect(Collectors.toList());
         // 删除自己
         idList.add((Long) id);
+        log.info("删除部门编号为：【{}】", JSONUtil.parseArray(idList));
         return super.removeByIds(idList);
     }
 
     /**
-     *@Description: TODO 根据部门id查询部门名称
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:35
+     * @Description: TODO 根据部门id查询部门名称
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:35
      */
     @Override
     public String selectDeptNameByDeptId(Long deptId) {
@@ -92,11 +99,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     /**
-     *@Description: TODO 根据部门名称查询
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:35
+     * @Description: TODO 根据部门名称查询
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:35
      */
     @Override
     public List<SysDept> selectDeptListBydeptName(String deptName) {
@@ -104,11 +111,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     /**
-     *@Description: TODO 通过此部门id查询于此相关的部门ids
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:35
+     * @Description: TODO 通过此部门id查询于此相关的部门ids
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:35
      */
     @Override
     public List<Long> selectDeptIds(Long deptId) {
@@ -122,35 +129,33 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     }
 
     /**
-     *@Description: TODO 获取部门树
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:35
+     * @Description: TODO 获取部门树
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:35
      */
     @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() .equals(0L)  || ObjectUtil.isNull(sysDept.getParentId())).map(sysDept -> {
+        List<DeptTreeVo> collect = depts.stream().filter(sysDept -> sysDept.getParentId().equals(4) || ObjectUtil.isNull(sysDept.getParentId())).map(sysDept -> {
             DeptTreeVo deptTreeVo = new DeptTreeVo();
             deptTreeVo.setId(sysDept.getDeptId());
             deptTreeVo.setLabel(sysDept.getName());
             return deptTreeVo;
-
         }).collect(Collectors.toList());
-
         PreUtil.findChildren1(collect, depts);
         return collect;
     }
 
 
     /**
-      *@Description: TODO 根据部门ID获取该部门及其下属部门树
-      *@Param:
-      *@return:
-      *@Author: liu liu
-      *@date: 2020/8/31 15:37
-    */
+     * @Description: TODO 根据部门ID获取该部门及其下属部门树
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:37
+     */
     private SysDept getDepartment(Long deptId) {
         List<SysDept> departments = baseMapper.selectList(Wrappers.<SysDept>query().select("dept_id", "name", "parent_id", "sort", "create_time"));
         Map<Long, SysDept> map = departments.stream().collect(Collectors.toMap(SysDept::getDeptId, department -> department));

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

@@ -14,6 +14,7 @@ import com.fire.dto.system.SysMenu;
 import com.fire.dto.system.SysRole;
 import com.fire.dto.system.SysRoleDept;
 import com.fire.dto.system.SysRoleMenu;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +33,7 @@ import static com.fire.dto.enums.RedisKey.GLOBAL_ID_INCR;
  * @author: liu liu
  * @create: 2020-08-26 15:45
  */
+@Slf4j
 @Service
 public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
 
@@ -46,18 +48,20 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
 
     /**
-     *@Description: TODO 保存角色和菜单
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:46
+     * @Description: TODO 保存角色和菜单
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:46
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean saveRoleMenu(RoleDTO roleDto) {
+        log.info("roleDto:{}", roleDto.toString());
         SysRole sysRole = new SysRole();
-        sysRole.setRoleId( jedisCluster.incr(GLOBAL_ID_INCR.key()));
         BeanUtils.copyProperties(roleDto, sysRole);
+        sysRole.setRoleId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
+        log.info("insert sysRole :[{}]", sysRole.toString());
         baseMapper.insertRole(sysRole);
         Long roleId = sysRole.getRoleId();
         //维护角色菜单
@@ -65,6 +69,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         if (CollectionUtil.isNotEmpty(roleMenus)) {
             List<SysRoleMenu> rms = roleMenus.stream().map(sysRoleMenu -> {
                 SysRoleMenu roleMenu = new SysRoleMenu();
+                roleMenu.setId(jedisCluster.incr(GLOBAL_ID_INCR.key()));
                 roleMenu.setRoleId(roleId);
                 roleMenu.setMenuId(sysRoleMenu.getMenuId());
                 return roleMenu;
@@ -75,11 +80,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     /**
-     *@Description: TODO 更新角色和菜单
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:47
+     * @Description: TODO 更新角色和菜单
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:47
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -90,7 +95,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         List<SysRoleMenu> roleMenus = roleDto.getRoleMenus();
         roleMenuService.remove(Wrappers.<SysRoleMenu>query().lambda().eq(SysRoleMenu::getRoleId, sysRole.getRoleId()));
         roleDeptService.remove(Wrappers.<SysRoleDept>query().lambda().eq(SysRoleDept::getRoleId, sysRole.getRoleId()));
-
+        // TODO 遍历集合，并对  SysRoleMenu 的主键赋值
+        roleMenus.stream().forEach(menus -> menus.setId(jedisCluster.incr(GLOBAL_ID_INCR.key())));
         if (CollectionUtil.isNotEmpty(roleMenus)) {
             roleMenuService.saveBatch(roleMenus);
         }
@@ -108,11 +114,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     /**
-     *@Description: TODO 获取角色列表
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:47
+     * @Description: TODO 获取角色列表
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:47
      */
     @Override
     public List<SysRole> selectRoleList(String roleName) {
@@ -126,11 +132,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
 
     /**
-     *@Description: TODO 根据角色id获取菜单
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:47
+     * @Description: TODO 根据角色id获取菜单
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:47
      */
     @Override
     public List<SysMenu> findMenuListByRoleId(Long roleId) {
@@ -138,11 +144,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     /**
-     *@Description: TODO 通过用户ID，查询角色信息
-     *@Param:
-     *@return:
-     *@Author: liu liu
-     *@date: 2020/8/31 15:47
+     * @Description: TODO 通过用户ID，查询角色信息
+     * @Param:
+     * @return:
+     * @Author: liu liu
+     * @date: 2020/8/31 15:47
      */
     @Override
     public List<SysRole> findRolesByUserId(Long userId) {

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

@@ -124,7 +124,7 @@ public class PreUtil {
         for (SysDept sysDept : sysDepts) {
             List<SysDept> children = new ArrayList<>();
             for (SysDept dept : depts) {
-                if (sysDept.getDeptId() != null && sysDept.getDeptId().equals(dept.getParentId())) {
+                if (ObjectUtil.isNotEmpty(sysDept.getDeptId() ) && sysDept.getDeptId().toString().equals(dept.getParentId().toString())) {
                     dept.setParentName(sysDept.getName());
                     dept.setLevel(sysDept.getLevel() + 1);
                     children.add(dept);