|
@@ -6,25 +6,32 @@ 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.CacheNames;
|
|
|
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.service.DeptService;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.helper.DataBaseHelper;
|
|
|
import com.ruoyi.common.helper.LoginHelper;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.TreeBuildUtils;
|
|
|
+import com.ruoyi.common.utils.redis.CacheUtils;
|
|
|
+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 lombok.RequiredArgsConstructor;
|
|
|
+import org.springframework.cache.annotation.CacheEvict;
|
|
|
+import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 部门管理 服务实现
|
|
@@ -33,7 +40,7 @@ import java.util.List;
|
|
|
*/
|
|
|
@RequiredArgsConstructor
|
|
|
@Service
|
|
|
-public class SysDeptServiceImpl implements ISysDeptService {
|
|
|
+public class SysDeptServiceImpl implements ISysDeptService, DeptService {
|
|
|
|
|
|
private final SysDeptMapper baseMapper;
|
|
|
private final SysRoleMapper roleMapper;
|
|
@@ -106,6 +113,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
|
|
|
* @param deptId 部门ID
|
|
|
* @return 部门信息
|
|
|
*/
|
|
|
+ @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId")
|
|
|
@Override
|
|
|
public SysDept selectDeptById(Long deptId) {
|
|
|
SysDept dept = baseMapper.selectById(deptId);
|
|
@@ -116,6 +124,24 @@ public class SysDeptServiceImpl implements ISysDeptService {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 通过部门ID查询部门名称
|
|
|
+ *
|
|
|
+ * @param deptIds 部门ID串逗号分隔
|
|
|
+ * @return 部门名称串逗号分隔
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public String selectDeptNameByIds(String deptIds) {
|
|
|
+ List<String> list = new ArrayList<>();
|
|
|
+ for (Long id : Arrays.stream(deptIds.split(",")).map(Long::parseLong).collect(Collectors.toList())) {
|
|
|
+ SysDept dept = SpringUtils.getAopProxy(this).selectDeptById(id);
|
|
|
+ if (ObjectUtil.isNotNull(dept)) {
|
|
|
+ list.add(dept.getDeptName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return String.join(",", list);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 根据ID查询所有子部门数(正常状态)
|
|
|
*
|
|
|
* @param deptId 部门ID
|
|
@@ -260,7 +286,9 @@ public class SysDeptServiceImpl implements ISysDeptService {
|
|
|
list.add(dept);
|
|
|
}
|
|
|
if (CollUtil.isNotEmpty(list)) {
|
|
|
- baseMapper.updateBatchById(list);
|
|
|
+ if (baseMapper.updateBatchById(list)) {
|
|
|
+ list.forEach(dept -> CacheUtils.evict(CacheNames.SYS_DEPT, dept.getDeptId()));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -270,6 +298,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
|
|
|
* @param deptId 部门ID
|
|
|
* @return 结果
|
|
|
*/
|
|
|
+ @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId")
|
|
|
@Override
|
|
|
public int deleteDeptById(Long deptId) {
|
|
|
return baseMapper.deleteById(deptId);
|