From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java | 74 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
index 468002c..2a49134 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java
@@ -6,6 +6,7 @@
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.system.controller.param.ResetPwdParam;
import com.zy.acs.manager.system.entity.User;
@@ -39,15 +40,11 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
- return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true, wrapper -> wrapper.orderByAsc("create_time"))));
- }
-
- @PreAuthorize("hasAuthority('system:user:list')")
- @PostMapping("/user/page1")
- public R page1(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
- return R.ok().add(userService.pageRel(pageParam));
+ PageResult<User> pageResult = userService.pageRel(pageParam);
+ for (User record : pageResult.getRecords()) {
+ record.setRoles(userRoleService.listByUserId(record.getId()));
+ }
+ return R.ok().add(pageResult);
}
@PreAuthorize("hasAuthority('system:user:list')")
@@ -69,24 +66,26 @@
}
@PreAuthorize("hasAuthority('system:user:save')")
- @OperationLog("娣诲姞鐢ㄦ埛")
+ @OperationLog("Save User")
@PostMapping("/user/save")
@Transactional
public R save(@RequestBody User user) {
if (!Cools.isEmpty(user.getUsername())
&& userService.count(new LambdaQueryWrapper<User>().eq(User::getUsername, user.getUsername())) > 0) {
- return R.error("鐧诲綍璐﹀彿宸插瓨鍦�");
+ return R.error("the username already exist");
}
if (!Cools.isEmpty(user.getNickname())
&& userService.count(new LambdaQueryWrapper<User>().eq(User::getNickname, user.getNickname())) > 0) {
- return R.error("鐢ㄦ埛鍚嶇О宸插瓨鍦�");
+ return R.error("the nickname already exist");
}
if (!Cools.isEmpty(user.getPhone())
&& userService.count(new LambdaQueryWrapper<User>().eq(User::getPhone, user.getPhone())) > 0) {
- return R.error("鎵嬫満鍙峰凡瀛樺湪");
+ return R.error("the phone already exist");
}
- user.setPassword(userService.encodePassword(COMMON_PASSWORD));
+ if (Cools.isEmpty(user.getPassword())) {
+ user.setPassword(userService.encodePassword(COMMON_PASSWORD));
+ }
user.setCreateBy(getLoginUserId());
user.setCreateTime(new Date());
@@ -94,38 +93,43 @@
user.setUpdateTime(new Date());
if (!userService.save(user)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("Internal Server Error");
}
userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
- for (Long roleId : user.getRoleIds()) {
- if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ if (!Cools.isEmpty((Object) user.getRoleIds())) {
+ for (Long roleId : user.getRoleIds()) {
+ if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
+ throw new CoolException("Internal Server Error");
+ }
}
}
- return R.ok("娣诲姞鎴愬姛");
+ return R.ok("Save Success").add(user);
}
@PreAuthorize("hasAuthority('system:user:update')")
- @OperationLog("淇敼鐢ㄦ埛")
+ @OperationLog("Update User")
@PostMapping("/user/update")
@Transactional
public R update(@RequestBody User user) {
+ if (user.getPassword() != null && user.getPassword().equals("")) {
+ user.setPassword(null);
+ }
if (!Cools.isEmpty(user.getUsername()) && userService.count(new LambdaQueryWrapper<User>()
.eq(User::getUsername, user.getUsername())
.ne(User::getId, user.getId())) > 0) {
- return R.error("鐧诲綍璐﹀彿宸插瓨鍦�");
+ return R.error("the username already exist");
}
if (!Cools.isEmpty(user.getNickname()) && userService.count(new LambdaQueryWrapper<User>()
.eq(User::getNickname, user.getNickname())
.ne(User::getId, user.getId())) > 0) {
- return R.error("鐢ㄦ埛鍚嶇О宸插瓨鍦�");
+ return R.error("the nickname already exist");
}
if (!Cools.isEmpty(user.getPhone()) && userService.count(new LambdaQueryWrapper<User>()
.eq(User::getPhone, user.getPhone())
.ne(User::getId, user.getId())) > 0) {
- return R.error("鎵嬫満鍙峰凡瀛樺湪");
+ return R.error("the phone already exist");
}
if (!Cools.isEmpty(user.getPassword())) {
@@ -136,35 +140,33 @@
user.setUpdateTime(new Date());
if (!userService.updateById(user)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("Internal Server Error");
}
if (user.getRoleIds() != null && user.getRoleIds().length > 0) {
userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
for (Long roleId : user.getRoleIds()) {
if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("Internal Server Error");
}
}
}
- return R.ok("淇敼鎴愬姛");
+ return R.ok("Update Success").add(user);
}
@PreAuthorize("hasAuthority('system:user:remove')")
- @OperationLog("鍒犻櫎鐢ㄦ埛")
+ @OperationLog("Remove User")
@PostMapping("/user/remove/{ids}")
@Transactional
public R remove(@PathVariable Long[] ids) {
for (Long userId : ids) {
if (!userService.removeById(userId)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ throw new CoolException("Internal Server Error");
}
- if (!userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId))) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
- }
+ userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId));
}
- return R.ok("鍒犻櫎鎴愬姛");
+ return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('system:user:list')")
@@ -188,13 +190,13 @@
}
@PreAuthorize("hasAuthority('system:user:update')")
- @OperationLog("閲嶇疆瀵嗙爜")
+ @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("褰撳墠瀵嗙爜閿欒");
+ return R.error("The old password is incorrect");
}
}
if (!Cools.isEmpty(param.getPassword())) {
@@ -203,9 +205,9 @@
user.setUpdateBy(getLoginUserId());
user.setUpdateTime(new Date());
if (!userService.updateById(user)) {
- return R.error("閲嶇疆澶辫触");
+ return R.error("Reset Fail");
}
- return R.ok("閲嶇疆鎴愬姛");
+ return R.ok("Reset Success");
}
}
--
Gitblit v1.9.1