From bb9ddb1da8ebc47739cdf466157af238e4361db9 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 28 十月 2022 18:05:38 +0800
Subject: [PATCH] 修改细节
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 114 +++++++++++++++++++++++++++------------------------------
1 files changed, 54 insertions(+), 60 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index c4f418f..85aa93d 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -12,6 +12,7 @@
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
+import com.ycl.exception.ApiException;
import com.ycl.exception.Asserts;
import com.ycl.mapper.user.*;
import com.ycl.service.depart.UmsDepartService;
@@ -23,11 +24,8 @@
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;
@@ -80,6 +78,10 @@
UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
@Resource
AdminMenuRelationMapper adminMenuRelationMapper;
+ @Resource
+ UmsMenuMapper umsMenuMapper;
+ @Resource
+ UmsAdminMapper umsAdminMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -131,33 +133,38 @@
}
//缁戝畾鑿滃崟浜庣敤鎴�
if (!ids.isEmpty()) {
- Integer size = 0;
- Long maxId = null;
+ ArrayList<UmsRoleMenuRelation> umsRoleMenuRelations = new ArrayList<>();
for (Long id : ids) {
- if (size < umsRoleMenuRelationMapper
+ umsRoleMenuRelations.addAll(umsRoleMenuRelationMapper
.selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
- .eq(UmsRoleMenuRelation::getRoleId, id)).size()) {
- size = umsRoleMenuRelationMapper
- .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
- .eq(UmsRoleMenuRelation::getRoleId, id)).size();
- maxId = id;
- }
+ .eq(UmsRoleMenuRelation::getRoleId, id)));
}
- umsRoleMenuRelationMapper
- .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
- .eq(UmsRoleMenuRelation::getRoleId, maxId))
+ umsRoleMenuRelations
.stream()
- .forEach(item->{
+ .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.getMenuId());
+ adminMenuRelation.setMenuId(item);
adminMenuRelationMapper.insert(adminMenuRelation);
});
}
//瀵圭敤鎴峰悕绯荤粺榛樿娣诲姞
- umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
- baseMapper.updateById(umsAdmin);
+ //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;
}
@@ -288,16 +295,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
@@ -328,7 +333,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("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
@@ -340,40 +345,11 @@
}
@Override
- public IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
+ public Page<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO) {
int pageSize = pageUserVO.getPageSize();
int current = pageUserVO.getCurrent();
Page<UmsAdmin> page = new Page<>(current, pageSize);
- 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 (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 -> {
- UmsDepart umsDepart = departService.getById(e.getDepartmentId());
- if (null != umsDepart) {
- e.setDepartName(umsDepart.getDepartName());
- }
- //鑾峰彇瑙掕壊鍒楄〃
- List<UmsRole> roles = umsRoleMapper.getRoleList(e.getId());
- e.setRoles(roles);
- });
- }
- return page1;
+ return umsAdminMapper.selectPageByWordKey(page,pageUserVO.getKeyword());
}
@Override
@@ -407,4 +383,22 @@
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;
+ }
}
--
Gitblit v1.8.0