From 8ead192c443c098e8e39f9d101c51215b99c8aa0 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Thu, 7 Oct 2021 22:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/category/CategoryQueryService.java | 9 +++++---- .../module/business/category/CategoryService.java | 11 ++++++----- .../business/category/constant/CategoryConst.java | 13 +++++++++++++ .../module/system/department/DepartmentConst.java | 10 ++++++++++ .../module/system/department/DepartmentService.java | 10 +++++----- .../system/department/DepartmentTreeService.java | 2 +- .../module/system/employee/EmployeeService.java | 3 ++- .../service/module/system/menu/MenuConst.java | 6 ++++++ .../service/module/system/menu/MenuService.java | 4 ++-- .../system/role/rolemenu/RoleMenuService.java | 3 ++- 10 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryConst.java create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentConst.java create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuConst.java diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java index 004365a4..c0803386 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryQueryService.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.common.constant.CacheModuleConst; import net.lab1024.smartadmin.service.common.constant.StringConst; +import net.lab1024.smartadmin.service.module.business.category.constant.CategoryConst; import net.lab1024.smartadmin.service.module.business.category.domain.CategoryEntity; import net.lab1024.smartadmin.service.module.business.category.domain.CategorySimpleDTO; import net.lab1024.smartadmin.service.module.business.category.domain.CategoryTreeQueryDTO; @@ -118,7 +119,7 @@ public class CategoryQueryService { */ public List queryCategoryByParent(Long categoryId, Integer categoryType) { if (null == categoryId) { - return StringConst.EMPTY_LIST; + return Collections.emptyList(); } String cacheKey = CacheKey.cacheKey(CacheModuleConst.Category.CATEGORY_SUB, getCacheId(categoryId, categoryType)); return cache.get(cacheKey); @@ -132,7 +133,7 @@ public class CategoryQueryService { */ public Map queryCategoryList(List categoryIdList) { if (CollectionUtils.isEmpty(categoryIdList)) { - return StringConst.EMPTY_MAP; + return Collections.emptyMap(); } categoryIdList = categoryIdList.stream().distinct().collect(Collectors.toList()); @@ -161,7 +162,7 @@ public class CategoryQueryService { */ public List queryCategorySubId(List categoryIdList) { if (CollectionUtils.isEmpty(categoryIdList)) { - return StringConst.EMPTY_LIST; + return Collections.emptyList(); } // 查询所有子类 Map> subTypeMap = this.querySubCategoryFromCache(categoryIdList); @@ -288,7 +289,7 @@ public class CategoryQueryService { // 父级始终放在第一位 parentCategoryList.add(0, categoryEntity); Long parentId = categoryEntity.getParentId(); - if (Objects.equals(StringConst.DEFAULT_PARENT_ID, parentId)) { + if (Objects.equals(CategoryConst.DEFAULT_PARENT_ID, parentId)) { return parentCategoryList; } parentCategoryList.addAll(0, this.queryCategoryAndParent(parentId)); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java index a1234dbd..0f1221c3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/CategoryService.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.module.business.category.constant.CategoryConst; import net.lab1024.smartadmin.service.module.business.category.domain.*; import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import org.apache.commons.collections4.CollectionUtils; @@ -43,9 +44,9 @@ public class CategoryService { return res; } // 没有父类则使用默认父类 - Long parentId = null == addDTO.getParentId() ? StringConst.DEFAULT_PARENT_ID : addDTO.getParentId(); + Long parentId = null == addDTO.getParentId() ? CategoryConst.DEFAULT_PARENT_ID : addDTO.getParentId(); categoryEntity.setParentId(parentId); - categoryEntity.setSort(null == addDTO.getSort() ? StringConst.ZERO : addDTO.getSort()); + categoryEntity.setSort(null == addDTO.getSort() ? 0 : addDTO.getSort()); categoryEntity.setDeletedFlag(false); // 保存数据 @@ -106,7 +107,7 @@ public class CategoryService { if (Objects.equals(categoryEntity.getCategoryId(), parentId)) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "父级类目怎么和自己相同了"); } - if (!Objects.equals(parentId, StringConst.DEFAULT_PARENT_ID)) { + if (!Objects.equals(parentId, CategoryConst.DEFAULT_PARENT_ID)) { Optional optional = categoryQueryService.queryCategory(parentId); if (!optional.isPresent()) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST, "父级类目不存在~"); @@ -120,7 +121,7 @@ public class CategoryService { } else { // 如果没有父类 使用默认父类 - parentId = StringConst.DEFAULT_PARENT_ID; + parentId = CategoryConst.DEFAULT_PARENT_ID; } // 校验同父类下 名称是否重复 @@ -169,7 +170,7 @@ public class CategoryService { if (null == queryDTO.getCategoryType()) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "类目类型不能为空"); } - queryDTO.setParentId(StringConst.DEFAULT_PARENT_ID); + queryDTO.setParentId(CategoryConst.DEFAULT_PARENT_ID); } List treeList = categoryQueryService.queryCategoryTree(queryDTO); return ResponseDTO.ok(treeList); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryConst.java new file mode 100644 index 00000000..f63ff0a4 --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryConst.java @@ -0,0 +1,13 @@ +package net.lab1024.smartadmin.service.module.business.category.constant; + + +/** + * 分类类型 枚举 + * + * @author listen + * @date 2021/08/05 15:26 + */ +public class CategoryConst { + + public static final long DEFAULT_PARENT_ID = 0; +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentConst.java new file mode 100644 index 00000000..50ec31af --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentConst.java @@ -0,0 +1,10 @@ +package net.lab1024.smartadmin.service.module.system.department; + +class DepartmentConst { + + /** + * 默认的顶级部门的parent id + */ + + static final long DEFAULT_PARENT_ID = 0; +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java index bc18b6af..1415cb73 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentService.java @@ -173,7 +173,7 @@ public class DepartmentService { List deptList = departmentVOList.stream().filter(e -> e.getId().equals(parentId)).collect(Collectors.toList()); for (DepartmentVO item : deptList) { result.add(item); - if (item.getParentId() != StringConst.DEFAULT_PARENT_ID && item.getParentId() != null) { + if (item.getParentId() != DepartmentConst.DEFAULT_PARENT_ID && item.getParentId() != null) { result.addAll(getParentDepartment(departmentVOList, item.getParentId(), result)); } } @@ -341,7 +341,7 @@ public class DepartmentService { if (departmentEntity == null) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } - if (departmentEntity.getParentId() == null || departmentEntity.getParentId().equals(StringConst.DEFAULT_PARENT_ID)) { + if (departmentEntity.getParentId() == null || departmentEntity.getParentId().equals(DepartmentConst.DEFAULT_PARENT_ID)) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "此部门已经是根节点无法移动"); } DepartmentEntity parentEntity = departmentDao.selectById(departmentEntity.getParentId()); @@ -453,7 +453,7 @@ public class DepartmentService { */ private void recursionFindParentDepartmentName(List departmentNameList, List departmentList, Long departmentId) { Optional findRes = departmentList.stream().filter(e -> e.getId().equals(departmentId)).findFirst(); - if (!findRes.isPresent() || findRes.get().getParentId() == StringConst.DEFAULT_PARENT_ID) { + if (!findRes.isPresent() || findRes.get().getParentId() == DepartmentConst.DEFAULT_PARENT_ID) { return; } DepartmentVO departmentVO = findRes.get(); @@ -501,7 +501,7 @@ public class DepartmentService { private DepartmentVO recursionFindSchoolDepartmentId(List departmentList, Long departmentId) { Optional findRes = departmentList.stream().filter(e -> e.getId().equals(departmentId)).findFirst(); // 如果查询不到 或者自己本身为最顶级 返回null - if (!findRes.isPresent() || findRes.get().getParentId() == StringConst.DEFAULT_PARENT_ID) { + if (!findRes.isPresent() || findRes.get().getParentId() == DepartmentConst.DEFAULT_PARENT_ID) { return null; } DepartmentVO departmentVO = findRes.get(); @@ -512,7 +512,7 @@ public class DepartmentService { return null; } // 若父级为最顶级 则返回本级ID - if (parentFindRes.get().getParentId() == StringConst.DEFAULT_PARENT_ID) { + if (parentFindRes.get().getParentId() == DepartmentConst.DEFAULT_PARENT_ID) { return departmentVO; } // 若父级不为最顶级 进入递归 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java index 624392a1..c7c48af3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/DepartmentTreeService.java @@ -29,7 +29,7 @@ public class DepartmentTreeService { if (CollectionUtils.isEmpty(voList)) { return Lists.newArrayList(); } - List rootList = voList.stream().filter(e -> e.getParentId() == null || e.getParentId() == StringConst.DEFAULT_PARENT_ID).collect(Collectors.toList()); + List rootList = voList.stream().filter(e -> e.getParentId() == null || e.getParentId() == DepartmentConst.DEFAULT_PARENT_ID).collect(Collectors.toList()); if (CollectionUtils.isEmpty(rootList)) { return Lists.newArrayList(); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java index 162a53c6..fdf42f3c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -402,7 +403,7 @@ public class EmployeeService { String cacheKey = CacheKey.cacheKey(CacheModuleConst.Employee.DEPARTMENT_EMPLOYEE_CACHE, departmentId.toString()); List employeeEntityList = beanCache.get(cacheKey); if (CollectionUtils.isEmpty(employeeEntityList)) { - return ResponseDTO.ok(StringConst.EMPTY_LIST); + return ResponseDTO.ok(Collections.emptyList()); } List voList = SmartBeanUtil.copyList(employeeEntityList, EmployeeVO.class); return ResponseDTO.ok(voList); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuConst.java new file mode 100644 index 00000000..ba0be245 --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuConst.java @@ -0,0 +1,6 @@ +package net.lab1024.smartadmin.service.module.system.menu; + + public class MenuConst { + + public static final long DEFAULT_PARENT_ID = 0; +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java index b1a354a0..2d3e4476 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/MenuService.java @@ -231,7 +231,7 @@ public class MenuService { List menuVOList = menuDao.queryMenuList(Boolean.FALSE, disabledFlag, null); //根据ParentId进行分组 Map> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); - List filterMenuVOList = this.filterNoParentMenu(parentMap, StringConst.DEFAULT_PARENT_ID); + List filterMenuVOList = this.filterNoParentMenu(parentMap, MenuConst.DEFAULT_PARENT_ID); return filterMenuVOList; } @@ -275,7 +275,7 @@ public class MenuService { List menuVOList = menuDao.queryMenuList(Boolean.FALSE, null, menuTypeList); //根据ParentId进行分组 Map> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); - List menuTreeVOList = this.buildMenuTree(parentMap, StringConst.DEFAULT_PARENT_ID); + List menuTreeVOList = this.buildMenuTree(parentMap, MenuConst.DEFAULT_PARENT_ID); return ResponseDTO.ok(menuTreeVOList); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java index a809ebe7..92ae5e05 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/rolemenu/RoleMenuService.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.constant.StringConst; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.module.system.menu.MenuConst; import net.lab1024.smartadmin.service.module.system.menu.MenuDao; import net.lab1024.smartadmin.service.module.system.menu.MenuEmployeeService; import net.lab1024.smartadmin.service.module.system.menu.domain.MenuSimpleTreeVO; @@ -83,7 +84,7 @@ public class RoleMenuService { //查询菜单权限 List menuVOList = menuDao.queryMenuList(Boolean.FALSE, Boolean.FALSE, null); Map> parentMap = menuVOList.stream().collect(Collectors.groupingBy(MenuVO::getParentId, Collectors.toList())); - List menuTreeList = this.buildMenuTree(parentMap, StringConst.DEFAULT_PARENT_ID); + List menuTreeList = this.buildMenuTree(parentMap, MenuConst.DEFAULT_PARENT_ID); res.setMenuTreeList(menuTreeList); return ResponseDTO.ok(res); }