From 074513acdfed38c8537a046801ee5dbc8f01e2eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 10:06:42 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index 2b137e7..c1dcd49 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -16,14 +16,13 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
public class UserController extends BaseController {
+
+ public static final String COMMON_PASSWORD = "123456";
@Autowired
private UserService userService;
@@ -34,6 +33,14 @@
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)));
+ }
+
+ @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));
}
@PreAuthorize("hasAuthority('system:user:list')")
@@ -52,6 +59,26 @@
@OperationLog("娣诲姞鐢ㄦ埛")
@PostMapping("/user/save")
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("鐧诲綍璐﹀彿宸插瓨鍦�");
+ }
+ if (!Cools.isEmpty(user.getNickname())
+ && userService.count(new LambdaQueryWrapper<User>().eq(User::getNickname, user.getNickname())) > 0) {
+ return R.error("鐢ㄦ埛鍚嶇О宸插瓨鍦�");
+ }
+ if (!Cools.isEmpty(user.getPhone())
+ && userService.count(new LambdaQueryWrapper<User>().eq(User::getPhone, user.getPhone())) > 0) {
+ return R.error("鎵嬫満鍙峰凡瀛樺湪");
+ }
+
+ user.setPassword(userService.encodePassword(COMMON_PASSWORD));
+
+ user.setCreateBy(getLoginUserId());
+ user.setCreateTime(new Date());
+ user.setUpdateBy(getLoginUserId());
+ user.setUpdateTime(new Date());
+
if (!userService.save(user)) {
return R.error("娣诲姞澶辫触");
}
@@ -62,6 +89,29 @@
@OperationLog("淇敼鐢ㄦ埛")
@PostMapping("/user/update")
public R update(@RequestBody User user) {
+ if (!Cools.isEmpty(user.getUsername()) && userService.count(new LambdaQueryWrapper<User>()
+ .eq(User::getUsername, user.getUsername())
+ .ne(User::getId, user.getId())) > 0) {
+ return R.error("鐧诲綍璐﹀彿宸插瓨鍦�");
+ }
+ if (!Cools.isEmpty(user.getNickname()) && userService.count(new LambdaQueryWrapper<User>()
+ .eq(User::getNickname, user.getNickname())
+ .ne(User::getId, user.getId())) > 0) {
+ return R.error("鐢ㄦ埛鍚嶇О宸插瓨鍦�");
+ }
+ if (!Cools.isEmpty(user.getPhone()) && userService.count(new LambdaQueryWrapper<User>()
+ .eq(User::getPhone, user.getPhone())
+ .ne(User::getId, user.getId())) > 0) {
+ return R.error("鎵嬫満鍙峰凡瀛樺湪");
+ }
+
+ if (!Cools.isEmpty(user.getPassword())) {
+ user.setPassword(userService.encodePassword(user.getPassword()));
+ }
+
+ user.setUpdateBy(getLoginUserId());
+ user.setUpdateTime(new Date());
+
if (!userService.updateById(user)) {
return R.error("淇敼澶辫触");
}
@@ -98,4 +148,19 @@
ExcelUtil.build(ExcelUtil.create(userService.list(), User.class), response);
}
+ @PreAuthorize("hasAuthority('system:user:update')")
+ @OperationLog("閲嶇疆瀵嗙爜")
+ @PostMapping("/user/reset/pwd")
+ public R resetPwd(@RequestBody User user) {
+ if (!Cools.isEmpty(user.getPassword())) {
+ user.setPassword(userService.encodePassword(user.getPassword()));
+ }
+ user.setUpdateBy(getLoginUserId());
+ user.setUpdateTime(new Date());
+ if (!userService.updateById(user)) {
+ return R.error("閲嶇疆澶辫触");
+ }
+ return R.ok("閲嶇疆鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1