From 7d3040d4c742af5e13f7327e7397a0524c1ffdec Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 二月 2024 16:06:31 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 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 aad06d8..2d39a81 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')")
@@ -49,9 +56,17 @@
}
@PreAuthorize("hasAuthority('system:user:save')")
- @OperationLog("娣诲姞User")
+ @OperationLog("娣诲姞鐢ㄦ埛")
@PostMapping("/user/save")
public R save(@RequestBody User user) {
+
+ 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("娣诲姞澶辫触");
}
@@ -59,9 +74,17 @@
}
@PreAuthorize("hasAuthority('system:user:update')")
- @OperationLog("淇敼User")
+ @OperationLog("淇敼鐢ㄦ埛")
@PostMapping("/user/update")
public R update(@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("淇敼澶辫触");
}
@@ -69,7 +92,7 @@
}
@PreAuthorize("hasAuthority('system:user:remove')")
- @OperationLog("鍒犻櫎User")
+ @OperationLog("鍒犻櫎鐢ㄦ埛")
@PostMapping("/user/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (!userService.removeByIds(Arrays.asList(ids))) {
@@ -98,4 +121,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