Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

组装树形结构优化

Browse Source
This commit is contained in:
alan 2020-04-29 17:28:36 +08:00
parent eec5c58b4a
commit 72e1db81c2
2 changed files with 75 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
View File

@ -25,7 +25,7 @@ public interface ISysDeptService
* @param depts 部门列表 * @param depts 部门列表
* @return 树结构列表 * @return 树结构列表
*/ */
public List<SysDept> buildDeptTree(List<SysDept> depts); public List<SysDept> buildDeptTree(List<SysDept> depts,Long id);
/** /**
* 构建前端所需要下拉树结构 * 构建前端所需要下拉树结构

126
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
View File

@ -1,19 +1,26 @@
package com.ruoyi.project.system.service.impl; package com.ruoyi.project.system.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import com.ruoyi.framework.web.domain.TreeSelect; import com.ruoyi.framework.web.domain.TreeSelect;
import com.ruoyi.project.system.domain.SysDept; import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper; import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysDeptService; import com.ruoyi.project.system.service.ISysDeptService;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 部门管理 服务实现 * 部门管理 服务实现
@ -21,8 +28,8 @@ import com.ruoyi.project.system.service.ISysDeptService;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysDeptServiceImpl implements ISysDeptService public class SysDeptServiceImpl implements ISysDeptService {
{ private static final Logger log = LoggerFactory.getLogger(SysDeptServiceImpl.class);
@Autowired @Autowired
private SysDeptMapper deptMapper; private SysDeptMapper deptMapper;
@ -34,8 +41,7 @@ public class SysDeptServiceImpl implements ISysDeptService
*/ */
@Override @Override
@DataScope(deptAlias = "d") @DataScope(deptAlias = "d")
public List<SysDept> selectDeptList(SysDept dept) public List<SysDept> selectDeptList(SysDept dept) {
{
return deptMapper.selectDeptList(dept); return deptMapper.selectDeptList(dept);
} }
@ -46,28 +52,14 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 树结构列表 * @return 树结构列表
*/ */
@Override @Override
public List<SysDept> buildDeptTree(List<SysDept> depts) public List<SysDept> buildDeptTree(List<SysDept> depts, Long id){
{
List<SysDept> returnList = new ArrayList<SysDept>(); List<SysDept> returnList = new ArrayList<SysDept>();
List<Long> tempList = new ArrayList<Long>(); depts.forEach( sysDept -> {
for (SysDept dept : depts) if(sysDept.getParentId() == id){
{ sysDept.setChildren(buildDeptTree(depts,sysDept.getDeptId()));
tempList.add(dept.getDeptId()); returnList.add(sysDept);
}
for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
{
SysDept dept = (SysDept) iterator.next();
// 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(dept.getParentId()))
{
recursionFn(depts, dept);
returnList.add(dept);
}
}
if (returnList.isEmpty())
{
returnList = depts;
} }
});
return returnList; return returnList;
} }
@ -80,7 +72,7 @@ public class SysDeptServiceImpl implements ISysDeptService
@Override @Override
public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts)
{ {
List<SysDept> deptTrees = buildDeptTree(depts); List<SysDept> deptTrees = buildDeptTree(depts,0L);
return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
} }
@ -91,8 +83,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 选中部门列表 * @return 选中部门列表
*/ */
@Override @Override
public List<Integer> selectDeptListByRoleId(Long roleId) public List<Integer> selectDeptListByRoleId(Long roleId) {
{
return deptMapper.selectDeptListByRoleId(roleId); return deptMapper.selectDeptListByRoleId(roleId);
} }
@ -103,8 +94,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 部门信息 * @return 部门信息
*/ */
@Override @Override
public SysDept selectDeptById(Long deptId) public SysDept selectDeptById(Long deptId) {
{
return deptMapper.selectDeptById(deptId); return deptMapper.selectDeptById(deptId);
} }
@ -115,8 +105,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean hasChildByDeptId(Long deptId) public boolean hasChildByDeptId(Long deptId) {
{
int result = deptMapper.hasChildByDeptId(deptId); int result = deptMapper.hasChildByDeptId(deptId);
return result > 0 ? true : false; return result > 0 ? true : false;
} }
@ -128,8 +117,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 结果 true 存在 false 不存在 * @return 结果 true 存在 false 不存在
*/ */
@Override @Override
public boolean checkDeptExistUser(Long deptId) public boolean checkDeptExistUser(Long deptId) {
{
int result = deptMapper.checkDeptExistUser(deptId); int result = deptMapper.checkDeptExistUser(deptId);
return result > 0 ? true : false; return result > 0 ? true : false;
} }
@ -141,12 +129,10 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 结果 * @return 结果
*/ */
@Override @Override
public String checkDeptNameUnique(SysDept dept) public String checkDeptNameUnique(SysDept dept) {
{
Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@ -159,12 +145,10 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertDept(SysDept dept) public int insertDept(SysDept dept) {
{
SysDept info = deptMapper.selectDeptById(dept.getParentId()); SysDept info = deptMapper.selectDeptById(dept.getParentId());
// 如果父节点不为正常状态,则不允许新增子节点 // 如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
{
throw new CustomException("部门停用，不允许新增"); throw new CustomException("部门停用，不允许新增");
} }
dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
@ -178,20 +162,17 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateDept(SysDept dept) public int updateDept(SysDept dept) {
{
SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
{
String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
String oldAncestors = oldDept.getAncestors(); String oldAncestors = oldDept.getAncestors();
dept.setAncestors(newAncestors); dept.setAncestors(newAncestors);
updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
} }
int result = deptMapper.updateDept(dept); int result = deptMapper.updateDept(dept);
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) {
{
// 如果该部门是启用状态，则启用该部门的所有上级部门 // 如果该部门是启用状态，则启用该部门的所有上级部门
updateParentDeptStatus(dept); updateParentDeptStatus(dept);
} }
@ -203,8 +184,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* *
* @param dept 当前部门 * @param dept 当前部门
*/ */
private void updateParentDeptStatus(SysDept dept) private void updateParentDeptStatus(SysDept dept) {
{
String updateBy = dept.getUpdateBy(); String updateBy = dept.getUpdateBy();
dept = deptMapper.selectDeptById(dept.getDeptId()); dept = deptMapper.selectDeptById(dept.getDeptId());
dept.setUpdateBy(updateBy); dept.setUpdateBy(updateBy);
@ -218,15 +198,12 @@ public class SysDeptServiceImpl implements ISysDeptService
* @param newAncestors 新的父ID集合 * @param newAncestors 新的父ID集合
* @param oldAncestors 旧的父ID集合 * @param oldAncestors 旧的父ID集合
*/ */
public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
{
List<SysDept> children = deptMapper.selectChildrenDeptById(deptId); List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
for (SysDept child : children) for (SysDept child : children) {
{
child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors)); child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
} }
if (children.size() > 0) if (children.size() > 0) {
{
deptMapper.updateDeptChildren(children); deptMapper.updateDeptChildren(children);
} }
} }
@ -238,27 +215,22 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteDeptById(Long deptId) public int deleteDeptById(Long deptId) {
{
return deptMapper.deleteDeptById(deptId); return deptMapper.deleteDeptById(deptId);
} }
/** /**
* 递归列表 * 递归列表
*/ */
private void recursionFn(List<SysDept> list, SysDept t) private void recursionFn(List<SysDept> list, SysDept t) {
{
// 得到子节点列表 // 得到子节点列表
List<SysDept> childList = getChildList(list, t); List<SysDept> childList = getChildList(list, t);
t.setChildren(childList); t.setChildren(childList);
for (SysDept tChild : childList) for (SysDept tChild : childList) {
{ if (hasChild(list, tChild)) {
if (hasChild(list, tChild))
{
// 判断是否有子节点 // 判断是否有子节点
Iterator<SysDept> it = childList.iterator(); Iterator<SysDept> it = childList.iterator();
while (it.hasNext()) while (it.hasNext()) {
{
SysDept n = (SysDept) it.next(); SysDept n = (SysDept) it.next();
recursionFn(list, n); recursionFn(list, n);
} }
@ -269,15 +241,12 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 得到子节点列表 * 得到子节点列表
*/ */
private List<SysDept> getChildList(List<SysDept> list, SysDept t) private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
{
List<SysDept> tlist = new ArrayList<SysDept>(); List<SysDept> tlist = new ArrayList<SysDept>();
Iterator<SysDept> it = list.iterator(); Iterator<SysDept> it = list.iterator();
while (it.hasNext()) while (it.hasNext()) {
{
SysDept n = (SysDept) it.next(); SysDept n = (SysDept) it.next();
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
{
tlist.add(n); tlist.add(n);
} }
} }
@ -287,8 +256,7 @@ public class SysDeptServiceImpl implements ISysDeptService
/** /**
* 判断是否有子节点 * 判断是否有子节点
*/ */
private boolean hasChild(List<SysDept> list, SysDept t) private boolean hasChild(List<SysDept> list, SysDept t) {
{
return getChildList(list, t).size() > 0 ? true : false; return getChildList(list, t).size() > 0 ? true : false;
} }
} }