From 961073ec96bfbb920f9afd952052c20b3791eb4d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 15 二月 2022 10:45:04 +0800
Subject: [PATCH] update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 63 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 0f8897f..621dc07 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -3,15 +3,15 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.TreeBuildUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -19,7 +19,7 @@
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysDeptService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -30,14 +30,13 @@
*
* @author Lion Li
*/
+@RequiredArgsConstructor
@Service
-public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept, SysDept> implements ISysDeptService {
+public class SysDeptServiceImpl implements ISysDeptService {
- @Autowired
- private SysRoleMapper roleMapper;
-
- @Autowired
- private SysUserMapper userMapper;
+ private final SysDeptMapper baseMapper;
+ private final SysRoleMapper roleMapper;
+ private final SysUserMapper userMapper;
/**
* 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
@@ -47,8 +46,6 @@
*/
@Override
public List<SysDept> selectDeptList(SysDept dept) {
-// return baseMapper.selectList();
-// return baseMapper.selectList(new LambdaQueryWrapper<>());
return baseMapper.selectDeptList(dept);
}
@@ -63,8 +60,7 @@
if (CollUtil.isEmpty(depts)) {
return CollUtil.newArrayList();
}
- Long parentId = depts.get(0).getParentId();
- return TreeBuildUtils.build(depts, parentId, (dept, tree) ->
+ return TreeBuildUtils.build(depts, (dept, tree) ->
tree.setId(dept.getDeptId())
.setParentId(dept.getParentId())
.setName(dept.getDeptName())
@@ -91,19 +87,19 @@
*/
@Override
public SysDept selectDeptById(Long deptId) {
- return getById(deptId);
+ return baseMapper.selectById(deptId);
}
/**
- * 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級
+ * 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬鏁帮紙姝ｅ父鐘舵�侊級
*
* @param deptId 閮ㄩ棬ID
* @return 瀛愰儴闂ㄦ暟
*/
@Override
public long selectNormalChildrenDeptById(Long deptId) {
- return count(new LambdaQueryWrapper<SysDept>()
- .eq(SysDept::getStatus, 0)
+ return baseMapper.selectCount(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL)
.apply("find_in_set({0}, ancestors)", deptId));
}
@@ -115,9 +111,8 @@
*/
@Override
public boolean hasChildByDeptId(Long deptId) {
- long result = count(new LambdaQueryWrapper<SysDept>()
+ return baseMapper.exists(new LambdaQueryWrapper<SysDept>()
.eq(SysDept::getParentId, deptId));
- return result > 0;
}
/**
@@ -128,9 +123,8 @@
*/
@Override
public boolean checkDeptExistUser(Long deptId) {
- long result = userMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+ return userMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getDeptId, deptId));
- return result > 0;
}
/**
@@ -141,12 +135,11 @@
*/
@Override
public String checkDeptNameUnique(SysDept dept) {
- Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
- long count = count(new LambdaQueryWrapper<SysDept>()
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDept>()
.eq(SysDept::getDeptName, dept.getDeptName())
.eq(SysDept::getParentId, dept.getParentId())
- .ne(SysDept::getDeptId, deptId));
- if (count > 0) {
+ .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -159,11 +152,11 @@
*/
@Override
public void checkDeptDataScope(Long deptId) {
- if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ if (!SysUser.isAdmin(LoginHelper.getUserId())) {
SysDept dept = new SysDept();
dept.setDeptId(deptId);
List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
- if (StringUtils.isEmpty(depts)) {
+ if (CollUtil.isEmpty(depts)) {
throw new ServiceException("娌℃湁鏉冮檺璁块棶閮ㄩ棬鏁版嵁锛�");
}
}
@@ -177,7 +170,7 @@
*/
@Override
public int insertDept(SysDept dept) {
- SysDept info = getById(dept.getParentId());
+ SysDept info = baseMapper.selectById(dept.getParentId());
// 濡傛灉鐖惰妭鐐逛笉涓烘甯哥姸鎬�,鍒欎笉鍏佽鏂板瀛愯妭鐐�
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
throw new ServiceException("閮ㄩ棬鍋滅敤锛屼笉鍏佽鏂板");
@@ -194,9 +187,9 @@
*/
@Override
public int updateDept(SysDept dept) {
- SysDept newParentDept = getById(dept.getParentId());
- SysDept oldDept = getById(dept.getDeptId());
- if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
+ SysDept newParentDept = baseMapper.selectById(dept.getParentId());
+ SysDept oldDept = baseMapper.selectById(dept.getDeptId());
+ if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) {
String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
String oldAncestors = oldDept.getAncestors();
dept.setAncestors(newAncestors);
@@ -204,7 +197,7 @@
}
int result = baseMapper.updateById(dept);
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
- && !StringUtils.equals("0", dept.getAncestors())) {
+ && !StringUtils.equals(UserConstants.DEPT_NORMAL, dept.getAncestors())) {
// 濡傛灉璇ラ儴闂ㄦ槸鍚敤鐘舵�侊紝鍒欏惎鐢ㄨ閮ㄩ棬鐨勬墍鏈変笂绾ч儴闂�
updateParentDeptStatusNormal(dept);
}
@@ -219,8 +212,8 @@
private void updateParentDeptStatusNormal(SysDept dept) {
String ancestors = dept.getAncestors();
Long[] deptIds = Convert.toLongArray(ancestors);
- update(null, new LambdaUpdateWrapper<SysDept>()
- .set(SysDept::getStatus, "0")
+ baseMapper.update(null, new LambdaUpdateWrapper<SysDept>()
+ .set(SysDept::getStatus, UserConstants.DEPT_NORMAL)
.in(SysDept::getDeptId, Arrays.asList(deptIds)));
}
@@ -232,7 +225,7 @@
* @param oldAncestors 鏃х殑鐖禝D闆嗗悎
*/
public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
- List<SysDept> children = list(new LambdaQueryWrapper<SysDept>()
+ List<SysDept> children = baseMapper.selectList(new LambdaQueryWrapper<SysDept>()
.apply("find_in_set({0},ancestors)", deptId));
for (SysDept child : children) {
child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
--
Gitblit v1.9.3