From ad2e1ca53b3957017f9c6428ce2bf49bfa7ac169 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Jun 2022 14:30:31 +0800
Subject: [PATCH] 保安员新增逻辑修改，保安员内网已新增，外网么有的时候，如果是更新的状态，则查询外网是否存在该用户，如果不存在则新增，存在则更新
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 24 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 aeb9001..f505f0e 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
@@ -1302,8 +1302,6 @@
agetStatus.set(false);
ageErrorList.add(user.getCardid());
// throw new ServiceException("导入失败!身份证号码[ "+user.getCardid()+" ]不正确,请核对!");
- //forEach 只能使用 return 跳出本次循环
-// return;
continue;
}
}
@@ -1314,10 +1312,10 @@
user.setStatus(1);
user.setIsDeleted(0);
//分配保安角色
- 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("1412226235153731586");
if (null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
user.setHold("1");
@@ -1339,7 +1337,10 @@
}
//设置账号
- user.setAccount(user.getRealName());
+ 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)));
user.setCreateTime(new Date());
@@ -1376,7 +1377,7 @@
//调用ftp获取返回数据
while (true){
try {
- Thread.sleep(1000);
+ Thread.sleep(3000);
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -1386,12 +1387,12 @@
if (result.getCode() == 200) {
break;
}
-// else {
-// count++;
-// if (count == 60) {
-// break;
-// }
-// }
+ else {
+ count++;
+ if (count == 60) {
+ break;
+ }
+ }
}
}
@@ -1409,14 +1410,35 @@
User user = handlerUserInfo(uuid);
if (result1.getCode()==200){
user.setId(result1.getUserId());
- this.save(user);
+ boolean save = this.save(user);
+ //同步用户数据到群防群控
+ if (save) {
+ myAsyncService.qfqkUserSave(user);
+ }
//加入新增集合
// addList.add(user);
}
if (result1.getCode()==201){
- user.setId(result1.getUserId());
- user.setCreateTime(null);
- this.updateById(user);
+ //先查询当前库是否有改用户？
+ User user1 = this.getById(result1.getUserId());
+ if (null!=user1) {
+ //存在，更新
+ user.setId(result1.getUserId());
+ user.setCreateTime(null);
+ boolean update = this.updateById(user);
+ if (update) {
+ //数据异步同步到群防群控
+ myAsyncService.updateUserByQfqk(user);
+ }
+ }else {
+ //不存在，则新增
+ user.setId(result1.getUserId());
+ boolean save = this.save(user);
+ if (save){
+ //数据异步同步到群防群控
+ myAsyncService.qfqkUserSave(user);
+ }
+ }
//加入更新集合
// updateList.add(user);
}
@@ -1477,6 +1499,7 @@
//返回的user,需处理敏感数据
User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//敏感数据处理
+ user1.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
user1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(user.getCardid()));
user1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
user1.setRegistered(DesensitizedUtil.desensitizedAddress(user.getRegistered()));
@@ -1592,7 +1615,10 @@
}
//设置账号
- user.setAccount(user.getRealName());
+ 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)));
user.setCreateTime(new Date());
@@ -1629,7 +1655,7 @@
//调用ftp获取返回数据
while (true){
try {
- Thread.sleep(1000);
+ Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -1656,14 +1682,36 @@
User user = handlerUserInfo(uuid);
if (result1.getCode()==200){
user.setId(result1.getUserId());
- this.save(user);
+ boolean save = this.save(user);
+ if (save){
+ //数据异步同步到群防群控
+ myAsyncService.qfqkUserSave(user);
+ }
//加入新增集合
// addList.add(user);
}
+ //更新
if (result1.getCode()==201){
- user.setId(result1.getUserId());
- user.setCreateTime(null);
- this.updateById(user);
+ //先查询当前库是否有改用户？
+ User user1 = this.getById(result1.getUserId());
+ if (null!=user1) {
+ //存在，更新
+ user.setId(result1.getUserId());
+ user.setCreateTime(null);
+ boolean update = this.updateById(user);
+ if (update) {
+ //数据异步同步到群防群控
+ myAsyncService.updateUserByQfqk(user);
+ }
+ }else {
+ //不存在，则新增
+ user.setId(result1.getUserId());
+ boolean save = this.save(user);
+ if (save){
+ //数据异步同步到群防群控
+ myAsyncService.qfqkUserSave(user);
+ }
+ }
//加入更新集合
// updateList.add(user);
}
--
Gitblit v1.9.3