From 4310c19a73f960dfd79c90cfe960cf564b068f72 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:03:35 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 1f5d80f..767d855 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -30,6 +30,7 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.config.FtpConfig;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.http.util.HttpUtil;
@@ -54,9 +55,11 @@
import org.springblade.modules.system.excel.UserImporters;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserRegisterStatisVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.vo.UsersVo;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springblade.modules.taskqd.vo.TaskqdVO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -498,6 +501,14 @@
//获取user
User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
+ //数据脱敏处理
+ user.setAccount(user.getRealName().substring(0,1)+user.getCardid().substring(user.getCardid().length()-4));
+ user.setCardid(DesensitizedUtil.desensitizedIdNumber(user.getCardid()));
+ user.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
+ user.setName(DesensitizedUtil.desensitizedName(user.getName()));
+ user.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
+
+
Integer userCount = userService.selectCount(user.getAccount());
if (userCount > 0 && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
@@ -539,23 +550,23 @@
@PostMapping("/securitySaves")
@Transactional(rollbackFor = Exception.class)
public R securitySaves(@RequestBody User user) {
- Integer userCount = userService.selectCount(user.getAccount());
- //判断用户是否存在
- if (userCount > 0) {
- throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
- }
- user.setRoleId("1372092102682521602");
+// Integer userCount = userService.selectCount(user.getAccount());
+// //判断用户是否存在
+// if (userCount > 0) {
+// throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+// }
+ user.setRoleId("1495714343888039937");
user.setDeptId("1424615972718895106");
+ user.setStype("1");
user.setId(null);
//用户新增
boolean status = userService.save(user);
-// System.out.println("user = " + user);
//返回
return R.status(status);
}
/**
- * 保安员新增(数据同步调用)
+ * 保安员修改(数据同步调用)
*/
@PostMapping("/updateBySecurtiy")
@Transactional(rollbackFor = Exception.class)
@@ -563,7 +574,8 @@
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setCardid(user.getCardid());
+// user1.setCardid(user.getCardid());
+ user1.setSecurityId(user.getSecurityId());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
@@ -589,17 +601,30 @@
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setCardid(user.getOldCardid());
+ user1.setSecurityId(user.getSecurityId());
+// user1.setCardid(user.getOldCardid());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
//修改
- one.setAccount(user.getCardid());
- one.setCardid(user.getCardid());
- one.setPassword(user.getPassword());
- one.setAvatar(user.getAvatar());
- one.setPhone(user.getPhone());
- one.setRealName(user.getRealName());
+ if (null!= one.getAccount()) {
+ one.setAccount(user.getAccount());
+ }
+ if (null!= one.getCardid()) {
+ one.setCardid(user.getCardid());
+ }
+ if (null!= one.getPassword()) {
+ one.setPassword(user.getPassword());
+ }
+ if (null!= one.getAvatar()) {
+ one.setAvatar(user.getAvatar());
+ }
+ if (null!= one.getPhone()) {
+ one.setPhone(user.getPhone());
+ }
+ if (null!= one.getRealName()) {
+ one.setRealName(user.getRealName());
+ }
one.setUpdateTime(new Date());
//用户修改
status = userService.updateById(one);
@@ -617,7 +642,8 @@
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setCardid(user.getCardid());
+ user1.setSecurityId(user.getSecurityId());
+// user1.setCardid(user.getCardid());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
@@ -629,5 +655,26 @@
//返回
return R.status(status);
}
-};
+
+ /**
+ * 人员统计
+ */
+ @GetMapping("/userCount")
+ public R cancelTask(String xid,String index) {
+ List<UserRegisterStatisVO> cout = userService.getUserTypeCountXq(xid);
+ List<UserVO> list = userService.getUserTypeList(xid,index);
+ Map<String,Object> res = new HashMap<>();
+ res.put("cout",cout);
+ res.put("list",list);
+ return R.data(res);
+ }
+
+ /**
+ * 首次登录发送祝贺信
+ */
+ @GetMapping("/firstLogin")
+ public R firstLogin(String id) {
+ return R.status(userService.firstLogin(id));
+ }
+}
--
Gitblit v1.9.3