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 | 933 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 537 insertions(+), 396 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 54cde20..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,6 +24,7 @@
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;
@@ -44,6 +45,7 @@
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;
@@ -69,6 +71,7 @@
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;
@@ -148,7 +151,7 @@
"," + "'" + user.getIsDeleted() + "'"
+ ")";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
return b;
}
@@ -337,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
@@ -549,7 +565,7 @@
"," + "'" + user.getJurisdiction() + "'"
+ ")";
//FtpUtil.sqlFileUpload(s);
- myAsyncService.FTP(s);
+ myAsyncService.dataSync(s);
}else {
//匹配组织机构是否一致,如果不一致
if(!user2.getDeptId().equals(user.getDeptId())){
@@ -587,7 +603,7 @@
+ ",cardid = " + "'" + user2.getCardid() + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(s1);
+ myAsyncService.dataSync(s1);
}
}
});
@@ -898,6 +914,44 @@
}
}
+ //性别
+ 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());
@@ -911,39 +965,37 @@
//默认在职
user.setStatus(1);
user.setIsDeleted(0);
+ user.setHold("2");
//判断是否持证
- if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
- user.setHold("1");
- //校验保安员证编号是否合规
- if (null!=userExcel.getSecuritynumber() && !userExcel.getSecuritynumber().equals("")){
- //持证，校验保安证编号是否合法
- 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");
- }
+// 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) {
//分配保安角色
@@ -951,16 +1003,6 @@
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());
@@ -996,116 +1038,83 @@
}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.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.setUpdateTime(new Date());
- this.updateById(user2);
- //qfqk异步推送
- myAsyncService.updateUserByQfqk(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);
- myAsyncService.FTP(s1);
- }else {
- status.set(false);
- //加入集合
- errorList.add(user.getCardid());
- //forEach 只能使用 return 跳出本次循环
+ status.set(false);
+ //加入集合
+ errorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
// return;
- continue;
- }
+ continue;
}else {
//如果是一致，则更新用户数据
//判断是否持证
- 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.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);
- //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.FTP(s1);
}
}
}
@@ -1113,62 +1122,6 @@
//用户批量插入
if (userList.size()>0) {
baseMapper.batchUserList(userList);
- //用户批量插入异步推送
- myAsyncService.batchUserList(userList);
- //sql 拼接
- StringBuilder builder = new StringBuilder();
- StringBuilder builder1 = new StringBuilder();
- //遍历
- for (User user : userList) {
- //内网同步，sql 拼接
- String sql = "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()) + "'" + ")";
- //拼接
- builder = builder.append(sql).append(";");
- List<String> list = Arrays.asList(builder.toString().split(";"));
- //判断list.size 大小
- if (list.size()==1000){
- //执行
- //FtpUtil.sqlFileUpload(builder.toString());
- myAsyncService.FTP(builder.toString());
- //清空
- builder.delete(0,builder.length());
- }
- }
-
//装换成map
Map<String, User> userMap = userList.stream().collect(Collectors.toMap(user -> user.getCardid(), user -> user));
//匹配
@@ -1180,33 +1133,6 @@
}).collect(Collectors.toList());
//批量插入从业记录
baseMapper.batchExperienceList(experienceList);
- //遍历，拼接sql ，同步数据到内网
- for (Experience experience : experienceList) {
- String sql1 = "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() + "'" + ")";
- //拼接
- builder1 = builder1.append(sql1).append(";");
- String[] split1 = builder.toString().split(";");
- //判断list.size 大小
- if (split1.length==1000){
- //执行
- //FtpUtil.sqlFileUpload(builder1.toString());
- myAsyncService.FTP(builder1.toString());
- //清空
- builder1.delete(0,builder1.length());
- }
- }
- //剩余的继续执行
- //FtpUtil.sqlFileUpload(builder.toString());
- myAsyncService.FTP(builder.toString());
- //FtpUtil.sqlFileUpload(builder1.toString());
- myAsyncService.FTP(builder1.toString());
}
// System.out.println("导入时间： = " + (System.currentTimeMillis()-time));
@@ -1222,7 +1148,7 @@
}
if (!securityInvalidStatus.get()){
String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
- errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!!");
+ errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
}
//抛出异常
if (errorBuilder.length()>0){
@@ -1236,11 +1162,14 @@
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
@@ -1297,6 +1226,30 @@
//判断是否持证
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");
}
@@ -1342,85 +1295,43 @@
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);
- myAsyncService.FTP(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("否")) {
-// 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");
}
@@ -1432,15 +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);
- myAsyncService.FTP(s1);
}else {
status.set(false);
//加入集合
@@ -1464,6 +1366,30 @@
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");
}
@@ -1475,6 +1401,7 @@
user2.setUpdateTime(new Date());
//更新用户数据
this.updateById(user2);
+
String s1 =
"update blade_user set hold = " + "'" + user2.getHold() + "'"
+ ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
@@ -1482,84 +1409,29 @@
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user2.getId() + "'";
//FtpUtil.sqlFileUpload(s1);
- myAsyncService.FTP(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());
-// }
-// }
/**
@@ -1681,7 +1553,7 @@
*/
@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()) {
@@ -1776,21 +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
- AtomicInteger count = new AtomicInteger();
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());
+ 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());
@@ -1798,24 +1708,233 @@
user1.setStatus(1);
User user2 = this.getOne(Condition.getQueryWrapper(user1));
if (null==user2){
- }else {
- if (null!=userExcel.getRegistered()){
- user2.setRegistered(userExcel.getRegistered());
- }else {
- user2.setRegistered("");
+ //用户不存在，去新增
+ // 设置租户ID
+ user.setTenantId("000000");
+ //默认在职
+ user.setStatus(1);
+ user.setIsDeleted(0);
+ 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("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("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+
+ //性别
+ if (null != userExcel.getSex()) {
+ if (userExcel.getSex().contains("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().contains("女")) {
+ user.setSex(2);
+ }
}
- count.getAndIncrement();
- //更新用户数据
- this.updateById(user2);
+
+ //设置账号
+ 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");
+ //加入集合
+ 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())){
+ status.set(false);
+ //加入集合
+ errorList.add(user.getCardid());
+ //forEach 只能使用 return 跳出本次循环
+ continue;
+ }else {
+ //如果是一致，则更新用户数据
+ //判断是否持证
+// 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() + "'";
+ myAsyncService.dataSync(s1);
+ }
}
- });
- //如果所有数据导入有一个异常
- if (!status.get()) {
- String errorAccount = StringUtils.join(errorList, "\\\n");
- throw new ServiceException("用户:[" + errorAccount + "]导入失败!不存在!");
}
- if (status.get()) {
- System.out.println("共更新 = " + count.get()+" 人!");
+ //批量插入
+ //用户批量插入
+ 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);
+ }
+
+ //如果所有数据导入有一个异常
+ 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());
}
}
@@ -1872,4 +1991,26 @@
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