增加接口

VinDiesel
1 parent 26f0664e
Showing 5 changed files with 168 additions and 13 deletions
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/biz/service/auth/UserService.java
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/biz/service/auth/impl/UserServiceImpl.java
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/biz/strategy/impl/CustomizeDataScope.java
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/controller/auth/RoleController.java
itcast-auth/itcast-auth-server/src/main/java/com/itheima/authority/controller/auth/UserController.java
@@ -2,6 +2,7 @@ package com.itheima.authority.biz.service.auth;
  
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.itheima.authority.dto.auth.HierarchyDTO;
 import com.itheima.authority.dto.auth.LoginDTO;
 import com.itheima.authority.dto.auth.UserUpdatePasswordDTO;
 import com.itheima.authority.entity.auth.User;
@@ -50,4 +51,6 @@ public interface UserService extends IService&lt;User&gt; {
     void updateUserRole(User user);
  
     R<LoginDTO> current();
+
+    HierarchyDTO findHierarchy(Long id);
 }
@@ -15,10 +15,7 @@ import com.itheima.authority.biz.service.auth.UserRoleService;
 import com.itheima.authority.biz.service.auth.UserService;
 import com.itheima.authority.biz.service.core.OrgService;
 import com.itheima.authority.biz.service.core.StationService;
-import com.itheima.authority.dto.auth.LoginDTO;
-import com.itheima.authority.dto.auth.ResourceQueryDTO;
-import com.itheima.authority.dto.auth.UserDTO;
-import com.itheima.authority.dto.auth.UserUpdatePasswordDTO;
+import com.itheima.authority.dto.auth.*;
 import com.itheima.authority.entity.auth.*;
 import com.itheima.authority.entity.core.Org;
 import com.itheima.authority.entity.core.Station;
@@ -31,11 +28,14 @@ import com.itheima.tools.database.mybatis.auth.DataScopeType;
 import com.itheima.tools.database.mybatis.conditions.Wraps;
 import com.itheima.tools.database.mybatis.conditions.query.LbqWrapper;
 import com.itheima.tools.dozer.DozerUtils;
+import com.itheima.tools.exception.BizException;
+import com.itheima.tools.exception.code.ExceptionCode;
 import com.itheima.tools.utils.BizAssert;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -237,6 +237,98 @@ public class UserServiceImpl extends ServiceImpl&lt;UserMapper, User&gt; implements Us
     }
  
     /**
+     * 获取人员关系结构
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public HierarchyDTO findHierarchy(Long id) {
+        HierarchyDTO hierarchyDTO = new HierarchyDTO();
+        User user = this.getById(id);
+        Station station = stationService.getById(user.getStationId());
+        if (station != null) {
+            user.setStationName(station.getName());
+        }
+        log.info("当前用户:{}", user);
+        Stack<User> stack = new Stack<>();
+        getSuperiorStack(stack, user, 1);
+
+        List<User> list = new ArrayList<>();
+        getDownwardList(list, user);
+
+        buildTree(stack, list, hierarchyDTO);
+        return hierarchyDTO;
+    }
+
+    private void buildTree(Stack<User> stack, List<User> list, HierarchyDTO hierarchyDTO) {
+        if (stack == null || stack.size() == 0) {
+            return;
+        }
+        User user = stack.pop();
+        if (stack.size() == 0) {
+            BeanUtils.copyProperties(user, hierarchyDTO);
+            hierarchyDTO.setSelf(true);
+            hierarchyDTO.setChildren(list.stream().map(item -> {
+                HierarchyDTO hierarchy = new HierarchyDTO();
+                BeanUtils.copyProperties(item, hierarchy);
+                return hierarchy;
+            }).collect(Collectors.toList()));
+        } else {
+            BeanUtils.copyProperties(user, hierarchyDTO);
+
+            HierarchyDTO hierarchy = new HierarchyDTO();
+            hierarchyDTO.setChildren(Arrays.asList(new HierarchyDTO[]{hierarchy}));
+
+            buildTree(stack, list, hierarchy);
+        }
+
+    }
+
+    /**
+     * 获取下级的员工集合
+     *
+     * @param list
+     * @param user
+     */
+    private void getDownwardList(List<User> list, User user) {
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(User::getSuperior, user.getId());
+        List<User> users = this.list(wrapper);
+        list.addAll(users.stream().map(item -> {
+            Station station = stationService.getById(item.getStationId());
+            if (station != null) {
+                item.setStationName(station.getName());
+            }
+            return item;
+        }).collect(Collectors.toList()));
+    }
+
+    /**
+     * 获取上级关系,默认最多20级，防止内存泄露
+     *
+     * @param stack
+     * @param user
+     * @param depth
+     */
+    private void getSuperiorStack(Stack stack, User user, int depth) {
+        stack.add(user);
+        if (depth > 20) {
+            return;
+        }
+        Long superior = user.getSuperior();
+        if (null == superior || superior < 0L) {
+            return;
+        }
+        User userSuperior = this.getById(superior);
+        Station station = stationService.getById(userSuperior.getStationId());
+        if (station != null) {
+            userSuperior.setStationName(station.getName());
+        }
+        getSuperiorStack(stack, userSuperior, ++depth);
+    }
+
+    /**
      * 修改密码
      *
      * @param data
@@ -356,6 +448,11 @@ public class UserServiceImpl extends ServiceImpl&lt;UserMapper, User&gt; implements Us
  
         user.setPassword(DigestUtils.md5Hex(user.getPassword()));
         user.setPasswordErrorNum(0);
+
+        if (user.getSuperior() == null) {
+            user.setSuperior(-1L);
+        }
+
         super.save(user);
  
         List<Long> roles = user.getRoles();
@@ -405,6 +502,17 @@ public class UserServiceImpl extends ServiceImpl&lt;UserMapper, User&gt; implements Us
         if (StrUtil.isNotEmpty(user.getPassword())) {
             user.setPassword(DigestUtils.md5Hex(user.getPassword()));
         }
+        User userDb = this.getById(user);
+        if (user.getSuperior() != null) {
+            if (!user.getSuperior().equals(userDb.getSuperior())) {
+                boolean flag = checkSuperior(user.getSuperior(), user.getId());
+                if (!flag) {
+                    throw new BizException(ExceptionCode.BAD_REQUEST.getCode(), "直属上级已经是当前用户的下属！");
+                }
+            }
+        } else {
+            user.setSuperior(-1L);
+        }
         super.updateById(user);
  
         updateUserRole(user);
@@ -425,4 +533,24 @@ public class UserServiceImpl extends ServiceImpl&lt;UserMapper, User&gt; implements Us
         );
         return super.removeByIds(ids);
     }
+
+    private boolean checkSuperior(Long superiorId, Long userId) {
+        if (userId.equals(superiorId)) {
+            return false;
+        }
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(User::getSuperior, userId);
+        List<User> users = this.list(wrapper);
+        for (User user : users) {
+            if (user.getId().equals(superiorId)) {
+                return false;
+            } else {
+                boolean flag = checkSuperior(superiorId, user.getId());
+                if (!flag) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }
@@ -24,7 +24,7 @@ public class CustomizeDataScope implements AbstractDataScopeHandler {
     @Override
     public List<Long> getOrgIds(List<Long> orgList, Long userId) {
         if (orgList == null || orgList.isEmpty()) {
-            throw new BizException(ExceptionCode.BASE_VALID_PARAM.getCode(), "自定义数据权限类型时，组织不能为空");
+            throw new BizException(ExceptionCode.BAD_REQUEST.getCode(), "自定义数据权限类型时，组织不能为空");
         }
         for (Long org : orgList) {
             List<Org> children = orgService.findChildren(org);
@@ -173,7 +173,7 @@ public class RoleController extends BaseController {
  
  
     @ApiOperation(value = "给角色配置权限", notes = "给角色配置权限")
-    @PostMapping("/authority")
+    @PutMapping("/authority")
     @SysLog("给角色配置权限")
     public R<Boolean> saveRoleAuthority(@RequestBody RoleAuthoritySaveDTO roleAuthoritySaveDTO) {
         return success(roleAuthorityService.saveRoleAuthority(roleAuthoritySaveDTO));
@@ -2,12 +2,16 @@ package com.itheima.authority.controller.auth;
  
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.itheima.authority.biz.service.auth.RoleService;
+import com.itheima.authority.biz.service.auth.UserGroupService;
+import com.itheima.authority.biz.service.auth.UserGroupUserService;
 import com.itheima.authority.biz.service.auth.UserService;
 import com.itheima.authority.biz.service.core.OrgService;
 import com.itheima.authority.biz.service.core.StationService;
 import com.itheima.authority.dto.auth.*;
 import com.itheima.authority.entity.auth.Role;
 import com.itheima.authority.entity.auth.User;
+import com.itheima.authority.entity.auth.UserGroup;
+import com.itheima.authority.entity.auth.UserGroupUser;
 import com.itheima.authority.entity.core.Org;
 import com.itheima.authority.entity.core.Station;
 import com.itheima.authority.vo.ImportResultVO;
@@ -18,11 +22,6 @@ import com.itheima.tools.database.mybatis.conditions.Wraps;
 import com.itheima.tools.database.mybatis.conditions.query.LbqWrapper;
 import com.itheima.tools.dozer.DozerUtils;
 import com.itheima.tools.log.annotation.SysLog;
-import com.itheima.tools.user.feign.UserQuery;
-import com.itheima.tools.user.model.SysOrg;
-import com.itheima.tools.user.model.SysRole;
-import com.itheima.tools.user.model.SysStation;
-import com.itheima.tools.user.model.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -35,12 +34,13 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
  
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
  
-import static com.itheima.tools.exception.code.ExceptionCode.BASE_VALID_PARAM;
+import static com.itheima.tools.exception.code.ExceptionCode.BAD_REQUEST;
  
 /**
  * <p>
@@ -58,6 +58,10 @@ public class UserController extends BaseController {
     @Autowired
     private UserService userService;
     @Autowired
+    private UserGroupService userGroupService;
+    @Autowired
+    private UserGroupUserService userGroupUserService;
+    @Autowired
     private OrgService orgService;
     @Autowired
     private RoleService roleService;
@@ -182,6 +186,9 @@ public class UserController extends BaseController {
     @SysLog("查询用户")
     public R<User> get(@PathVariable Long id) {
         User item = userService.getById(id);
+        if (null == item) {
+            return success(null);
+        }
         List<Role> role = roleService.findRoleByUserId(item.getId());
         if (!CollectionUtils.isEmpty(role)) {
             List<String> roleNames = role.stream().map(roleItem -> roleItem.getName()).collect(Collectors.toList());
@@ -197,6 +204,15 @@ public class UserController extends BaseController {
         if (org != null) {
             item.setOrgName(org.getName());
         }
+        List<UserGroupUser> userGroupUsers = userGroupUserService.getGroupByUserId(item.getId());
+        if (!CollectionUtils.isEmpty(userGroupUsers)) {
+            List<Long> groupIds = userGroupUsers.stream().map(UserGroupUser::getGroupId).collect(Collectors.toList());
+            Collection<UserGroup> userGroups = userGroupService.listByIds(groupIds);
+            if (!CollectionUtils.isEmpty(userGroups)) {
+                List<String> userGroupsNames = userGroups.stream().map(UserGroup::getName).collect(Collectors.toList());
+                item.setUserGroupsNames(userGroupsNames);
+            }
+        }
         log.info("getById({}) result:{}", id, item);
         return success(item);
     }
@@ -289,7 +305,7 @@ public class UserController extends BaseController {
     @ApiOperation("导入")
     public R<? extends Object> importExcel(@RequestParam(value = "file") MultipartFile file) {
         if (file.isEmpty()) {
-            return fail(BASE_VALID_PARAM.build("导入内容为空"));
+            return fail(BAD_REQUEST.build("导入内容为空"));
         }
         Long begin = System.currentTimeMillis();
         ImportResultVO importResultVO = userService.importExcel(file);
@@ -300,6 +316,14 @@ public class UserController extends BaseController {
         return R.success(importResultVO);
     }
  
+    @ApiOperation(value = "查询用户上下级结构", notes = "查询用户上下级结构")
+    @GetMapping("hierarchy/{id}")
+    @SysLog("查询用户上下级结构")
+    public R<HierarchyDTO> hierarchy(@PathVariable Long id) {
+        HierarchyDTO hierarchyDTO = userService.findHierarchy(id);
+        return success(hierarchyDTO);
+    }
+
     /**
      * 获取当前登录信息
      *