用戶表刪除部门Id逻辑修改

mg

2022-10-28 d4f9e73dc6f275a44b45afa13b5af4bf45cae073

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -10,28 +10,21 @@
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.depart.SccgDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.ApiException;
import com.ycl.exception.Asserts;
import com.ycl.mapper.user.UmsAdminLoginLogMapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.service.depart.SccgDepartService;
import com.ycl.mapper.user.*;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsAdminDepartService;
import com.ycl.service.user.UmsAdminRoleRelationService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.utils.JwtTokenUtil;
import com.ycl.utils.SpringUtil;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.common.MacUtils;
import com.ycl.utils.common.PojoUtils;
import com.ycl.utils.common.RandomUtils;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
@@ -53,6 +46,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * 后台管理员管理Service实现类
@@ -74,11 +68,17 @@
    @Resource
    private UmsResourceMapper umsResourceMapper;
    @Resource
    private SccgDepartService sccgDepartService;
    @Resource
    private UmsAdminDepartService umsAdminDepartService;
    private UmsDepartService departService;
    @Resource
    private RedisService redisService;
    @Resource
    private UmsDepartManageMapper umsDepartManageMapper;
    @Resource
    UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
    @Resource
    AdminMenuRelationMapper adminMenuRelationMapper;
    @Resource
    UmsMenuMapper umsMenuMapper;

    @Override
    public UmsAdmin getAdminByUsername(String username) {
@@ -115,10 +115,53 @@
        String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());
        umsAdmin.setPassword(encodePassword);
        baseMapper.insert(umsAdmin);
        //对用户名系统默认添加
        umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
        baseMapper.updateById(umsAdmin);

        //添加角色授权
        List<Long> ids = umsAdminParam.getRoleIds();
        if (!ids.isEmpty()) {
            List<UmsAdminRoleRelation> roleIds = new ArrayList<>();
            for (Long id : ids) {
                UmsAdminRoleRelation urr = new UmsAdminRoleRelation();
                urr.setAdminId(umsAdmin.getId());
                urr.setRoleId(id);
                roleIds.add(urr);
            }
            umsAdminRoleRelationService.saveBatch(roleIds);
        }
        //绑定菜单于用户
        if (!ids.isEmpty()) {
            ArrayList<UmsRoleMenuRelation> umsRoleMenuRelations = new ArrayList<>();
            for (Long id : ids) {
                umsRoleMenuRelations.addAll(umsRoleMenuRelationMapper
                        .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                                .eq(UmsRoleMenuRelation::getRoleId, id)));
            }
            umsRoleMenuRelations
                    .stream()
                    .map(item->item.getMenuId())
                    .collect(Collectors.toList())
                    .stream()
                    .distinct()
                    .collect(Collectors.toList())
                    .stream()
                    .forEach(item -> {
                        AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
                        adminMenuRelation.setAdminId(umsAdmin.getId());
                        adminMenuRelation.setMenuId(item);
                        adminMenuRelationMapper.insert(adminMenuRelation);
                    });
        }
        //对用户名系统默认添加
        //umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
        //添加部门
        UmsDepartManage departManage = new UmsDepartManage();
        departManage.setUserId(umsAdmin.getId());
        departManage.setDepartId(umsAdminParam.getDepartmentId());
        departManage.setCreateTime(new Date());
        departManage.setUpdateTime(new Date());
        umsDepartManageMapper.insert(departManage);

        baseMapper.updateById(umsAdmin);
        return umsAdmin;
    }

@@ -249,16 +292,14 @@
    }

    @Override
    public List<UmsResource> getResourceList(Long adminId) {
        List<UmsResource> resourceList = getCacheService().getResourceList(adminId);
        if (CollUtil.isNotEmpty(resourceList)) {
            return resourceList;
    public List<UmsMenu> getResourceList(Long adminId) {
        List<UmsMenu> umsMenuList = getCacheService().getResourceList(adminId);
        if (CollUtil.isNotEmpty(umsMenuList)) {
            return umsMenuList;
        }
        resourceList = umsResourceMapper.getResourceList(adminId);
        if (CollUtil.isNotEmpty(resourceList)) {
            getCacheService().setResourceList(adminId, resourceList);
        }
        return resourceList;
        umsMenuList = umsMenuMapper.getMenuList(adminId);
            getCacheService().setResourceList(adminId, umsMenuList);
        return umsMenuList;
    }

    @Override
@@ -289,7 +330,7 @@
        //获取用户信息
        UmsAdmin admin = getAdminByUsername(username);
        if (admin != null) {
            List<UmsResource> resourceList = getResourceList(admin.getId());
            List<UmsMenu> resourceList = getResourceList(admin.getId());
            return new AdminUserDetails(admin, resourceList);
        }
        throw new UsernameNotFoundException("用户名或密码错误");
@@ -305,29 +346,71 @@
        int pageSize = pageUserVO.getPageSize();
        int current = pageUserVO.getCurrent();
        Page<UmsAdmin> page = new Page<>(current, pageSize);
        LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();
       /* LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();

        if (StringUtils.isNotBlank(pageUserVO.getKeyword())) {
            queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword())
                    .or().like(UmsAdmin::getNickName, pageUserVO.getKeyword())
                    .or().like(UmsAdmin::getMobile, pageUserVO.getKeyword());
        }
        if (StringUtils.isNotBlank(pageUserVO.getJobTitle())) {
            queryWrapper.eq(UmsAdmin::getJobTitle, pageUserVO.getJobTitle());
        }
        if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
            queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
        }
        if (StringUtils.isNotBlank(pageUserVO.getMobile())) {
            queryWrapper.like(UmsAdmin::getMobile, pageUserVO.getMobile());
        }
        if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getDepartmentId())) {
            queryWrapper.eq(UmsAdmin::getDepartmentId, pageUserVO.getDepartmentId());
        }
        Page<UmsAdmin> page1 = baseMapper.selectPage(page, queryWrapper);
        List<UmsAdmin> records = page1.getRecords();
        if (CollUtil.isNotEmpty(records)) {
            records.forEach(e -> {
                SccgDepart sccgDepart = sccgDepartService.getById(e.getDepartmentId());
                if (null != sccgDepart) {
                    e.setDepartName(sccgDepart.getDepartName());
                }
            });
        }
        }*/
        Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO);

        return page1;
    }

    @Override
    public boolean deleteBatch(List<Long> ids) {
        boolean success = removeByIds(ids);
        getCacheService().delBatchAdmin(ids);
        return success;
    }

    @Override
    public boolean updateStatusBatch(List<Long> ids, Integer status) {
        List<UmsAdmin> users = new ArrayList<>();
        for (Long id : ids) {
            UmsAdmin umsAdmin = UmsAdmin.builder().
                    id(id).status(status).build();
            users.add(umsAdmin);
        }
        updateBatchById(users, users.size());
        getCacheService().delBatchAdmin(ids);
        return true;
    }

    @Override
    public List<UmsAdmin> getDepartUser(Long departId) {
        QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
        List<UmsDepartManage> list = umsDepartManageMapper.selectList(wrapper);
        List<Long> userIds = list.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
        wrapperUser.in("id", userIds);
        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
        return adminList;
    }

    @Override
    public String getTargetTo(String ids, String sendType) {
        String str = null;
        String[] arr = ids.split(",");
        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
        wrapperUser.in("id", arr);
        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
        if (adminList == null || adminList.isEmpty()) {
            throw new ApiException("未查询到用户");
        }
        if ("02".equals(sendType)) {
            str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
        } else {
            str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(","));
        }
        return str;
    }
}