From bb28c2f09f7fa36b8b80f9d19f23631623b80d1c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 01 三月 2025 16:59:46 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java | 421 ++++++++++++++++++++++++++--------------------------
1 files changed, 213 insertions(+), 208 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java
index 3ab59ae..9de8dc1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java
@@ -1,208 +1,213 @@
-package com.zy.asrs.wms.system.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.wms.common.annotation.OperationLog;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.common.domain.KeyValVo;
-import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.system.controller.param.ResetPwdParam;
-import com.zy.asrs.wms.system.entity.User;
-import com.zy.asrs.wms.system.entity.UserRole;
-import com.zy.asrs.wms.system.service.UserRoleService;
-import com.zy.asrs.wms.system.service.UserService;
-import com.zy.asrs.wms.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.Date;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@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, 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')")
- @PostMapping("/user/list")
- public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(userService.list());
- }
-
- @PreAuthorize("hasAuthority('system:user:list')")
- @GetMapping("/user/{id}")
- public R get(@PathVariable("id") Long id) {
- return R.ok().add(userService.getById(id));
- }
-
- @PreAuthorize("hasAuthority('system:user:save')")
- @OperationLog("娣诲姞鐢ㄦ埛")
- @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("鐧诲綍璐﹀彿宸插瓨鍦�");
- }
- 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 (!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) {
- 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("鍒犻櫎鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('system:user:list')")
- @PostMapping("/user/query")
- public R query(@RequestParam(required = false) String condition) {
- List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(User::getNickname, condition);
- }
- userService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getNickname()))
- );
- return R.ok().add(vos);
- }
-
- @PreAuthorize("hasAuthority('system:user:list')")
- @PostMapping("/user/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- 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("閲嶇疆鎴愬姛");
- }
-
-}
+package com.zy.asrs.wms.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.wms.common.annotation.CacheData;
+import com.zy.asrs.wms.common.annotation.OperationLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.KeyValVo;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.system.controller.param.ResetPwdParam;
+import com.zy.asrs.wms.system.entity.User;
+import com.zy.asrs.wms.system.entity.UserRole;
+import com.zy.asrs.wms.system.service.UserRoleService;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.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.Date;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@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")
+ @CacheData(tableName = {"sys_user"})
+ 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")
+ @CacheData(tableName = {"sys_user"})
+ 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')")
+ @PostMapping("/user/list")
+ @CacheData(tableName = {"sys_user"})
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(userService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @GetMapping("/user/{id}")
+ @CacheData(tableName = {"sys_user"})
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(userService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:user:save')")
+ @OperationLog("娣诲姞鐢ㄦ埛")
+ @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("鐧诲綍璐﹀彿宸插瓨鍦�");
+ }
+ 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 (!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) {
+ 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("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @PostMapping("/user/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(User::getNickname, condition);
+ }
+ userService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getNickname()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:user:list')")
+ @PostMapping("/user/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ 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