From cbccc558b50020901b586d82d94a76be07c48c38 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 11 二月 2025 15:34:11 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
index f4d6934..c9a21fd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
@@ -11,9 +11,9 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.system.controller.param.ResetPwdParam;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.entity.UserRole;
+import com.vincent.rsf.server.system.enums.StatusType;
import com.vincent.rsf.server.system.service.UserRoleService;
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -81,16 +81,21 @@
&& userService.count(new LambdaQueryWrapper<User>().eq(User::getPhone, user.getPhone())) > 0) {
return R.error("the phone already exist");
}
+ if (!Cools.isEmpty(user.getEmail())
+ && userService.count(new LambdaQueryWrapper<User>().eq(User::getEmail, user.getEmail())) > 0) {
+ return R.error("the email already exist");
+ }
if (Cools.isEmpty(user.getPassword())) {
user.setPassword(userService.encodePassword(COMMON_PASSWORD));
}
+ Date now = new Date();
user.setCreateBy(getLoginUserId());
- user.setCreateTime(new Date());
+ user.setCreateTime(now);
user.setUpdateBy(getLoginUserId());
- user.setUpdateTime(new Date());
-
+ user.setUpdateTime(now);
+ user.setStatus(StatusType.ENABLE.val);
if (!userService.save(user)) {
throw new CoolException("Internal Server Error");
}
@@ -129,6 +134,11 @@
.eq(User::getPhone, user.getPhone())
.ne(User::getId, user.getId())) > 0) {
return R.error("the phone already exist");
+ }
+ if (!Cools.isEmpty(user.getEmail()) && userService.count(new LambdaQueryWrapper<User>()
+ .eq(User::getEmail, user.getEmail())
+ .ne(User::getId, user.getId())) > 0) {
+ return R.error("the email already exist");
}
if (!Cools.isEmpty(user.getPassword())) {
@@ -186,27 +196,6 @@
@PostMapping("/user/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
ExcelUtil.build(ExcelUtil.create(userService.list(), User.class), response);
- }
-
- @PreAuthorize("hasAuthority('system:user:update')")
- @OperationLog("Reset Password")
- @PostMapping("/user/reset/pwd")
- public R resetPwd(@RequestBody ResetPwdParam param) {
- User user = userService.getById(param.getId());
- if (!Cools.isEmpty(param.getOldPwd())) {
- if (!userService.comparePassword(user.getPassword(), param.getOldPwd())) {
- return R.error("The old password is incorrect");
- }
- }
- if (!Cools.isEmpty(param.getPassword())) {
- user.setPassword(userService.encodePassword(param.getPassword()));
- }
- user.setUpdateBy(getLoginUserId());
- user.setUpdateTime(new Date());
- if (!userService.updateById(user)) {
- return R.error("Reset Fail");
- }
- return R.ok("Reset Success");
}
}
--
Gitblit v1.9.1