From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 20 五月 2025 16:57:11 +0800
Subject: [PATCH] 新增充电桩
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/UserController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 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 8a11520..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')")
@@ -86,7 +83,9 @@
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());
@@ -98,13 +97,15 @@
}
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("Internal Server Error");
+ 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("Save Success");
+ return R.ok("Save Success").add(user);
}
@PreAuthorize("hasAuthority('system:user:update')")
@@ -112,6 +113,9 @@
@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) {
@@ -148,7 +152,7 @@
}
}
- return R.ok("Update Success");
+ return R.ok("Update Success").add(user);
}
@PreAuthorize("hasAuthority('system:user:remove')")
@@ -160,11 +164,9 @@
if (!userService.removeById(userId)) {
throw new CoolException("Internal Server Error");
}
- if (!userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId))) {
- throw new CoolException("Internal Server Error");
- }
+ userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId));
}
- return R.ok("Delete Success");
+ return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('system:user:list')")
--
Gitblit v1.9.1