From a445f592f22bc3f1bb7fe18ef80352c9f49f408c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 08 Nov 2021 13:50:12 +0800
Subject: [PATCH] 派遣人员查询接口新增修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 286 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 222 insertions(+), 64 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 6748e9c..bb50959 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
@@ -17,19 +17,17 @@
package org.springblade.modules.system.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
-import org.springblade.common.cache.DictCache;
-import org.springblade.common.cache.ParamCache;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
-import org.springblade.common.cache.UserCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
-import org.springblade.common.enums.DictEnum;
+import org.springblade.common.utils.QRCodeUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -42,29 +40,28 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
-import org.springblade.modules.dispatcher.service.IDispatcherService;
-import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
-import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.system.entity.*;
+import org.springblade.modules.system.excel.QrCodeExcel;
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;
-import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.*;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
-
-import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* 服务实现类
@@ -81,6 +78,7 @@
private final IRoleService roleService;
private final BladeTenantProperties tenantProperties;
private final IInformationService iInformationService;
+ private final IDeptService deptService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -106,9 +104,10 @@
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.selectCountAccount(user.getAccount());
+ if (userCount > 0 && Func.isEmpty(user.getId())) {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
boolean b = save(user) && submitUserDept(user);
String rtime = null;
if (null != user.getRtime()) {
@@ -116,7 +115,7 @@
}
user.setIsDeleted(0);
String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
- "politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch,is_deleted) " +
+ "politicaloutlook,healstats,height,address,registered,securitynumber,hold,status,dispatch,jurisdiction,is_deleted) " +
"values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
"'" + user.getPassword() + "'" + "," + "'" + user.getRealName() + "'" + "," +
"'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
@@ -133,6 +132,7 @@
"," + "'" + user.getHold() + "'" +
"," + "'" + user.getStatus() + "'" +
"," + "'" + user.getDispatch() + "'"+
+ "," + "'" + user.getJurisdiction() + "'"+
"," + "'" + user.getIsDeleted() + "'"
+ ")";
FtpUtil.sqlFileUpload(s);
@@ -142,16 +142,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateUser(User user) {
- String tenantId = user.getTenantId();
- Integer userCount = baseMapper.selectCount(
- Wrappers.<User>query().lambda()
- .eq(User::getTenantId, tenantId)
- .eq(User::getAccount, user.getAccount())
- .notIn(User::getId, user.getId())
- );
- if (userCount > 0) {
- throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
- }
+// String tenantId = user.getTenantId();
+// Integer userCount = baseMapper.selectCount(
+// Wrappers.<User>query().lambda()
+// .eq(User::getTenantId, tenantId)
+// .eq(User::getAccount, user.getAccount())
+// .notIn(User::getId, user.getId())
+// );
+// if (userCount > 0) {
+// throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+// }
return updateUserInfo(user) && submitUserDept(user);
}
@@ -380,47 +380,118 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public void importUser(List<UserExcel> data, Boolean isCovered) {
+// @Transactional(rollbackFor = Exception.class) 去除事务回滚
+ public void importUser(List<UserExcel> data, Boolean isCovered,String deptId) {
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ //将需要新增的保安员信息存入集合
+ List<User> insertList = new ArrayList<>();
+ //将需要更新的保安员信息存入集合
+ List<User> updateList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
- // 设置租户ID
- user.setTenantId("000000");
- //默认在职
- user.setStatus(1);
- //判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是")) {
- user.setHold("1");
- }
- if (userExcel.getHold().equals("否")) {
- user.setHold("2");
- }
- }
- //分配保安角色
- Role role = new Role();
- role.setRoleAlias("保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
- //性别
- if (null != userExcel.getSex()) {
- if (userExcel.getSex().equals("男")) {
- user.setSex(1);
- }
- if (userExcel.getSex().equals("女")) {
- user.setSex(2);
- }
- }
//设置部门id
- user.setDeptId(userDeptService.selectIn(user.getDeptId()));
- //设置账号
- user.setAccount(user.getCardid());
- //获取默认密码配置
- user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
+ String deptIds = userDeptService.selectIn(user.getDeptId());
+ if (null!=deptIds && !deptIds.equals("")) {
+ if (null != deptId && !deptId.equals("")) {
+ if (!deptId.equals(deptIds)) {
+ throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
+ }
+ }
+ user.setDeptId(deptIds);
+ }else {
+ //如果deptIds 为空，则说明还没有改公司
+ throw new ServiceException("导入失败!公司名:["+user.getDeptId()+"]不存在!");
+ }
+ //判断当前用户是否已在本单位，如果是的更新数据
+ User user1 = new User();
+ user1.setAccount(user.getCardid());
+ user1.setIsDeleted(0);
+ user1.setStatus(1);
+ User user2 = this.getOne(Condition.getQueryWrapper(user1));
+ if (null==user2){
+ //用户不存在，去新增
+ // 设置租户ID
+ user.setTenantId("000000");
+ //默认在职
+ user.setStatus(1);
+ //判断是否持证
+ if (null != userExcel.getHold() && userExcel.getHold() != "") {
+ if (userExcel.getHold().equals("是")) {
+ user.setHold("1");
+ }
+ if (userExcel.getHold().equals("否")) {
+ user.setHold("2");
+ }
+ }
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ //性别
+ if (null != userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
+ }
+
+ //设置账号
+ user.setAccount(user.getCardid());
+ //获取默认密码配置
+ user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
// user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
- //新增
- this.submit(user);
+ //新增
+ this.submit(user);
+ }else {
+ //匹配组织机构是否一致,如果不一致
+ if(!user2.getDeptId().equals(user.getDeptId())){
+ Dept dept = deptService.getById(user2.getDeptId());
+// throw new ServiceException("用户:"+"["+user.getCardid()+"]"+"已在其他单位存在!");
+ status.set(false);
+ //加入集合
+ errorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
+ return;
+ }else {
+ //如果是一致，则更新用户数据
+ //判断是否持证
+ if (null != userExcel.getHold() && userExcel.getHold() != "") {
+ if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
+ user2.setHold("1");
+ //更新保安证编号
+ user2.setSecuritynumber(user.getSecuritynumber());
+ }
+ if (userExcel.getHold().equals("否")) {
+ user2.setHold("2");
+ }
+ }
+ if (null!=userExcel.getRegistered()){
+ user2.setRegistered(userExcel.getRegistered());
+ }else {
+ user2.setRegistered("");
+ }
+ //更新用户数据
+ this.updateById(user2);
+ String s1 =
+ "update blade_user set hold = " + "'" + user2.getHold() + "'"
+ + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ + ",registered = " + "'" + user2.getRegistered() + "'"
+ + " " + "where id = " + "'" + user2.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
+ }
});
+ //如果所有数据导入有一个异常
+ if (!status.get()){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
+ }
}
// @Override
@@ -562,6 +633,28 @@
@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;
+ }
+
+ /**
+ * 派遣保安员列表树 安员列表树，帅选无保安证,下拉tree
+ *
+ * @param user 用户信息
+ * @return
+ */
+ @Override
+ public List<TreeNode> getSecurityDispatcherTree(UserVO user) {
+ Map<Long, TreeNode> map = baseMapper.getSecurityDispatcherTree(user);
List<TreeNode> tree = new ArrayList<>();
if (map.size() > 1) {
map.forEach((id, treeNode) -> {
@@ -743,6 +836,10 @@
if (Integer.parseInt(type) == 4) {
list = baseMapper.getWorkReportInfo(type, deptid, jurisdiction);
}
+ //现场检查获取保安员
+ if (Integer.parseInt(type) == 5) {
+ list = baseMapper.getSecurityInfo(jurisdiction);
+ }
return list;
}
@@ -756,4 +853,65 @@
public Integer selectCount(String account) {
return baseMapper.selectCountAccount(account);
}
+
+ /**
+ * 查询用户表中未删除，未离职的用户信息
+ * @param username
+ * @return
+ */
+ @Override
+ public User getUserInfo(String username) {
+ return baseMapper.getUserInfo(username);
+ }
+
+ /**
+ * 生成二维码
+ * @param data
+ * @param isCovered
+ * @param deptId
+ */
+ @Override
+ public void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId) {
+ String url = "http://223.82.109.183:2080/securityInfo.html";
+ data.forEach(qrCodeExcel -> {
+ if (null!=qrCodeExcel.getSecuritynumber()) {
+ String encoded = null;
+ try {
+ //中文字符串编码
+ encoded = URLEncoder.encode(qrCodeExcel.getSecuritynumber(),"UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ //url 拼接
+ String content = url + "?securityNumber=" + encoded;
+ byte[] qrCodeImage = new byte[0];
+ try {
+ //生成二维码字节流
+ qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
+ } catch (WriterException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ String path = "D:\\QrCode\\";
+ FileOutputStream fileOutputStream = null;
+ try {
+ fileOutputStream = new FileOutputStream(path+qrCodeExcel.getSecuritynumber()+".png");
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ try {
+ //图片下载到本地
+ fileOutputStream.write(qrCodeImage,0,qrCodeImage.length);
+ fileOutputStream.flush();
+ fileOutputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+
+
+
}
--
Gitblit v1.9.3