From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 161 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 119 insertions(+), 42 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 7cee25a..5dc0476 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -43,6 +43,7 @@
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
+import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.IUserOauthService;
@@ -52,10 +53,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -97,10 +95,10 @@
if (Func.isNotEmpty(user.getPassword())) {
user.setPassword(DigestUtil.encrypt(user.getPassword()));
}
- Integer userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
- if (userCount > 0 && Func.isEmpty(user.getId())) {
- throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
- }
+// Integer userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
+// if (userCount > 0 && Func.isEmpty(user.getId())) {
+// throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+// }
return save(user) && submitUserDept(user);
}
@@ -137,6 +135,11 @@
});
userDeptService.remove(Wrappers.<UserDept>update().lambda().eq(UserDept::getUserId, user.getId()));
return userDeptService.saveBatch(userDeptList);
+ }
+
+ @Override
+ public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
+ return page.setRecords(baseMapper.selectUserPages(page, user));
}
@Override
@@ -300,46 +303,44 @@
public void importUser(List<UserExcel> data, Boolean isCovered) {
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
- // 设置用户平台
- user.setUserType(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1));
- // 设置部门ID
- user.setDeptId(SysCache.getDeptIds(userExcel.getTenantId(), userExcel.getDeptName()));
- // 设置岗位ID
- user.setPostId(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()));
- // 设置角色ID
- user.setRoleId(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName()));
// 设置租户ID
if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
user.setTenantId(AuthUtil.getTenantId());
}
- // 覆盖数据
- if (isCovered) {
- // 查询用户是否存在
- User oldUser = UserCache.getUser(userExcel.getTenantId(), userExcel.getAccount());
- if (oldUser != null && oldUser.getId() != null) {
- user.setId(oldUser.getId());
- this.updateUser(user);
- return;
+ if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
+ if (userExcel.getStatus().equals("在职")) {
+ user.setStatus(1);
+ } else {
+ user.setStatus(2);
}
}
- // 获取默认密码配置
+ if (userExcel.getSex().equals("男性")) {
+ user.setSex(1);
+ } else {
+ user.setSex(2);
+ }
+ user.setRoleId("1412226235153731586");
+ String deptname = user.getDeptId();
+ String id = userDeptService.selectIn(deptname);
+ user.setDeptId(id);
+ //获取默认密码配置
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
user.setPassword(initPassword);
this.submit(user);
});
}
- @Override
- public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
- List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
- userList.forEach(user -> {
- user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
- user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
- user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
- user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
- });
- return userList;
- }
+// @Override
+// public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
+// List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
+// userList.forEach(user -> {
+// user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
+// user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
+// user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
+// user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
+// });
+// return userList;
+// }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -424,6 +425,7 @@
/**
* 通过 身份证号查询用户信息
+ *
* @param idCardNo 身份证号
* @return
*/
@@ -433,17 +435,92 @@
}
@Override
- public IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
+ public IPage<User> selectUserPageSecurity(IPage<User> page, User user) {
+ return page.setRecords(baseMapper.selectUserPageSecurity(page, user));
}
/**
* 自定义用户列表(只有保安员),根据保安员查
*/
@Override
- public List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String tenantId) {
- List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId);
+ public List<User> selectUserPageSecurityUnit(IPage<User> page, User user) {
+ return baseMapper.selectUserPageSecurity(page, user);
}
+
+
+ /**
+ * 保安员列表，帅选无保安证
+ *
+ * @param page
+ * @param user
+ * @return
+ */
+ @Override
+ public IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user) {
+ return baseMapper.selectUserPageSecurityApply(page, user);
+ }
+
+ /**
+ * 保安员列表树 安员列表树，帅选无保安证,下拉tree
+ *
+ * @param user 用户信息
+ * @return
+ */
+ @Override
+ public List<TreeNode> getSecurityApplyTree(UserVO user) {
+ Map<Long, TreeNode> map = baseMapper.getSecurityApplyTree(user);
+ List<TreeNode> tree = new ArrayList<>();
+ if (map.size() > 1) {
+ map.forEach((id, treeNode) -> {
+ if (map.containsKey(treeNode.getParentId())) {
+ map.get(treeNode.getParentId()).getChildren().add(treeNode);
+ } else {
+ tree.add(treeNode);
+ }
+ });
+ }
+ return tree;
+ }
+
+ @Override
+ public List<Map<Object, Object>> selectInr(String deptid) {
+ return baseMapper.selectInr(deptid);
+ }
+
+ /**
+ * 查询当前年份已有的保安证编号
+ *
+ * @param pre 前缀
+ * @return
+ */
+ @Override
+ public int getSecurityPaperCount(String pre) {
+ return baseMapper.getSecurityPaperCount(pre);
+ }
+
+ /**
+ * 查询当前公司未持证保安没有报名的人员
+ * @param deptId
+ * @return
+ */
+ @Override
+ public List<User> getNotApplyIdList(String deptId) {
+ return baseMapper.getNotApplyIdList(deptId);
+ }
+
+ /**
+ * 计算保安人员年龄
+ * @param userId
+ * @return
+ */
+ @Override
+ public UserVO getUserAgeById(Long userId) {
+ return baseMapper.getUserAgeById(userId);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectUser() {
+ return baseMapper.selectUser();
+ }
+
}
--
Gitblit v1.9.3