From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 1238 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 749 insertions(+), 489 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 4385e20..0853aba 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
@@ -24,10 +24,12 @@
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.config.QrcodeConfig;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.common.utils.IdCardNoUtil;
+import org.springblade.common.utils.ImageUtils;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -40,16 +42,18 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
-import org.springblade.modules.accreditation.entity.AccreditationRecords;
-import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
+import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
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.jurisdiction.service.JurisdictionService;
+import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.QrCodeExcel;
import org.springblade.modules.system.excel.SecurityExcel;
@@ -62,13 +66,12 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import sun.java2d.pipe.SpanShapeRenderer;
-
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -93,6 +96,8 @@
private final IDeptService deptService;
private final JurisdictionService jurisdictionService;
private final IExperienceService experienceService;
+ private final MyAsyncService myAsyncService;
+ private final SecurityPaperService securityPaperService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -123,10 +128,6 @@
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
boolean b = save(user) && submitUserDept(user);
- String rtime = null;
- if (null != user.getRtime()) {
- rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
- }
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,jurisdiction,is_deleted) " +
@@ -149,7 +150,8 @@
"," + "'" + user.getJurisdiction() + "'"+
"," + "'" + user.getIsDeleted() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
return b;
}
@@ -190,35 +192,67 @@
@Override
public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
- List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
- //机构名称拼接
- userVOS.forEach(userVO -> {
- if (null != userVO.getCardid() && userVO.getCardid() != "") {
- userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
- } else {
- userVO.setAge(null);
- }
- if (null!=userVO.getDeptId()) {
- List<String> list = baseMapper.getDeptName(userVO.getDeptId());
- if (list.size() > 1) {
- if (null != list.get(1) && list.get(1) != "") {
- String s = list.get(1).toString();
- if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ if (null!=user.getAgeType() && user.getAgeType()!=4){
+ List<UserVO> userVOS = baseMapper.selectUserPagesByAge(page, user);
+ //机构名称拼接
+ userVOS.forEach(userVO -> {
+// if (null != userVO.getCardid() && userVO.getCardid() != "") {
+// userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
+// } else {
+// userVO.setAge(null);
+// }
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ String s = list.get(1).toString();
+ if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ userVO.setDeptName(list.get(0));
+ }
+ else {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ }
+ } else {
userVO.setDeptName(list.get(0));
}
- else {
- userVO.setDeptName(list.get(1) + "," + list.get(0));
- }
- } else {
+ }
+ if (list.size() == 1) {
userVO.setDeptName(list.get(0));
}
}
- if (list.size() == 1) {
- userVO.setDeptName(list.get(0));
+ });
+ return page.setRecords(userVOS);
+ }else {
+ List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
+ //机构名称拼接
+ userVOS.forEach(userVO -> {
+// if (null != userVO.getCardid() && userVO.getCardid() != "") {
+// userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
+// } else {
+// userVO.setAge(null);
+// }
+ if (null!=userVO.getDeptId()) {
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size() > 1) {
+ if (null != list.get(1) && list.get(1) != "") {
+ String s = list.get(1).toString();
+ if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
+ userVO.setDeptName(list.get(0));
+ }
+ else {
+ userVO.setDeptName(list.get(1) + "," + list.get(0));
+ }
+ } else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size() == 1) {
+ userVO.setDeptName(list.get(0));
+ }
}
- }
- });
- return page.setRecords(userVOS);
+ });
+ return page.setRecords(userVOS);
+ }
}
@Override
@@ -306,6 +340,19 @@
public UserInfo userInfo(String tenantId, String account, String password) {
User user = baseMapper.getUser(tenantId, account, password);
return buildUserInfo(user);
+ }
+
+ /**
+ * 获取用户信息（wx）
+ * @param tenantId
+ * @param phone
+ * @param userEnum
+ * @return
+ */
+ @Override
+ public UserInfo userInfoByWx(String tenantId, String phone, UserEnum userEnum) {
+ User user = baseMapper.getUserByPhone(tenantId, phone);
+ return buildUserInfo(user, userEnum);
}
@Override
@@ -517,7 +564,8 @@
"," + "'" + user.getIsDeleted() + "'" +
"," + "'" + user.getJurisdiction() + "'"
+ ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.dataSync(s);
}else {
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
@@ -554,7 +602,8 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ ",cardid = " + "'" + user2.getCardid() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
}
}
});
@@ -806,16 +855,25 @@
*/
@Override
public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
+ long time = System.currentTimeMillis();
//将不能导入的保安员账号存起来
List<String> errorList = new ArrayList<>();
//年龄不符的保安员信息存入集合
List<String> ageErrorList = new ArrayList<>();
+ //保安员证编号不符的保安员信息存入集合
+ List<String> securityInvalidList = new ArrayList<>();
//将需要更新的保安员信息存入集合
List<User> updateList = new ArrayList<>();
+ //需要新增的保安员集合
+ List<User> userList = new ArrayList<>();
+ //需要新增的从业记录集合
+ List<Experience> experienceList = new ArrayList<>();
//导入状态，默认为true ,如果有一个出现问题则为 false
AtomicBoolean status = new AtomicBoolean(true);
AtomicBoolean agetStatus = new AtomicBoolean(true);
- data.forEach(userExcel -> {
+ AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
+ //遍历
+ for (SecurityExcel userExcel : data) {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
//设置部门id
String deptIds = userDeptService.selectIn(user.getDeptId());
@@ -834,6 +892,10 @@
//身份证校验
if (null==user.getCardid() || user.getCardid().equals("")){
throw new ServiceException("导入失败!身份证号码不能为空!");
+ }
+ //身份证住址校验
+ if (null==user.getRegistered() || user.getRegistered().equals("")){
+ throw new ServiceException("导入失败!身份证住址不能为空!");
}
if (null!=user.getCardid() && !user.getCardid().equals("")){
//去除所有空格
@@ -847,9 +909,49 @@
ageErrorList.add(user.getCardid());
// throw new ServiceException("导入失败!身份证号码[ "+user.getCardid()+" ]不正确,请核对!");
//forEach 只能使用 return 跳出本次循环
- return;
+// return;
+ continue;
}
}
+
+ //性别
+ if (null != userExcel.getSex()) {
+ if (userExcel.getSex().equals("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().equals("女")) {
+ user.setSex(2);
+ }
+ }
+
+ // 学历
+ if (null != userExcel.getEducation()) {
+ if (userExcel.getEducation().equals("初中及以下")
+ || userExcel.getEducation().equals("初中")
+ ) {
+ user.setEducation("1");
+ }
+ if (userExcel.getEducation().equals("高中/中技/中专")
+ || userExcel.getEducation().equals("高中")
+ || userExcel.getEducation().equals("中技")
+ || userExcel.getEducation().equals("中专")
+ ) {
+ user.setEducation("2");
+ }
+ if (userExcel.getEducation().equals("大专")) {
+ user.setEducation("3");
+ }
+ if (userExcel.getEducation().equals("本科")) {
+ user.setEducation("4");
+ }
+ if (userExcel.getEducation().equals("博士")) {
+ user.setEducation("5");
+ }
+ if (userExcel.getEducation().equals("硕士")) {
+ user.setEducation("6");
+ }
+ }
+
//判断当前用户是否已在本单位，如果是的更新数据
User user1 = new User();
user1.setAccount(user.getCardid());
@@ -863,218 +965,211 @@
//默认在职
user.setStatus(1);
user.setIsDeleted(0);
+ user.setHold("2");
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是")) {
- user.setHold("1");
- }
- if (userExcel.getHold().equals("否")) {
- user.setHold("2");
- }
- }
+// if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+// user.setHold("1");
+// //校验保安员证编号是否合规
+// SecurityPaper securityPaper = new SecurityPaper();
+// securityPaper.setIdCardNo(userExcel.getCardid());
+// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+// if (securityPaperList.size()>0){
+// boolean state = false;
+// //遍历
+// for (SecurityPaper paper : securityPaperList) {
+// if (paper.getNumber().equals(user.getSecuritynumber())){
+// state = true;
+// }
+// }
+// if (!state){
+// user.setHold("2");
+// user.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// user.setHold("2");
+// user.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// user.setHold("2");
+// }
//判断年龄，超过60岁的不入
// if (AgeUtil.idCardToAge(user.getCardid())<60) {
- //分配保安角色
- Role role = new Role();
- role.setRoleAlias("保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
+ //分配保安角色
+ 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));
+ //加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
+ Integer userCount = baseMapper.selectCountAccount(user.getAccount());
+ if (userCount > 0 && Func.isEmpty(user.getId())) {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
+ user.setCreateTime(new Date());
+ user.setDispatch("1");
+ user.setExaminationType("0");
+ //新增
+// this.save(user);
+ //加入集合
+ userList.add(user);
+ //从业记录新增
+ Experience experience = new Experience();
+ experience.setCardid(user.getCardid());
+// experience.setSecurityid(user.getId().toString());
+ experience.setCompanyname(userExcel.getDeptId());
+ experience.setName(user.getRealName());
+ experience.setPost("保安员");
+ experience.setEntrytime(new Date());
+// experienceService.save(experience);
+ //加入集合
+ experienceList.add(experience);
- //设置账号
- user.setAccount(user.getCardid());
- //获取默认密码配置
- user.setPassword(user.getCardid().substring(user.getCardid().length() - 6));
- //加密
- if (Func.isNotEmpty(user.getPassword())) {
- user.setPassword(DigestUtil.encrypt(user.getPassword()));
- }
- Integer userCount = baseMapper.selectCountAccount(user.getAccount());
- if (userCount > 0 && Func.isEmpty(user.getId())) {
- throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
- }
- user.setCreateTime(new Date());
- //新增
- this.save(user);
-
-
- //从业记录新增
- Experience experience = new Experience();
- experience.setCardid(user.getCardid());
- experience.setSecurityid(user.getId().toString());
- experience.setCompanyname(userExcel.getDeptId());
- experience.setName(user.getRealName());
- experience.setPost("保安员");
- experience.setEntrytime(new Date());
- experienceService.save(experience);
-
- //内网同步
- String s = "insert into blade_user(" +
- "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
- "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time) " +
- "values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'" +
- "," + "'" + user.getAccount() + "'" +
- "," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getName() + "'" +
- "," + "'" + user.getRealName() + "'" +
- "," + "'" + user.getAvatar() + "'" +
- "," + "'" + user.getEmail() + "'" +
- "," + "'" + user.getPhone() + "'" +
- "," + "'" + user.getSex() + "'" +
- "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + user.getFingerprint() + "'" +
- "," + "'" + user.getEducation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'" +
- "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" +
- "," + "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExaminationType() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" + ");"+
- "insert into sys_experience(id,name,post,entryTime," +
- "cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
- "'" + experience.getPost() + "'" + "," +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
- "," + "'" + experience.getCardid() + "'" +
- "," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
- FtpUtil.sqlFileUpload(s);
-// }else {
-// agetStatus.set(false);
-// ageErrorList.add(user.getCardid());
-// }
}else {
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
- Dept dept = deptService.getById(user2.getDeptId());
- Dept dept1 = deptService.getById(user.getDeptId());
- //如果是南昌总公司分公司导入的
- if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
- user2.setDeptId(dept1.getId().toString());
- //判断是否持证
- 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("");
- }
- //更新用户数据
- user2.setUpdateTime(new Date());
- this.updateById(user2);
- String s1 =
- "update blade_user set hold = " + "'" + user2.getHold() + "'"
- + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
- + ",dept_id = " + "'" + user2.getDeptId() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
- + ",registered = " + "'" + user2.getRegistered() + "'"
- + " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }else {
- status.set(false);
- //加入集合
- errorList.add(user.getCardid());
- //forEach 只能使用 return 跳出本次循环
- return;
- }
+ status.set(false);
+ //加入集合
+ errorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
+// return;
+ continue;
}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.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+// user2.setHold("1");
+// user2.setSecuritynumber(user.getSecuritynumber());
+// //校验保安员证编号是否合规
+// SecurityPaper securityPaper = new SecurityPaper();
+// securityPaper.setIdCardNo(userExcel.getCardid());
+// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+// if (securityPaperList.size()>0){
+// boolean state = false;
+// //遍历
+// for (SecurityPaper paper : securityPaperList) {
+// if (paper.getNumber().equals(user.getSecuritynumber())){
+// state = true;
+// }
+// }
+// if (!state){
+// user2.setHold("2");
+// user2.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// user2.setHold("2");
+// user2.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// user2.setHold("2");
+// }
+// user2.setHold("2");
if (null!=userExcel.getRegistered()){
user2.setRegistered(userExcel.getRegistered());
}else {
user2.setRegistered("");
}
+
+ // 住址
+ if (null!=userExcel.getAddress()){
+ user2.setAddress(userExcel.getAddress());
+ }else {
+ user2.setAddress("");
+ }
+
+ // 学历
+ if (null!=userExcel.getEducation()){
+ user2.setEducation(user.getEducation());
+ }else {
+ user2.setEducation("");
+ }
+
+ // 从业单位
+ if (null!=userExcel.getUnitName()){
+ user2.setUnitName(userExcel.getUnitName());
+ }else {
+ user2.setUnitName("");
+ }
+
+ // 政治面貌
+ if (null!=userExcel.getPoliticaloutlook()){
+ user2.setPoliticaloutlook(userExcel.getPoliticaloutlook());
+ }else {
+ user2.setPoliticaloutlook("");
+ }
+
user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
- String s1 =
- "update blade_user set hold = " + "'" + user2.getHold() + "'"
- + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
- + ",registered = " + "'" + user2.getRegistered() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
- + " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
}
}
- });
- //如果所有数据导入有一个异常
- if (!status.get() || !agetStatus.get()){
- if (!status.get() && agetStatus.get()) {
- String errorAccount = StringUtils.join(errorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
- }
- if (!agetStatus.get() && status.get()) {
- String errorAccount = StringUtils.join(ageErrorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!身份证号码不正确,请核对!");
- }
- if (!status.get() && !agetStatus.get()) {
- String errorAccount = StringUtils.join(errorList, "\\\n");
- String errorAgeAccount = StringUtils.join(ageErrorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!"+
- "用户:[" + errorAgeAccount + "]导入失败!身份证号码不正确,请核对!");
- }
}
-// if (!status.get()) {
-// String errorAccount = StringUtils.join(errorList, "\\\n");
-// throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
-// }
+ //批量插入
+ //用户批量插入
+ if (userList.size()>0) {
+ baseMapper.batchUserList(userList);
+ //装换成map
+ Map<String, User> userMap = userList.stream().collect(Collectors.toMap(user -> user.getCardid(), user -> user));
+ //匹配
+ experienceList = experienceList.stream().map(experience -> {
+ if (experience.getCardid().equals(userMap.get(experience.getCardid()).getCardid())) {
+ experience.setSecurityid(userMap.get(experience.getCardid()).getId().toString());
+ }
+ return experience;
+ }).collect(Collectors.toList());
+ //批量插入从业记录
+ baseMapper.batchExperienceList(experienceList);
+ }
+// System.out.println("导入时间： = " + (System.currentTimeMillis()-time));
+
+ //如果所有数据导入有一个异常
+ StringBuilder errorBuilder = new StringBuilder();
+ if (!status.get()){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ }
+ if (!agetStatus.get()){
+ String errorAccount = StringUtils.join(ageErrorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ }
+ if (!securityInvalidStatus.get()){
+ String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ //抛出异常
+ if (errorBuilder.length()>0){
+ throw new ServiceException(errorBuilder.toString());
+ }
}
@Override
public void importSecurityYy(List<SecurityYyExcel> data, Boolean isCovered, String deptId) {
-//将不能导入的保安员账号存起来
+ //将不能导入的保安员账号存起来
List<String> errorList = new ArrayList<>();
//将需要新增的保安员信息存入集合
List<String> ageErrorList = new ArrayList<>();
+ //保安员证编号不符的保安员信息存入集合
+ List<String> securityInvalidList = new ArrayList<>();
//将需要更新的保安员信息存入集合
List<User> updateList = new ArrayList<>();
//导入状态，默认为true ,如果有一个出现问题则为 false
AtomicBoolean status = new AtomicBoolean(true);
AtomicBoolean agetStatus = new AtomicBoolean(true);
+ AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
data.forEach(userExcel -> {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
//设置部门id
@@ -1091,9 +1186,13 @@
throw new ServiceException("导入失败!公司名:["+user.getDeptId()+"]不存在!");
}
- //身份证校验
+ //身份证号码校验
if (null==user.getCardid() || user.getCardid().equals("")){
throw new ServiceException("导入失败!身份证号码不能为空!");
+ }
+ //身份证住址校验
+ if (null==user.getRegistered() || user.getRegistered().equals("")){
+ throw new ServiceException("导入失败!身份证住址不能为空!");
}
if (null!=user.getCardid() && !user.getCardid().equals("")){
//去除所有空格
@@ -1125,13 +1224,34 @@
user.setStatus(1);
user.setIsDeleted(0);
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是")) {
- user.setHold("1");
- }
- if (userExcel.getHold().equals("否")) {
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user.setHold("1");
+ //校验保安员证编号是否合规
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(userExcel.getCardid());
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size()>0){
+ boolean state = false;
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())){
+ state = true;
+ }
+ }
+ if (!state){
+ user.setHold("2");
+ user.setSecuritynumber(null);
+ securityInvalidList.add(userExcel.getCardid());
+ securityInvalidStatus.set(false);
+ }
+ }else {
user.setHold("2");
+ user.setSecuritynumber(null);
+ securityInvalidList.add(userExcel.getCardid());
+ securityInvalidStatus.set(false);
}
+ }else {
+ user.setHold("2");
}
//分配保安角色
Role role = new Role();
@@ -1175,80 +1295,45 @@
experience.setEntrytime(new Date());
experienceService.save(experience);
- //内网同步
- String s = "insert into blade_user(" +
- "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
- "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time,guncode) " +
- "values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'" +
- "," + "'" + user.getAccount() + "'" +
- "," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getName() + "'" +
- "," + "'" + user.getRealName() + "'" +
- "," + "'" + user.getAvatar() + "'" +
- "," + "'" + user.getEmail() + "'" +
- "," + "'" + user.getPhone() + "'" +
- "," + "'" + user.getSex() + "'" +
- "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + user.getFingerprint() + "'" +
- "," + "'" + user.getEducation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'"+
- "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" +
- "," + "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExaminationType() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
- "," + "'" + user.getGuncode() + "'" + ");"+
- "insert into sys_experience(id,name,post,entryTime," +
- "cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
- "'" + experience.getPost() + "'" + "," +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
- "," + "'" + experience.getCardid() + "'" +
- "," + "'" + experience.getCompanyname() + "'" +
- "," + "'" + experience.getSecurityid() + "'"
- + ")";
- FtpUtil.sqlFileUpload(s);
}
else {
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
-// Dept dept = deptService.getById(user2.getDeptId());
-// status.set(false);
-// //加入集合
-// errorList.add(user.getCardid());
-// //forEach 只能使用 return 跳出本次循环
-// return;
-
Dept dept = deptService.getById(user2.getDeptId());
Dept dept1 = deptService.getById(user.getDeptId());
//如果是南昌总公司分公司导入的
if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
user2.setDeptId(dept1.getId().toString());
//判断是否持证
- 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("否")) {
+ if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user2.setHold("1");
+ user2.setSecuritynumber(user.getSecuritynumber());
+ //校验保安员证编号是否合规
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(userExcel.getCardid());
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size()>0){
+ boolean state = false;
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())){
+ state = true;
+ }
+ }
+ if (!state){
+ user2.setHold("2");
+ user2.setSecuritynumber(null);
+ securityInvalidList.add(userExcel.getCardid());
+ securityInvalidStatus.set(false);
+ }
+ }else {
user2.setHold("2");
+ user2.setSecuritynumber(null);
+ securityInvalidList.add(userExcel.getCardid());
+ securityInvalidStatus.set(false);
}
+ }else {
+ user2.setHold("2");
}
if (null!=userExcel.getRegistered()){
user2.setRegistered(userExcel.getRegistered());
@@ -1258,14 +1343,6 @@
user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
- String s1 =
- "update blade_user set hold = " + "'" + user2.getHold() + "'"
- + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
- + ",dept_id = " + "'" + user2.getDeptId() + "'"
- + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
- + ",registered = " + "'" + user2.getRegistered() + "'"
- + " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
}else {
status.set(false);
//加入集合
@@ -1276,15 +1353,45 @@
}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("否")) {
+// 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.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+ user2.setHold("1");
+ user2.setSecuritynumber(user.getSecuritynumber());
+ //校验保安员证编号是否合规
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setIdCardNo(userExcel.getCardid());
+ List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+ if (securityPaperList.size()>0){
+ boolean state = false;
+ //遍历
+ for (SecurityPaper paper : securityPaperList) {
+ if (paper.getNumber().equals(user.getSecuritynumber())){
+ state = true;
+ }
+ }
+ if (!state){
+ user2.setHold("2");
+ user2.setSecuritynumber(null);
+ securityInvalidList.add(userExcel.getCardid());
+ securityInvalidStatus.set(false);
+ }
+ }else {
user2.setHold("2");
+ user2.setSecuritynumber(null);
+ securityInvalidList.add(userExcel.getCardid());
+ securityInvalidStatus.set(false);
}
+ }else {
+ user2.setHold("2");
}
if (null!=userExcel.getRegistered()){
user2.setRegistered(userExcel.getRegistered());
@@ -1294,90 +1401,37 @@
user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
+
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
}
}
});
//如果所有数据导入有一个异常
-// if (!status.get()){
-// String errorAccount = StringUtils.join(errorList, "\\\n");
-// throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
-// }
- if (!status.get() || !agetStatus.get()){
- if (!status.get() && agetStatus.get()) {
- String errorAccount = StringUtils.join(errorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
- }
- if (!agetStatus.get() && status.get()) {
- String errorAccount = StringUtils.join(ageErrorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!身份证号码不正确,请核对!");
- }
- if (!status.get() && !agetStatus.get()) {
- String errorAccount = StringUtils.join(errorList, "\\\n");
- String errorAgeAccount = StringUtils.join(ageErrorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!"+
- "用户:[" + errorAgeAccount + "]导入失败!身份证号码不正确,请核对!");
- }
+ StringBuilder errorBuilder = new StringBuilder();
+ if (!status.get()){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ }
+ if (!agetStatus.get()){
+ String errorAccount = StringUtils.join(ageErrorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ }
+ if (!securityInvalidStatus.get()){
+ String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ //抛出异常
+ if (errorBuilder.length()>0){
+ throw new ServiceException(errorBuilder.toString());
}
}
-
-
-// /**
-// * 导入保安员（测试，用来更新数据用）
-// *
-// * @param data
-// * @param isCovered
-// */
-// @Override
-//// @Transactional(rollbackFor = Exception.class)
-// public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
-// //将不能导入的保安员账号存起来
-// List<String> errorList = new ArrayList<>();
-// //导入状态，默认为true ,如果有一个出现问题则为 false
-// AtomicBoolean status = new AtomicBoolean(true);
-// AtomicInteger count = new AtomicInteger();
-// data.forEach(userExcel -> {
-// //判断当前用户是否已在本单位，如果是的更新数据
-// User user1 = new User();
-// user1.setAccount(userExcel.getCardid());
-// user1.setIsDeleted(0);
-// user1.setStatus(1);
-// User user2 = this.getOne(Condition.getQueryWrapper(user1));
-// if (null!=user2){
-// if (null!=userExcel.getRegistered() && userExcel.getRegistered()!=""){
-// user2.setRegistered(userExcel.getRegistered());
-//// user2.setUserType(7);
-// }
-// this.updateById(user2);
-// count.getAndIncrement();
-//
-//// AccreditationRecords accreditationRecords = new AccreditationRecords();
-//// accreditationRecords.setType(2);
-//// accreditationRecords.setAuditStatus(2);
-//// accreditationRecords.setUserId(user2.getId());
-//// accreditationRecords.setStatus(1);
-//// accreditationRecords.setCreateTime(new Date());
-//// accreditationRecordsService.save(accreditationRecords);
-// }else {
-// errorList.add(userExcel.getCardid());
-// }
-// });
-// //如果所有数据导入有一个异常
-// if (!status.get()){
-// String errorAccount = StringUtils.join(errorList, "\\\n");
-// throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
-// }
-// if (status.get()){
-// String errorAccount = StringUtils.join(errorList, "\\\n");
-// throw new ServiceException("成功导入用户:"+count.get());
-// }
-// }
/**
@@ -1387,8 +1441,18 @@
* @return
*/
@Override
- public UserVO getUserInfoBySecurityNumber(String securityNumber) {
- return baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ public UserVO getUserInfoBySecurityNumber(String securityNumber,String cardid) {
+ UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber,cardid);
+ //查询派遣信息
+ if (null!=userVO) {
+ DispatcherVO dispatcherVO = baseMapper.getUserDispatcherInfo(userVO.getId());
+ if (null != dispatcherVO) {
+ userVO.setDispatchUnitName(dispatcherVO.getDispatcherCompany());
+ userVO.setDispatchStartTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getDispatchertime()));
+ userVO.setDispatchEndTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getEndTime()));
+ }
+ }
+ return userVO;
}
@@ -1489,7 +1553,8 @@
*/
@Override
public void importQrCode(List<QrCodeExcel> data, Boolean isCovered, String deptId) {
- String url = "http://223.82.109.183:2080/securityInfo.html";
+ String url = QrcodeConfig.baseUrl + "securityInfo.html";
+ //二维码生成
data.forEach(qrCodeExcel -> {
if (null!=qrCodeExcel.getSecuritynumber()) {
String encoded = null;
@@ -1527,6 +1592,38 @@
}
}
});
+ //头像生成
+ data.forEach(qrCodeExcel -> {
+ if (null!=qrCodeExcel.getSecuritynumber()) {
+ //查询用户头像url
+ User user = new User();
+ user.setRealName(qrCodeExcel.getRealName());
+ user.setStatus(1);
+ user.setIsDeleted(0);
+ user.setSecuritynumber(qrCodeExcel.getSecuritynumber());
+ User user1 = this.getOne(Condition.getQueryWrapper(user));
+ //url 拼接
+ byte[] qrCodeImage = new byte[0];
+ //获取图片
+ qrCodeImage = ImageUtils.getFileStream(user1.getAvatar());
+ //路径
+ String path = "D:\\QrCode\\";
+ FileOutputStream fileOutputStream = null;
+ try {
+ fileOutputStream = new FileOutputStream(path+user1.getRealName()+user1.getCardid()+".png");
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ try {
+ //图片下载到本地
+ fileOutputStream.write(qrCodeImage,0,qrCodeImage.length);
+ fileOutputStream.flush();
+ fileOutputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
}
/**
@@ -1551,37 +1648,59 @@
/**
- * 导入保安员
+ * 导入保安员（admin 专用）
*
* @param data
- * @param isCovered
*/
@Override
-// @Transactional(rollbackFor = Exception.class)
- public void importSecurityTest(List<SecurityExcel> data, Boolean isCovered, String deptId) {
+ public void importSecurityTest(List<SecurityExcel> data) {
//将不能导入的保安员账号存起来
List<String> errorList = new ArrayList<>();
//年龄不符的保安员信息存入集合
List<String> ageErrorList = new ArrayList<>();
+ //保安员证编号不符的保安员信息存入集合
+ List<String> securityInvalidList = new ArrayList<>();
//将需要更新的保安员信息存入集合
List<User> updateList = new ArrayList<>();
+ //需要新增的保安员集合
+ List<User> userList = new ArrayList<>();
+ //需要新增的从业记录集合
+ List<Experience> experienceList = new ArrayList<>();
//导入状态，默认为true ,如果有一个出现问题则为 false
AtomicBoolean status = new AtomicBoolean(true);
- data.forEach(userExcel -> {
+ AtomicBoolean agetStatus = new AtomicBoolean(true);
+ AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
+ //遍历
+ for (SecurityExcel userExcel : data) {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
//设置部门id
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.setDeptId(deptIds);
+
+ //身份证校验
+ if (null==user.getCardid() || user.getCardid().equals("")){
+ throw new ServiceException("导入失败!身份证号码不能为空!");
}
+ //身份证住址校验
+ if (null==user.getRegistered() || user.getRegistered().equals("")){
+ throw new ServiceException("导入失败!身份证住址不能为空!");
+ }
+ if (null!=user.getCardid() && !user.getCardid().equals("")){
+ //去除所有空格
+ String cardid = user.getCardid().replaceAll(" ", "");
+ //校验
+ boolean b = IdCardNoUtil.checkIdCardNo(cardid);
+ if(b){
+ user.setCardid(cardid);
+ }else {
+ agetStatus.set(false);
+ ageErrorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
+// return;
+ continue;
+ }
+ }
+
//判断当前用户是否已在本单位，如果是的更新数据
User user1 = new User();
user1.setAccount(user.getCardid());
@@ -1595,17 +1714,62 @@
//默认在职
user.setStatus(1);
user.setIsDeleted(0);
+ user.setHold("2");
//判断是否持证
- if (null != userExcel.getHold() && userExcel.getHold() != "") {
- if (userExcel.getHold().equals("是")) {
- user.setHold("1");
- }
- if (userExcel.getHold().equals("否")) {
- user.setHold("2");
- }
- }
- //判断年龄，超过60岁的不入
-// if (AgeUtil.idCardToAge(user.getCardid())<60) {
+// if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+// user.setHold("1");
+// //校验保安员证编号是否合规
+// SecurityPaper securityPaper = new SecurityPaper();
+// securityPaper.setIdCardNo(userExcel.getCardid());
+// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+// if (securityPaperList.size()>0){
+// boolean state = false;
+// //遍历
+// for (SecurityPaper paper : securityPaperList) {
+// if (paper.getNumber().equals(user.getSecuritynumber())){
+// state = true;
+// }
+// }
+// if (!state){
+// user.setHold("2");
+// user.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// user.setHold("2");
+// user.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// //创建保安证编号
+// user.setHold("1");
+// //去生成保安证编号
+// String pre = SecurityPaperUtil.getSecurityPaper();
+// //查询当前年份已有的保安证编号
+// int max = this.getSecurityPaperCount(pre);
+// String result = null;
+// if (max == 0) {
+// result = pre + "00001";
+// } else {
+// //格式化
+// DecimalFormat decimalFormat = new DecimalFormat("00000");
+// max++;
+// result = pre + (decimalFormat.format(max));
+// }
+// user.setSecuritynumber(result);
+//
+// //生成保安证的同时向保安证管理表中插入一条数据
+// SecurityPaper securityPaper = new SecurityPaper();
+// securityPaper.setNumber(result);
+// securityPaper.setCreateTime(new Date());
+// securityPaper.setIdCardNo(user.getCardid());
+// securityPaper.setPeopleName(user.getRealName());
+// securityPaper.setSource(3);
+// //新增保安员证信息
+// securityPaperService.save(securityPaper);
+// }
//分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
@@ -1614,10 +1778,10 @@
//性别
if (null != userExcel.getSex()) {
- if (userExcel.getSex().equals("男")) {
+ if (userExcel.getSex().contains("男")) {
user.setSex(1);
}
- if (userExcel.getSex().equals("女")) {
+ if (userExcel.getSex().contains("女")) {
user.setSex(2);
}
}
@@ -1634,118 +1798,143 @@
if (userCount > 0 && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- //新增
- this.save(user);
- //内网同步
- String s = "insert into blade_user(" +
- "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
- "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
- "values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'" +
- "," + "'" + user.getAccount() + "'" +
- "," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getName() + "'" +
- "," + "'" + user.getRealName() + "'" +
- "," + "'" + user.getAvatar() + "'" +
- "," + "'" + user.getEmail() + "'" +
- "," + "'" + user.getPhone() + "'" +
- "," + "'" + user.getSex() + "'" +
- "," + "'" + user.getRoleId() + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + user.getFingerprint() + "'" +
- "," + "'" + user.getEducation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'" +
- "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" +
- "," + "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExaminationType() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
-// }else {
-// agetStatus.set(false);
-// ageErrorList.add(user.getCardid());
-// }
+ user.setCreateTime(new Date());
+ user.setDispatch("1");
+ user.setExaminationType("0");
+ //加入集合
+ userList.add(user);
+ //从业记录新增
+ Experience experience = new Experience();
+ experience.setCardid(user.getCardid());
+ experience.setCompanyname(userExcel.getDeptId());
+ experience.setName(user.getRealName());
+ experience.setPost("保安员");
+ experience.setEntrytime(new Date());
+ //加入集合
+ experienceList.add(experience);
+
}else {
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
- Dept dept = deptService.getById(user2.getDeptId());
- if (dept.getParentId().equals("1432626178757275649")){
- //判断是否持证
- 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() + "'"
- + ",dept_id = " + "'" + user2.getDeptId() + "'"
- + ",registered = " + "'" + user2.getRegistered() + "'"
- + " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }else {
- status.set(false);
- //加入集合
- errorList.add(user.getCardid());
- //forEach 只能使用 return 跳出本次循环
- return;
- }
+ status.set(false);
+ //加入集合
+ errorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
+ continue;
}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.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
+// user2.setHold("1");
+// user2.setSecuritynumber(user.getSecuritynumber());
+// //校验保安员证编号是否合规
+// SecurityPaper securityPaper = new SecurityPaper();
+// securityPaper.setIdCardNo(userExcel.getCardid());
+// List<SecurityPaper> securityPaperList = securityPaperService.list(Condition.getQueryWrapper(securityPaper));
+// if (securityPaperList.size()>0){
+// boolean state = false;
+// //遍历
+// for (SecurityPaper paper : securityPaperList) {
+// if (paper.getNumber().equals(user.getSecuritynumber())){
+// state = true;
+// }
+// }
+// if (!state){
+// user2.setHold("2");
+// user2.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// user2.setHold("2");
+// user2.setSecuritynumber(null);
+// securityInvalidList.add(userExcel.getCardid());
+// securityInvalidStatus.set(false);
+// }
+// }else {
+// //创建保安证编号
+// user2.setHold("1");
+// //去生成保安证编号
+// String pre = SecurityPaperUtil.getSecurityPaper();
+// //查询当前年份已有的保安证编号
+// int max = this.getSecurityPaperCount(pre);
+// String result = null;
+// if (max == 0) {
+// result = pre + "00001";
+// } else {
+// //格式化
+// DecimalFormat decimalFormat = new DecimalFormat("00000");
+// max++;
+// result = pre + (decimalFormat.format(max));
+// }
+// user2.setSecuritynumber(result);
+//
+// //生成保安证的同时向保安证管理表中插入一条数据
+// SecurityPaper securityPaper = new SecurityPaper();
+// securityPaper.setNumber(result);
+// securityPaper.setCreateTime(new Date());
+// securityPaper.setIdCardNo(user2.getCardid());
+// securityPaper.setPeopleName(user2.getRealName());
+// securityPaper.setSource(3);
+// //新增保安员证信息
+// securityPaperService.save(securityPaper);
+// }
if (null!=userExcel.getRegistered()){
user2.setRegistered(userExcel.getRegistered());
}else {
user2.setRegistered("");
}
+ user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
+ //qfqk异步推送
+// myAsyncService.updateUserByQfqk(user2);
+ //内网数据sql
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
+ ",registered = " + "'" + user2.getRegistered() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
}
}
- });
+ }
+ //批量插入
+ //用户批量插入
+ if (userList.size()>0) {
+ baseMapper.batchUserList(userList);
+
+ //装换成map
+ Map<String, User> userMap = userList.stream().collect(Collectors.toMap(user -> user.getCardid(), user -> user));
+ //匹配
+ experienceList = experienceList.stream().map(experience -> {
+ if (experience.getCardid().equals(userMap.get(experience.getCardid()).getCardid())) {
+ experience.setSecurityid(userMap.get(experience.getCardid()).getId().toString());
+ }
+ return experience;
+ }).collect(Collectors.toList());
+ //批量插入从业记录
+ baseMapper.batchExperienceList(experienceList);
+ }
+
//如果所有数据导入有一个异常
- if (!status.get()) {
+ StringBuilder errorBuilder = new StringBuilder();
+ if (!status.get()){
String errorAccount = StringUtils.join(errorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ }
+ if (!agetStatus.get()){
+ String errorAccount = StringUtils.join(ageErrorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
+ }
+ if (!securityInvalidStatus.get()){
+ String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
+ }
+ //抛出异常
+ if (errorBuilder.length()>0){
+ throw new ServiceException(errorBuilder.toString());
}
}
@@ -1753,4 +1942,75 @@
public List<Map<String, Object>> selectEquipent() {
return baseMapper.selectEquipent();
}
+
+
+ /**
+ * 年龄分布查询
+ * @param user
+ * @return
+ */
+ @Override
+ public Object getAgeStatistics(UserVO user) {
+ //获取年龄分布数据
+ List<Integer> list = baseMapper.getAgeStatistics(user);
+ //返回
+ return list;
+ }
+
+ /**
+ * 查询登录密码还是 123456 的单位信息
+ * @return
+ */
+ @Override
+ public Object getNotUpdatePwdInfo() {
+ //查询角色为保安公司管理员的用户信息
+ User user = new User();
+ user.setRoleId("1414575196264300546");
+ user.setStatus(1);
+ user.setIsDeleted(0);
+ List<User> list = this.list(Condition.getQueryWrapper(user));
+ List<User> list1 = new ArrayList<>();
+ //遍历
+ if (list.size()>0){
+ byte[] bytes = DigestUtil.decodeHex(list.get(0).getPassword());
+ try {
+ System.out.println("解密的密码 = " + new String(bytes));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return list;
+ }
+
+ /**
+ * 根据用户 id 查询用户信息
+ * @param id
+ * @return
+ */
+ @Override
+ public User getUserById(String id) {
+ return baseMapper.getUserById(Long.parseLong(id));
+ }
+
+ /**
+ * 6个月未登录人员，进行冻结
+ */
+ @Override
+ public void sixMonthNotLoginHandle() {
+ // 查询6个月未登录人员
+ List<String> userIds = baseMapper.getMoreDayNotLoginUser(183);
+ // 统一冻结操作
+ baseMapper.updateFreeze(userIds);
+ }
+
+ /**
+ * 12个月未登录人员，进行注销
+ */
+ @Override
+ public void oneYearNotLoginHandle() {
+ // 查询12个月未登录人员
+ List<String> userIds = baseMapper.getMoreDayNotLoginUser(366);
+ // 统一注销操作
+ baseMapper.updateLogout(userIds);
+ }
}
--
Gitblit v1.9.3