From 3ffd660f8ae78880695fcee78fb16565cf61576d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 09 May 2022 10:02:01 +0800
Subject: [PATCH] 模拟考试修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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 a3fb872..1b7e304 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -572,6 +572,41 @@
return R.data(200,null,"修改成功!");
}
+ /**
+ * 账号修改
+ * @param user
+ * @return
+ */
+ @PostMapping("/update_account")
+ public R updataAccount(@RequestBody User user){
+ boolean status = false;
+ //校验账户是否重复
+ User user1 = new User();
+ user1.setIsDeleted(0);
+ user1.setStatus(1);
+ user1.setAccount(user.getAccount());
+ List<User> list = userService.list(new QueryWrapper<>(user1));
+ if (list.size()>0){
+ throw new ServiceException("账号：["+user.getAccount()+"]已存在!");
+ }
+ //如果不重复，则进行修改操作
+ //更新用户账户信息
+ status = userService.updateById(user);
+ if (status){
+ System.out.println("user = " + user);
+ UserDTO userDTO = new UserDTO();
+ userDTO.setAccount(user.getAccount());
+ userDTO.setPassword(user.getPassword());
+ userDTO.setSecurityId(user.getId().toString());
+ userDTO.setPhone(user.getPhone());
+ userDTO.setAvatar(user.getAvatar());
+ //异步修改群防群控
+ myAsyncService.updateUserByAccount(userDTO);
+ }
+ //返回
+ return R.status(status);
+ }
+
/**
* 修改
@@ -1133,6 +1168,7 @@
@GetMapping("/security-apply-tree")
public R<List<TreeNode>> securityApplyTree(UserVO user) {
List<TreeNode> tree = userService.getSecurityApplyTree(user);
+ System.out.println("tree = " + tree);
return R.data(tree);
}
@@ -1389,7 +1425,8 @@
Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
user.setRoleId(oneRole.getId().toString());
user.setDispatch("1");
- user.setExaminationType("0");
+ //待审查
+ user.setExaminationType("2");
user.setAccount(user.getRealName());
user.setStatus(1);
@@ -1404,7 +1441,7 @@
// boolean status = userService.save(user);
- User user1 = user;
+ User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
//头像
if (null != user.getAvatar() && !user.getAvatar().equals("")) {
user1.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
@@ -1458,7 +1495,7 @@
//计数
count++;
//如果超过10s 没有读取到，则退出
- if (count == 10) {
+ if (count == 30) {
break;
}
}
@@ -1552,7 +1589,6 @@
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
+ ")";
- //FtpUtil.sqlFileUpload(s);
myAsyncService.FTP(s);
}
}
@@ -1595,7 +1631,6 @@
if (null != user1.getFingerprint() && !user1.getFingerprint().equals("")) {
//url 转base64
String base64Url = ImageUtils.imageUrlToBase64(user1.getFingerprint());
- System.out.println("base64Url = " + base64Url);
user1.setFingerprint(base64Url);
}
return R.data(user1);
--
Gitblit v1.9.3