From 6f3e48f79f04989735054ef9903d86a74eae795b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 十二月 2024 10:17:12 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 64 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 5a1354f..38d45e0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -13,6 +13,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SysUserUpdateStatusDTO;
+import com.ruoyi.system.dto.UpdatePwdDTO;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.SysUserVO;
@@ -22,6 +23,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -55,7 +57,7 @@
*/
@ApiOperation(value = "获取用户列表")
@PostMapping("/list")
- public AjaxResult list(@RequestBody SysUserQuery query)
+ public AjaxResult<PageInfo<SysUserVO>> list(@RequestBody SysUserQuery query)
{
PageInfo<SysUserVO> list = userService.pageList(query);
return AjaxResult.success(list);
@@ -63,7 +65,7 @@
@ApiOperation(value = "获取用户列表-不分页")
@PostMapping("/listNotPage")
- public AjaxResult listNotPage()
+ public AjaxResult<List<SysUser>> listNotPage()
{
List<SysUser> list = userService.selectList();
return AjaxResult.success(list);
@@ -86,7 +88,7 @@
*/
@ApiOperation(value = "获取用户详情")
@GetMapping("/getDetail")
- public AjaxResult getDetail(@RequestParam Long userId)
+ public AjaxResult<SysUser> getDetail(@RequestParam Long userId)
{
SysUser sysUser = userService.selectUserById(userId);
SysUserVO sysUserVO = new SysUserVO();
@@ -101,7 +103,7 @@
*/
@ApiOperation(value = "获取用户数量统计")
@PostMapping("/getUserCount")
- public AjaxResult getUserCount()
+ public AjaxResult<Map<String,Integer>> getUserCount()
{
Map<String,Integer> map = new HashMap<>();
@@ -119,17 +121,17 @@
/**
* 移除黑名单
*/
- @GetMapping("/removeBlackList")
- public AjaxResult removeBlackList(@RequestParam String ids)
- {
- String[] split = ids.split(",");
- List<Long> id = new ArrayList<>();
- for (String s : split) {
- id.add(Long.valueOf(s));
- }
- userService.updateUserIfBlack(id);
- return AjaxResult.success();
- }
+// @GetMapping("/removeBlackList")
+// public AjaxResult<String> removeBlackList(@RequestParam String ids)
+// {
+// String[] split = ids.split(",");
+// List<Long> id = new ArrayList<>();
+// for (String s : split) {
+// id.add(Long.valueOf(s));
+// }
+// userService.updateUserIfBlack(id);
+// return AjaxResult.success();
+// }
// @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@@ -180,6 +182,7 @@
return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
}
user.setPassword("123456");
+ user.setRePassword("123456");
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
userService.insertUser(user);
@@ -195,7 +198,6 @@
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysUser user)
{
- user.setUserName(user.getPhonenumber());
// userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
if (!userService.checkUserNameUnique(user))
@@ -208,7 +210,7 @@
}
user.setUpdateBy(getUsername());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+// user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return AjaxResult.success(userService.updateUser(user));
}
@@ -246,6 +248,34 @@
// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
+ userService.resetPwd(user);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 修改密码
+ */
+ // @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+ @ApiOperation(value = "修改密码")
+ @Log(title = "用户信息-修改密码", businessType = BusinessType.UPDATE)
+ @PostMapping("/updatePwd")
+ public AjaxResult updatePwd(@RequestBody UpdatePwdDTO dto)
+ {
+ SysUser user = userService.selectUserByUserName(dto.getAccount());
+ if(Objects.isNull(user)){
+ return AjaxResult.error("未查询到该账号");
+ }
+ userService.checkUserAllowed(user);
+ // 校验密码跟原密码是否匹配
+ if (!SecurityUtils.matchesPassword(dto.getOldPassword(), user.getPassword())) {
+ throw new BadCredentialsException("输入原密码不正确");
+ }
+ if (!dto.getPassword().equals(dto.getConfirmPassword())) {
+ throw new BadCredentialsException("两次输入密码不一致");
+ }
+// userService.checkUserDataScope(user.getUserId());
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setUpdateBy(getUsername());
return AjaxResult.success(userService.resetPwd(user));
}
--
Gitblit v1.7.1