From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 123 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 8 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..8e5b456 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
@@ -4,20 +4,25 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.system.controller.param.ResetPwdParam;
import com.zy.asrs.wcs.system.entity.User;
+import com.zy.asrs.wcs.system.entity.UserRole;
+import com.zy.asrs.wcs.system.service.UserRoleService;
import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -25,15 +30,27 @@
@RequestMapping("/api")
public class UserController extends BaseController {
+ public static final String COMMON_PASSWORD = "123456";
+
@Autowired
private UserService userService;
+ @Autowired
+ private UserRoleService userRoleService;
@PreAuthorize("hasAuthority('system:user:list')")
@PostMapping("/user/page")
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)));
+ 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));
}
@PreAuthorize("hasAuthority('system:user:list')")
@@ -51,29 +68,98 @@
@PreAuthorize("hasAuthority('system:user:save')")
@OperationLog("娣诲姞鐢ㄦ埛")
@PostMapping("/user/save")
+ @Transactional
public R save(@RequestBody User user) {
- if (!userService.save(user)) {
- return R.error("娣诲姞澶辫触");
+ 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)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+
+ 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ }
+
return R.ok("娣诲姞鎴愬姛");
}
@PreAuthorize("hasAuthority('system:user:update')")
@OperationLog("淇敼鐢ㄦ埛")
@PostMapping("/user/update")
+ @Transactional
public R update(@RequestBody User user) {
- if (!userService.updateById(user)) {
- return R.error("淇敼澶辫触");
+ 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)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+
+ 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ }
+ }
+
return R.ok("淇敼鎴愬姛");
}
@PreAuthorize("hasAuthority('system:user:remove')")
@OperationLog("鍒犻櫎鐢ㄦ埛")
@PostMapping("/user/remove/{ids}")
+ @Transactional
public R remove(@PathVariable Long[] ids) {
- if (!userService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
+ for (Long userId : ids) {
+ if (!userService.removeById(userId)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ if (!userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId))) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
}
return R.ok("鍒犻櫎鎴愬姛");
}
@@ -98,4 +184,25 @@
ExcelUtil.build(ExcelUtil.create(userService.list(), User.class), response);
}
+ @PreAuthorize("hasAuthority('system:user:update')")
+ @OperationLog("閲嶇疆瀵嗙爜")
+ @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("褰撳墠瀵嗙爜閿欒");
+ }
+ }
+ 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("閲嶇疆澶辫触");
+ }
+ return R.ok("閲嶇疆鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1