From adcff04c70567f4b1e74ec2c8dcecbb5164f94ec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Sep 2022 09:43:35 +0800
Subject: [PATCH] 1、增加轮播图维护 2、修复队伍接口报错
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 93 insertions(+), 17 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 75dccea..3c41a72 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;
@@ -500,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()));
@@ -541,11 +550,11 @@
@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()));
- }
+// 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");
@@ -557,7 +566,7 @@
}
/**
- * 保安员新增(数据同步调用)
+ * 保安员修改(数据同步调用)
*/
@PostMapping("/updateBySecurtiy")
@Transactional(rollbackFor = Exception.class)
@@ -565,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){
@@ -591,20 +601,63 @@
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!= user.getAccount()) {
+ one.setAccount(user.getAccount());
+ }
+ if (null!= user.getCardid()) {
+ one.setCardid(user.getCardid());
+ }
+ if (null!= user.getPassword()) {
+ one.setPassword(user.getPassword());
+ }
+ if (null!= user.getPhone()) {
+ one.setPhone(user.getPhone());
+ }
+ if (null!= user.getRealName()) {
+ one.setRealName(user.getRealName());
+ }
one.setUpdateTime(new Date());
//用户修改
status = userService.updateById(one);
+ }else {
+ User user2 = new User();
+ //如果没有，则插入一条
+ if (null!= user.getAccount()) {
+ user2.setAccount(user.getAccount());
+ }
+ if (null!= user.getCardid()) {
+ user2.setCardid(user.getCardid());
+ }
+ if (null!= user.getPassword()) {
+ user2.setPassword(user.getPassword());
+ }
+ if (null!= user.getPhone()) {
+ user2.setPhone(user.getPhone());
+ }
+ if (null!= user.getRealName()) {
+ user2.setRealName(user.getRealName());
+ }
+ if (null!= user.getSex()) {
+ user2.setSex(user.getSex());
+ }
+ user2.setStatus(1);
+ user2.setIsDeleted(0);
+ user2.setRoleId("1495714343888039937");
+ user2.setDeptId("1424615972718895106");
+ user2.setStype("1");
+ user2.setTenantId("000000");
+ user2.setCreateTime(new Date());
+ user2.setUpdateTime(new Date());
+ user2.setSecurityId(user.getSecurityId());
+ user2.setId(null);
+ //新增
+ status = userService.save(user2);
}
//返回
return R.status(status);
@@ -616,17 +669,19 @@
@PostMapping("/removeSecurity")
@Transactional(rollbackFor = Exception.class)
public R removeSecurity(@RequestBody User user) {
+ System.out.println("保安员开始删除 = " + user);
User user1 = new User();
user1.setIsDeleted(0);
user1.setStatus(1);
- user1.setCardid(user.getCardid());
+ user1.setSecurityId(user.getId().toString());
+// user1.setCardid(user.getCardid());
User one = userService.getOne(Condition.getQueryWrapper(user1));
boolean status = false;
if (null!=one){
- //修改
- one.setIsDeleted(1);
+ System.out.println("查询到保安员 = " + one);
//用户修改
status = userService.removeById(one.getId());
+ System.out.println("保安员删除状态： = " + status);
}
//返回
return R.status(status);
@@ -645,6 +700,27 @@
return R.data(res);
}
+ /**
+ * 首次登录发送祝贺信
+ */
+ @GetMapping("/firstLogin")
+ public R firstLogin(String id) {
+ return R.status(userService.firstLogin(id));
+ }
+
+ /**
+ * 清除无效编号
+ */
+ @GetMapping("/clearPaper")
+ public void clearPaper() {
+ //修改符合条件的用户信息
+ String s0 ="update blade_user set securitynumber = '',hold = '2' where securitynumber like concat('%','赣洪2022','%') and right(securitynumber,5) >2000";
+ FtpUtil.sqlFileClear(s0);
+
+ //修改符合条件的编号信息
+ String s1 ="delete from sys_security_paper where number like concat('%','赣洪2022','%') and right(number,5) >2000";
+ FtpUtil.sqlFileClear(s1);
+ }
}
--
Gitblit v1.9.3