From 9a063585a64af45e83c3dde35a01ff45f194fd76 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 12 十二月 2025 14:45:31 +0800
Subject: [PATCH] 小程序支流程修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 29 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 b6248cf..e5842c2 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
@@ -167,10 +167,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:add')")
@ApiOperation(value = "新增用户管理",response = SysUser.class)
@Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
- @PostMapping("/api/system/user/add")
- public R<String> add(@RequestBody String param)
+ @PostMapping("/system/user/add")
+ public R<String> add(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getUserName());
if (!userService.checkUserNameUnique(user))
{
@@ -182,8 +181,6 @@
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword("123456"));
- user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
- user.setUserIdentification(CodeGenerateUtils.generateVolumeSn());
userService.insertUser(user);
return R.ok();
}
@@ -199,10 +196,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
@ApiOperation(value = "修改用户管理")
@Log(title = "用户信息-修改用户", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/edit")
- public R edit(@RequestBody String param)
+ @PostMapping("/system/user/edit")
+ public R edit(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
user.setUserName(user.getPhonenumber());
// userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
@@ -219,7 +215,6 @@
if(StringUtils.isNotEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
}
- user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
return R.ok(userService.updateUser(user));
}
@@ -229,7 +224,7 @@
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
@ApiOperation(value = "修改用户签名")
@Log(title = "用户信息-修改用户签名", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/editSignPicture")
+ @PostMapping("/system/user/editSignPicture")
public R editSignPicture(@RequestBody String param)
{
Long userId = tokenService.getLoginUser().getUserId();
@@ -265,10 +260,9 @@
// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@ApiOperation(value = "重置密码")
@Log(title = "用户信息-重置密码", businessType = BusinessType.UPDATE)
- @PostMapping("/api/system/user/resetPwd")
- public AjaxResult resetPwd(@RequestBody String param)
+ @PostMapping("/system/user/resetPwd")
+ public AjaxResult resetPwd(@RequestBody SysUser user)
{
- SysUser user = JSON.parseObject(param,SysUser.class);
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -279,22 +273,26 @@
/**
* 状态修改
*/
-// @ApiOperation(value = "状态修改")
-// @Log(title = "用户信息-状态修改", businessType = BusinessType.UPDATE)
-// @PutMapping("/system/user/changeStatus")
-// public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
-// {
-// SysUser loginUser = tokenService.getLoginUser().getUser();
-// SysUser user = new SysUser();
-// user.setUserId(dto.getUserId());
-// user.setStatus(String.valueOf(dto.getStatus()));
-//// user.setRemark(dto.getRemark());
-// user.setUpdateBy(getUsername());
-// user.setDisableRemark(dto.getRemark());
-// user.setOperatingTime(LocalDateTime.now());
-// user.setOperatingPerson(loginUser.getNickName()+"("+loginUser.getUserName()+")");
-// return AjaxResult.success(userService.updateUserStatus(user));
-// }
+ @ApiOperation(value = "禁用")
+ @Log(title = "用户信息-禁用", businessType = BusinessType.UPDATE)
+ @PutMapping("/system/user/off")
+ public AjaxResult off(Long userId,String disableRemark)
+ {
+ SysUser user = userService.selectUserById(userId);
+ user.setDisableRemark(disableRemark);
+ user.setStatus("1");
+ return AjaxResult.success(userService.updateUser(user));
+ }
+ @ApiOperation(value = "启用")
+ @Log(title = "用户信息-启用", businessType = BusinessType.UPDATE)
+ @PutMapping("/system/user/on")
+ public AjaxResult on(Long userId)
+ {
+ SysUser user = userService.selectUserById(userId);
+ user.setStatus("0");
+ user.setDisableRemark(null);
+ return AjaxResult.success(userService.updateUser(user));
+ }
/**
* 根据用户编号获取授权角色
--
Gitblit v1.7.1