From 7870a37ab0ab0fdc09ba91b1ac209c91a18c0bc8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 25 Sep 2021 19:28:12 +0800
Subject: [PATCH] 用户注册校验修改，用户curd 修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 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 a23e03b..48e5973 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -64,6 +64,7 @@
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
@@ -71,10 +72,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
@@ -231,6 +229,8 @@
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+ User user1 = userService.getById(user.getId());
+ user.setPassword(user1.getPassword());
userService.updateById(user);
Date birthday1 = user.getBirthday();
String birthday;
@@ -285,6 +285,12 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R remove(@RequestParam String ids) {
CacheUtil.clear(USER_CACHE);
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "update blade_user set is_deleted = 1 where id = " + "'" + id + "'";
+ FtpUtil.sqlFileUpload(s1);
+ });
return R.status(userService.removeUser(ids));
}
@@ -565,6 +571,7 @@
* 保安员新增
*/
@PostMapping("/securitySave")
+ @Transactional(rollbackFor = Exception.class)
public R securitySave(@Valid @RequestBody Map<String, Object> userMap) {
//获取user
User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
@@ -578,6 +585,7 @@
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
user.setRoleId(oneRole.getId().toString());
user.setDispatch("1");
+ user.setExaminationType("0");
Integer userCount = userService.selectCount(user.getAccount());
if (userCount > 0 && Func.isEmpty(user.getId())) {
@@ -614,26 +622,19 @@
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
}
- String urla = "";
- String[] split = user.getAvatar().split(",");
- for (int i = 0; i < split.length; i++) {
- String s = split[i].substring(26, split[i].length());
- urla += FtpConfig.ip + s + ",";
- }
- String substring = urla.substring(0, urla.length() - 1);
- user.setAvatar(substring);
- String urlf = "";
- String[] splits = user.getFingerprint().split(",");
- for (int i = 0; i < splits.length; i++) {
- String s = splits[i].substring(26, splits[i].length());
- urlf += FtpConfig.ip + s + ",";
+ //头像
+ if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
+ user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
}
- String substrings = urla.substring(0, urlf.length() - 1);
- user.setFingerprint(substrings);
+
+ //指纹
+ if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
+ user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
+ }
String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,status,is_deleted,dispatch) " +
+ "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
"values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
"'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
"'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
@@ -648,9 +649,11 @@
+ "," + "'" + user.getHeight() + "'" +
"," + "'" + user.getAddress() + "'" +
"," + "'" + user.getRegistered() + "'" + "," +
- "'" + rtime + "'" + "," + "'" + user.getSecuritynumber() + "'" +
+ "'" + rtime + "'" +
+ "," + "'" + user.getSecuritynumber() + "'" +
"," + "'" + user.getHold() + "'" +
"," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getExaminationType() + "'" +
"," + "'" + user.getStatus() + "'" +
"," + "'" + user.getIsDeleted() + "'" +
"," + "'" + user.getDispatch() + "'" + ")";
--
Gitblit v1.9.3