From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 251 +++++++++++++++++++++++++------------------------
1 files changed, 127 insertions(+), 124 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 ca8df48..45c6fae 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
@@ -1,71 +1,78 @@
package com.ruoyi.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 cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.exception.CustomException;
+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.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
+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 org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 閮ㄩ棬绠＄悊 鏈嶅姟瀹炵幇
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Service
-public class SysDeptServiceImpl implements ISysDeptService
-{
+public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept, SysDept> implements ISysDeptService {
+
@Autowired
- private SysDeptMapper deptMapper;
+ private SysRoleMapper roleMapper;
+
+ @Autowired
+ private SysUserMapper userMapper;
/**
* 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
- *
+ *
* @param dept 閮ㄩ棬淇℃伅
* @return 閮ㄩ棬淇℃伅闆嗗悎
*/
@Override
@DataScope(deptAlias = "d")
- public List<SysDept> selectDeptList(SysDept dept)
- {
- return deptMapper.selectDeptList(dept);
+ public List<SysDept> selectDeptList(SysDept dept) {
+ return baseMapper.selectDeptList(dept);
}
/**
* 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯
- *
+ *
* @param depts 閮ㄩ棬鍒楄〃
* @return 鏍戠粨鏋勫垪琛�
*/
@Override
- public List<SysDept> buildDeptTree(List<SysDept> depts)
- {
+ public List<SysDept> buildDeptTree(List<SysDept> depts) {
List<SysDept> returnList = new ArrayList<SysDept>();
List<Long> tempList = new ArrayList<Long>();
- for (SysDept dept : depts)
- {
+ for (SysDept dept : depts) {
tempList.add(dept.getDeptId());
}
- for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
- {
- SysDept dept = (SysDept) iterator.next();
+ for (SysDept dept : depts) {
// 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
- if (!tempList.contains(dept.getParentId()))
- {
+ if (!tempList.contains(dept.getParentId())) {
recursionFn(depts, dept);
returnList.add(dept);
}
}
- if (returnList.isEmpty())
- {
+ if (returnList.isEmpty()) {
returnList = depts;
}
return returnList;
@@ -73,207 +80,209 @@
/**
* 鏋勫缓鍓嶇鎵�闇�瑕佷笅鎷夋爲缁撴瀯
- *
+ *
* @param depts 閮ㄩ棬鍒楄〃
* @return 涓嬫媺鏍戠粨鏋勫垪琛�
*/
@Override
- public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts)
- {
+ public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) {
List<SysDept> deptTrees = buildDeptTree(depts);
return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
}
/**
* 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭�
- *
+ *
* @param roleId 瑙掕壊ID
* @return 閫変腑閮ㄩ棬鍒楄〃
*/
@Override
- public List<Integer> selectDeptListByRoleId(Long roleId)
- {
- return deptMapper.selectDeptListByRoleId(roleId);
+ public List<Integer> selectDeptListByRoleId(Long roleId) {
+ SysRole role = roleMapper.selectById(roleId);
+ return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
}
/**
* 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 閮ㄩ棬淇℃伅
*/
@Override
- public SysDept selectDeptById(Long deptId)
- {
- return deptMapper.selectDeptById(deptId);
+ public SysDept selectDeptById(Long deptId) {
+ return getById(deptId);
}
/**
* 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 瀛愰儴闂ㄦ暟
*/
@Override
- public int selectNormalChildrenDeptById(Long deptId)
- {
- return deptMapper.selectNormalChildrenDeptById(deptId);
+ public long selectNormalChildrenDeptById(Long deptId) {
+ return count(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getStatus, 0)
+ .apply("find_in_set({0}, ancestors)", deptId));
}
/**
* 鏄惁瀛樺湪瀛愯妭鐐�
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 缁撴灉
*/
@Override
- public boolean hasChildByDeptId(Long deptId)
- {
- int result = deptMapper.hasChildByDeptId(deptId);
- return result > 0 ? true : false;
+ public boolean hasChildByDeptId(Long deptId) {
+ long result = count(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getParentId, deptId)
+ .last("limit 1"));
+ return result > 0;
}
/**
* 鏌ヨ閮ㄩ棬鏄惁瀛樺湪鐢ㄦ埛
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 缁撴灉 true 瀛樺湪 false 涓嶅瓨鍦�
*/
@Override
- public boolean checkDeptExistUser(Long deptId)
- {
- int result = deptMapper.checkDeptExistUser(deptId);
- return result > 0 ? true : false;
+ public boolean checkDeptExistUser(Long deptId) {
+ long result = userMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getDeptId, deptId));
+ return result > 0;
}
/**
* 鏍￠獙閮ㄩ棬鍚嶇О鏄惁鍞竴
- *
+ *
* @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())
- {
+ SysDept info = getOne(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getDeptName, dept.getDeptName())
+ .eq(SysDept::getParentId, dept.getParentId())
+ .last("limit 1"));
+ if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
/**
+ * 鏍￠獙閮ㄩ棬鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param deptId 閮ㄩ棬id
+ */
+ @Override
+ public void checkDeptDataScope(Long deptId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ SysDept dept = new SysDept();
+ dept.setDeptId(deptId);
+ List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+ if (StringUtils.isEmpty(depts)) {
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶閮ㄩ棬鏁版嵁锛�");
+ }
+ }
+ }
+
+ /**
* 鏂板淇濆瓨閮ㄩ棬淇℃伅
- *
+ *
* @param dept 閮ㄩ棬淇℃伅
* @return 缁撴灉
*/
@Override
- public int insertDept(SysDept dept)
- {
- SysDept info = deptMapper.selectDeptById(dept.getParentId());
+ public int insertDept(SysDept dept) {
+ SysDept info = getById(dept.getParentId());
// 濡傛灉鐖惰妭鐐逛笉涓烘甯哥姸鎬�,鍒欎笉鍏佽鏂板瀛愯妭鐐�
- if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
- {
- throw new CustomException("閮ㄩ棬鍋滅敤锛屼笉鍏佽鏂板");
+ if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
+ throw new ServiceException("閮ㄩ棬鍋滅敤锛屼笉鍏佽鏂板");
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
- return deptMapper.insertDept(dept);
+ return baseMapper.insert(dept);
}
/**
* 淇敼淇濆瓨閮ㄩ棬淇℃伅
- *
+ *
* @param dept 閮ㄩ棬淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateDept(SysDept dept)
- {
- SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
- SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
- if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
- {
+ public int updateDept(SysDept dept) {
+ SysDept newParentDept = getById(dept.getParentId());
+ SysDept oldDept = getById(dept.getDeptId());
+ 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()))
- {
+ int result = baseMapper.updateById(dept);
+ if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
+ && !StringUtils.equals("0", dept.getAncestors())) {
// 濡傛灉璇ラ儴闂ㄦ槸鍚敤鐘舵�侊紝鍒欏惎鐢ㄨ閮ㄩ棬鐨勬墍鏈変笂绾ч儴闂�
- updateParentDeptStatus(dept);
+ updateParentDeptStatusNormal(dept);
}
return result;
}
/**
* 淇敼璇ラ儴闂ㄧ殑鐖剁骇閮ㄩ棬鐘舵��
- *
+ *
* @param dept 褰撳墠閮ㄩ棬
*/
- private void updateParentDeptStatus(SysDept dept)
- {
- String updateBy = dept.getUpdateBy();
- dept = deptMapper.selectDeptById(dept.getDeptId());
- dept.setUpdateBy(updateBy);
- deptMapper.updateDeptStatus(dept);
+ private void updateParentDeptStatusNormal(SysDept dept) {
+ String ancestors = dept.getAncestors();
+ Long[] deptIds = Convert.toLongArray(ancestors);
+ update(null, new LambdaUpdateWrapper<SysDept>()
+ .set(SysDept::getStatus, "0")
+ .in(SysDept::getDeptId, Arrays.asList(deptIds)));
}
/**
* 淇敼瀛愬厓绱犲叧绯�
- *
- * @param deptId 琚慨鏀圭殑閮ㄩ棬ID
+ *
+ * @param deptId 琚慨鏀圭殑閮ㄩ棬ID
* @param newAncestors 鏂扮殑鐖禝D闆嗗悎
* @param oldAncestors 鏃х殑鐖禝D闆嗗悎
*/
- public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
- {
- List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
- for (SysDept child : children)
- {
- child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
+ public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
+ List<SysDept> children = list(new LambdaQueryWrapper<SysDept>()
+ .apply("find_in_set({0},ancestors)", deptId));
+ for (SysDept child : children) {
+ child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
}
- if (children.size() > 0)
- {
- deptMapper.updateDeptChildren(children);
+ if (children.size() > 0) {
+ baseMapper.updateDeptChildren(children);
}
}
/**
* 鍒犻櫎閮ㄩ棬绠＄悊淇℃伅
- *
+ *
* @param deptId 閮ㄩ棬ID
* @return 缁撴灉
*/
@Override
- public int deleteDeptById(Long deptId)
- {
- return deptMapper.deleteDeptById(deptId);
+ public int deleteDeptById(Long deptId) {
+ return baseMapper.deleteById(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))
- {
- // 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣
- Iterator<SysDept> it = childList.iterator();
- while (it.hasNext())
- {
- SysDept n = (SysDept) it.next();
- recursionFn(list, n);
- }
+ for (SysDept tChild : childList) {
+ if (hasChild(list, tChild)) {
+ recursionFn(list, tChild);
}
}
}
@@ -281,15 +290,10 @@
/**
* 寰楀埌瀛愯妭鐐瑰垪琛�
*/
- 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())
- {
- SysDept n = (SysDept) it.next();
- if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
- {
+ for (SysDept n : list) {
+ if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
tlist.add(n);
}
}
@@ -299,8 +303,7 @@
/**
* 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣
*/
- private boolean hasChild(List<SysDept> list, SysDept t)
- {
- return getChildList(list, t).size() > 0 ? true : false;
+ private boolean hasChild(List<SysDept> list, SysDept t) {
+ return getChildList(list, t).size() > 0;
}
}
--
Gitblit v1.9.3