From 72e1db81c2d26a6e21907cecaec1a637028e3a80 Mon Sep 17 00:00:00 2001
From: alan <admin@vps6.win>
Date: Wed, 29 Apr 2020 17:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E8=A3=85=E6=A0=91=E5=BD=A2=E7=BB=93?=
=?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/service/ISysDeptService.java | 26 +--
.../service/impl/SysDeptServiceImpl.java | 156 +++++++-----------
2 files changed, 75 insertions(+), 107 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
index 1d8a30678..7e3508dc5 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
@@ -6,14 +6,14 @@ import com.ruoyi.project.system.domain.SysDept;
/**
* 部门管理 服务层
- *
+ *
* @author ruoyi
*/
public interface ISysDeptService
{
/**
* 查询部门管理数据
- *
+ *
* @param dept 部门信息
* @return 部门信息集合
*/
@@ -21,15 +21,15 @@ public interface ISysDeptService
/**
* 构建前端所需要树结构
- *
+ *
* @param depts 部门列表
* @return 树结构列表
*/
- public List<SysDept> buildDeptTree(List<SysDept> depts);
+ public List<SysDept> buildDeptTree(List<SysDept> depts,Long id);
/**
* 构建前端所需要下拉树结构
- *
+ *
* @param depts 部门列表
* @return 下拉树结构列表
*/
@@ -37,7 +37,7 @@ public interface ISysDeptService
/**
* 根据角色ID查询部门树信息
- *
+ *
* @param roleId 角色ID
* @return 选中部门列表
*/
@@ -45,7 +45,7 @@ public interface ISysDeptService
/**
* 根据部门ID查询信息
- *
+ *
* @param deptId 部门ID
* @return 部门信息
*/
@@ -53,7 +53,7 @@ public interface ISysDeptService
/**
* 是否存在部门子节点
- *
+ *
* @param deptId 部门ID
* @return 结果
*/
@@ -61,7 +61,7 @@ public interface ISysDeptService
/**
* 查询部门是否存在用户
- *
+ *
* @param deptId 部门ID
* @return 结果 true 存在 false 不存在
*/
@@ -69,7 +69,7 @@ public interface ISysDeptService
/**
* 校验部门名称是否唯一
- *
+ *
* @param dept 部门信息
* @return 结果
*/
@@ -77,7 +77,7 @@ public interface ISysDeptService
/**
* 新增保存部门信息
- *
+ *
* @param dept 部门信息
* @return 结果
*/
@@ -85,7 +85,7 @@ public interface ISysDeptService
/**
* 修改保存部门信息
- *
+ *
* @param dept 部门信息
* @return 结果
*/
@@ -93,7 +93,7 @@ public interface ISysDeptService
/**
* 删除部门管理信息
- *
+ *
* @param deptId 部门ID
* @return 结果
*/
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
index 338e2a66c..01d33410e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
@@ -1,152 +1,138 @@
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.exception.CustomException;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import com.ruoyi.framework.web.domain.TreeSelect;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
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;
/**
* 部门管理 服务实现
- *
+ *
* @author ruoyi
*/
@Service
-public class SysDeptServiceImpl implements ISysDeptService
-{
+public class SysDeptServiceImpl implements ISysDeptService {
+ private static final Logger log = LoggerFactory.getLogger(SysDeptServiceImpl.class);
@Autowired
private SysDeptMapper deptMapper;
/**
* 查询部门管理数据
- *
+ *
* @param dept 部门信息
* @return 部门信息集合
*/
@Override
@DataScope(deptAlias = "d")
- public List<SysDept> selectDeptList(SysDept dept)
- {
+ public List<SysDept> selectDeptList(SysDept dept) {
return deptMapper.selectDeptList(dept);
}
/**
* 构建前端所需要树结构
- *
+ *
* @param depts 部门列表
* @return 树结构列表
*/
@Override
- public List<SysDept> buildDeptTree(List<SysDept> depts)
- {
+ public List<SysDept> buildDeptTree(List<SysDept> depts, Long id){
List<SysDept> returnList = new ArrayList<SysDept>();
- List<Long> tempList = new ArrayList<Long>();
- for (SysDept dept : depts)
- {
- tempList.add(dept.getDeptId());
- }
- for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
- {
- SysDept dept = (SysDept) iterator.next();
- // 如果是顶级节点, 遍历该父节点的所有子节点
- if (!tempList.contains(dept.getParentId()))
- {
- recursionFn(depts, dept);
- returnList.add(dept);
+ depts.forEach( sysDept -> {
+ if(sysDept.getParentId() == id){
+ sysDept.setChildren(buildDeptTree(depts,sysDept.getDeptId()));
+ returnList.add(sysDept);
}
- }
- if (returnList.isEmpty())
- {
- returnList = depts;
- }
+ });
return returnList;
}
/**
* 构建前端所需要下拉树结构
- *
+ *
* @param depts 部门列表
* @return 下拉树结构列表
*/
@Override
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());
}
/**
* 根据角色ID查询部门树信息
- *
+ *
* @param roleId 角色ID
* @return 选中部门列表
*/
@Override
- public List<Integer> selectDeptListByRoleId(Long roleId)
- {
+ public List<Integer> selectDeptListByRoleId(Long roleId) {
return deptMapper.selectDeptListByRoleId(roleId);
}
/**
* 根据部门ID查询信息
- *
+ *
* @param deptId 部门ID
* @return 部门信息
*/
@Override
- public SysDept selectDeptById(Long deptId)
- {
+ public SysDept selectDeptById(Long deptId) {
return deptMapper.selectDeptById(deptId);
}
/**
* 是否存在子节点
- *
+ *
* @param deptId 部门ID
* @return 结果
*/
@Override
- public boolean hasChildByDeptId(Long deptId)
- {
+ public boolean hasChildByDeptId(Long deptId) {
int result = deptMapper.hasChildByDeptId(deptId);
return result > 0 ? true : false;
}
/**
* 查询部门是否存在用户
- *
+ *
* @param deptId 部门ID
* @return 结果 true 存在 false 不存在
*/
@Override
- public boolean checkDeptExistUser(Long deptId)
- {
+ public boolean checkDeptExistUser(Long deptId) {
int result = deptMapper.checkDeptExistUser(deptId);
return result > 0 ? true : false;
}
/**
* 校验部门名称是否唯一
- *
+ *
* @param dept 部门信息
* @return 结果
*/
@Override
- public String checkDeptNameUnique(SysDept dept)
- {
+ public String checkDeptNameUnique(SysDept dept) {
Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
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.UNIQUE;
@@ -154,17 +140,15 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
* 新增保存部门信息
- *
+ *
* @param dept 部门信息
* @return 结果
*/
@Override
- public int insertDept(SysDept dept)
- {
+ public int insertDept(SysDept dept) {
SysDept info = deptMapper.selectDeptById(dept.getParentId());
// 如果父节点不为正常状态,则不允许新增子节点
- if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
- {
+ if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
throw new CustomException("部门停用，不允许新增");
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
@@ -173,25 +157,22 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
* 修改保存部门信息
- *
+ *
* @param dept 部门信息
* @return 结果
*/
@Override
- public int updateDept(SysDept dept)
- {
+ public int updateDept(SysDept dept) {
SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
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 oldAncestors = oldDept.getAncestors();
dept.setAncestors(newAncestors);
updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
}
int result = deptMapper.updateDept(dept);
- if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
- {
+ if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) {
// 如果该部门是启用状态，则启用该部门的所有上级部门
updateParentDeptStatus(dept);
}
@@ -200,11 +181,10 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
* 修改该部门的父级部门状态
- *
+ *
* @param dept 当前部门
*/
- private void updateParentDeptStatus(SysDept dept)
- {
+ private void updateParentDeptStatus(SysDept dept) {
String updateBy = dept.getUpdateBy();
dept = deptMapper.selectDeptById(dept.getDeptId());
dept.setUpdateBy(updateBy);
@@ -213,52 +193,44 @@ public class SysDeptServiceImpl implements ISysDeptService
/**
* 修改子元素关系
- *
- * @param deptId 被修改的部门ID
+ *
+ * @param deptId 被修改的部门ID
* @param newAncestors 新的父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);
- for (SysDept child : children)
- {
+ for (SysDept child : children) {
child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
}
- if (children.size() > 0)
- {
+ if (children.size() > 0) {
deptMapper.updateDeptChildren(children);
}
}
/**
* 删除部门管理信息
- *
+ *
* @param deptId 部门ID
* @return 结果
*/
@Override
- public int deleteDeptById(Long deptId)
- {
+ public int deleteDeptById(Long 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);
t.setChildren(childList);
- for (SysDept tChild : childList)
- {
- if (hasChild(list, tChild))
- {
+ for (SysDept tChild : childList) {
+ if (hasChild(list, tChild)) {
// 判断是否有子节点
Iterator<SysDept> it = childList.iterator();
- while (it.hasNext())
- {
+ while (it.hasNext()) {
SysDept n = (SysDept) it.next();
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>();
Iterator<SysDept> it = list.iterator();
- while (it.hasNext())
- {
+ while (it.hasNext()) {
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);
}
}
@@ -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;
}
}