From 39794d3cd1b4569f82528fbad23f048d9d1be398 Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期三, 11 一月 2023 13:55:52 +0800
Subject: [PATCH] 导出接口
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 202 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 160 insertions(+), 42 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 366c696..2e3e399 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
@@ -4,30 +4,26 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.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;
@@ -49,6 +45,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鍚庡彴绠＄悊鍛樼鐞哠ervice瀹炵幇绫�
@@ -70,7 +67,17 @@
@Resource
private UmsResourceMapper umsResourceMapper;
@Resource
- private SccgDepartService sccgDepartService;
+ 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) {
@@ -91,7 +98,6 @@
@Transactional(rollbackFor = Exception.class)
public UmsAdmin register(UmsAdminParam umsAdminParam) {
UmsAdmin umsAdmin = new UmsAdmin();
- //TODO mac,ip,鑱屽姟锛岀敤鎴风被鍨�
BeanUtils.copyProperties(umsAdminParam, umsAdmin);
umsAdmin.setCreateTime(new Date());
umsAdmin.setStatus(1);
@@ -105,9 +111,61 @@
}
//灏嗗瘑鐮佽繘琛屽姞瀵嗘搷浣�
String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());
+
+ if ( !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
+ Asserts.fail("瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝锛堝ぇ鍐欐垨鑰呭皬鍐欙級鍜屽繀椤诲寘鍚暟瀛楋紝涓嶈兘鍖呭惈绌烘牸");
+ }
+ if(umsAdmin.getUsername().equals(umsAdmin.getPassword())){
+ Asserts.fail("瀵嗙爜涓嶈兘鍜岀櫥褰曞悕瀹屽叏涓�鑷�");
+ }
umsAdmin.setPassword(encodePassword);
baseMapper.insert(umsAdmin);
- umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
+
+ //娣诲姞瑙掕壊鎺堟潈
+ 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;
}
@@ -117,7 +175,7 @@
String token = null;
//瀵嗙爜闇�瑕佸鎴风鍔犲瘑鍚庝紶閫�
try {
- UserDetails userDetails = loadUserByUsername(username);
+ AdminUserDetails userDetails = (AdminUserDetails) loadUserByUsername(username);
if (!passwordEncoder.matches(password, userDetails.getPassword())) {
Asserts.fail("瀵嗙爜涓嶆纭�");
}
@@ -126,9 +184,11 @@
}
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
SecurityContextHolder.getContext().setAuthentication(authentication);
- token = jwtTokenUtil.generateToken(userDetails);
+ //鏍规嵁鐢ㄦ埛id锛岀敤鎴峰鍚�
+ token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
+ redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
// updateLoginTimeByUsername(username);
- insertLoginLog(username);
+ //insertLoginLog(username);
} catch (AuthenticationException e) {
LOGGER.warn("鐧诲綍寮傚父:{}", e.getMessage());
}
@@ -181,6 +241,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean update(Long id, UmsAdmin admin) {
admin.setId(id);
UmsAdmin rawAdmin = getById(id);
@@ -236,24 +297,26 @@
}
@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
public int updatePassword(UpdateAdminPasswordParam param) {
- if (StrUtil.isEmpty(param.getUsername())
- || StrUtil.isEmpty(param.getOldPassword())
- || StrUtil.isEmpty(param.getNewPassword())) {
+ if (StrUtil.isNotEmpty(param.getUsername())
+ && StrUtil.isNotEmpty(param.getOldPassword())
+ && StrUtil.isNotEmpty(param.getNewPassword())
+ && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
return -1;
+ }
+ if(param.getUsername().equals(param.getNewPassword())){
+ return -4;
}
QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(UmsAdmin::getUsername, param.getUsername());
@@ -276,7 +339,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("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
@@ -288,30 +351,85 @@
}
@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<>();
+ /* 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());
+ }*/
+ UmsAdmin umsAdmin = new UmsAdmin();
+ if (pageUserVO.getUserType() != null) {
+ umsAdmin.setUserType(pageUserVO.getUserType());
}
- if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getDepartmentId())) {
- queryWrapper.eq(UmsAdmin::getDepartmentId, pageUserVO.getDepartmentId());
+ if (pageUserVO.getKeyword() != null && !("".equals(pageUserVO.getKeyword()))) {
+ umsAdmin.setKeyword(pageUserVO.getKeyword());
}
- 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());
- }
- });
+ if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) {
+ umsAdmin.setJobTitle(pageUserVO.getJobTitle());
}
+ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin);
+
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;
+ }
}
--
Gitblit v1.8.0