From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 79 ++++++++-------------------------------
1 files changed, 16 insertions(+), 63 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 fd42431..e06ef31 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
@@ -1246,27 +1246,11 @@
*/
@Override
public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
- long time = System.currentTimeMillis();
- //uuidList
- List<String> uuidList = new ArrayList<>();
- //将不能导入的保安员账号存起来
- 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<User> addList = new ArrayList<>();
- //需要新增的从业记录集合
- List<Experience> experienceList = new ArrayList<>();
- //导入状态，默认为true ,如果有一个出现问题则为 false
- AtomicBoolean status = new AtomicBoolean(true);
AtomicBoolean agetStatus = new AtomicBoolean(true);
- AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
//遍历
for (SecurityExcel userExcel : data) {
User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
@@ -1274,8 +1258,11 @@
String deptIds = userDeptService.selectIn(user.getDeptId());
if (null!=deptIds && !deptIds.equals("")) {
if (null != deptId && !deptId.equals("")) {
+ //管理员不分单位导入
if (!deptId.equals(deptIds)) {
- throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
+ if(!deptId.equals("1123598813738675201")) {
+ throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
+ }
}
}
user.setDeptId(deptIds);
@@ -1313,9 +1300,6 @@
user.setStatus(1);
user.setIsDeleted(0);
//分配保安角色
-// Role role = new Role();
-// role.setRoleAlias("保安");
-// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
user.setRoleId("1412226235153731586");
if (null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
@@ -1325,22 +1309,15 @@
}
//性别
- if (null != userExcel.getSex()) {
- if (userExcel.getSex().equals("男")) {
- user.setSex(1);
- }else if (userExcel.getSex().equals("女")) {
- user.setSex(2);
- }else {
- user.setSex(1);
- }
- }else {
+ if (IdCardNoUtil.getSex(userExcel.getCardid()).equals("男")) {
user.setSex(1);
+ }else {
+ user.setSex(2);
}
//设置账号
String realName = user.getRealName();
String cardid = user.getCardid();
-// user.setAccount(user.getRealName());
user.setAccount(realName.substring(0,1)+cardid.substring(cardid.length()-4));
//加密
user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
@@ -1361,10 +1338,8 @@
user0.setReasonForLeav(uuid);
//加入集合
userList.add(user0);
- uuidList.add(uuid);
}
- Result result = new Result();
//用户批量插入
if (userList.size()>0) {
//生成随机数
@@ -1373,28 +1348,6 @@
Map<String, Object> map = new HashMap<>(1);
map.put(uuid, userList);
myAsyncService.FTPObjectList(map);
-
-// int count = 0;
-// //调用ftp获取返回数据
-// while (true){
-// try {
-// Thread.sleep(4000);
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
-// //调用ftp获取返回数据
-// result = Monitor.getFtpDataByUuidList(uuid);
-// //如果返回true,就退处
-// if (result.getCode() == 200) {
-// break;
-// }
-// else {
-// count++;
-// if (count == 20) {
-// break;
-// }
-// }
-// }
}
// if (null!=result){
@@ -1466,24 +1419,24 @@
// }
// //如果所有数据导入有一个异常
-// StringBuilder errorBuilder = new StringBuilder();
+ 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 (!agetStatus.get()){
+ String errorAccount = StringUtils.join(ageErrorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!身份证号码不正确,请核对!");
+ }
// if (!securityInvalidStatus.get()){
// String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
//// errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!");
// errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
// }
-// //抛出异常
-// if (errorBuilder.length()>0){
-// throw new ServiceException(errorBuilder.toString());
-// }
+ //抛出异常
+ if (errorBuilder.length()>0){
+ throw new ServiceException(errorBuilder.toString());
+ }
}
/**
--
Gitblit v1.9.3