From 7d581f0f8c74beb999b4482bf2bbdc59e4d5846d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 May 2022 10:36:38 +0800
Subject: [PATCH] 保安员，用户新增，保安员查询姓名修改，账号修改为姓+身份证号码后4位
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 59109f9..e6bf922 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
@@ -1339,7 +1339,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());
@@ -1349,7 +1352,7 @@
user.setExaminationType("2");
//推送内网的数据
- User user0 = user;
+ User user0 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//生成随机数
String uuid = UUID.randomUUID().toString();
@@ -1475,8 +1478,9 @@
//取出后将 redis 删除
redisTemplate.delete(uuid);
//返回的user,需处理敏感数据
- User user1 = 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 +1596,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());
@@ -1602,7 +1609,7 @@
user.setExaminationType("2");
//推送内网的数据
- User user0 = user;
+ User user0 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//生成随机数
String uuid = UUID.randomUUID().toString();
@@ -1656,14 +1663,22 @@
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);
+ boolean update = this.updateById(user);
+ if (update){
+ //数据异步同步到群防群控
+ myAsyncService.updateUserByQfqk(user);
+ }
//加入更新集合
// updateList.add(user);
}
--
Gitblit v1.9.3