refactor(user): 调整用户昵称与登录名字段使用逻辑- 将用户昵称字段从 nickName 更改为 userName

- 将登录账号字段从 userName 更改为 loginName
- 更新了用户信息展示和表单输入相关组件
- 调整了状态管理和数据获取逻辑以匹配新的字段命名
- 修正了个人信息页面的字段绑定和校验规则
- 更新了角色授权相关页面的用户信息显示字段- 后端接口同步调整用户字段处理逻辑

oms_web/oms_vue/src/api/system/user.js

@@ -65,7 +65,10 @@ export function changeUserStatus(userId, status) {
   }
   return request({
     url: '/system/user/changeStatus',
-    method: 'put',
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
     data: data
   })
 }

oms_web/oms_vue/src/layout/components/Navbar.vue

@@ -28,7 +28,7 @@
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
-          <span class="user-nickname"> {{ nickName }} </span>
+          <span class="user-nickname"> {{ userName }} </span>
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/user/profile">
@@ -74,7 +74,7 @@ export default {
       'sidebar',
       'avatar',
       'device',
-      'nickName'
+      'userName'
     ]),
     setting: {
       get() {

oms_web/oms_vue/src/store/getters.js

@@ -9,7 +9,7 @@ const getters = {
   avatar: state => state.user.avatar,
   id: state => state.user.id,
   name: state => state.user.name,
-  nickName: state => state.user.nickName,
+  userName: state => state.user.userName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,

oms_web/oms_vue/src/store/modules/user.js

@@ -8,7 +8,7 @@ const user = {
   state: {
     id: '',
     name: '',
-    nickName: '',
+    userName: '',
     avatar: '',
     roles: [],
     permissions: []
@@ -21,8 +21,8 @@ const user = {
     SET_NAME: (state, name) => {
       state.name = name
     },
-    SET_NICK_NAME: (state, nickName) => {
+    SET_NICK_NAME: (state, userName) => {
-      state.nickName = nickName
+      state.userName = userName
     },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
@@ -69,8 +69,8 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_ID', user.userId)
-          commit('SET_NAME', user.userName)
+          commit('SET_NAME', user.loginName)
-          commit('SET_NICK_NAME', user.nickName)
+          commit('SET_NICK_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           /* 初始密码提示 */
           if(data.isDefaultModifyPwd) {

oms_web/oms_vue/src/views/system/role/authUser.vue

@@ -61,8 +61,8 @@
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户名称" prop="loginName" :show-overflow-tooltip="true" />
-      <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+      <el-table-column label="用户昵称" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
       <el-table-column label="状态" align="center" prop="status">

oms_web/oms_vue/src/views/system/role/selectUser.vue

@@ -26,8 +26,8 @@
     <el-row>
       <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户名称" prop="loginName" :show-overflow-tooltip="true" />
-        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户昵称" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">

oms_web/oms_vue/src/views/system/user/authRole.vue

@@ -4,13 +4,13 @@
     <el-form ref="form" :model="form" label-width="80px">
       <el-row>
         <el-col :span="8" :offset="2">
-          <el-form-item label="用户昵称" prop="nickName">
+          <el-form-item label="用户昵称" prop="userName">
-            <el-input v-model="form.nickName" disabled />
+            <el-input v-model="form.userName" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="2">
-          <el-form-item label="登录账号" prop="userName">
+          <el-form-item label="登录账号" prop="loginName">
-            <el-input v-model="form.userName" disabled />
+            <el-input v-model="form.loginName" disabled />
           </el-form-item>
         </el-col>
       </el-row>

oms_web/oms_vue/src/views/system/user/index.vue

@@ -59,8 +59,8 @@
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户名称" align="center" key="loginName" prop="loginName" v-if="columns.loginName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户昵称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
               <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
@@ -99,8 +99,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
+            <el-form-item label="用户名称" prop="userName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -123,8 +123,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="loginName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              <el-input v-model="form.loginName" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -279,8 +279,8 @@ export default {
       // 列信息
       columns: {
         userId: { label: '用户编号', visible: true },
-        userName: { label: '用户名称', visible: true },
+        loginName: { label: '用户名称', visible: true },
-        nickName: { label: '用户昵称', visible: true },
+        userName: { label: '用户昵称', visible: true },
         deptName: { label: '部门', visible: true },
         phonenumber: { label: '手机号码', visible: true },
         status: { label: '状态', visible: true },
@@ -288,11 +288,11 @@ export default {
       },
       // 表单校验
       rules: {
-        userName: [
+        loginName: [
           { required: true, message: "用户名称不能为空", trigger: "blur" },
           { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
-        nickName: [
+        userName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
         password: [
@@ -392,7 +392,7 @@ export default {
         userId: undefined,
         deptId: undefined,
         userName: undefined,
-        nickName: undefined,
+        loginName: undefined,
         password: undefined,
         phonenumber: undefined,
         email: undefined,

oms_web/oms_vue/src/views/system/user/profile/userInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="nickName">
+    <el-form-item label="用户昵称" prop="userName">
-      <el-input v-model="form.nickName" maxlength="30" />
+      <el-input v-model="form.userName" maxlength="30" />
     </el-form-item>
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="form.phonenumber" maxlength="11" />
@@ -36,7 +36,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        nickName: [
+        userName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
         email: [
@@ -62,7 +62,7 @@ export default {
     user: {
       handler(user) {
         if (user) {
-          this.form = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex }
+          this.form = { userName: user.userName, phonenumber: user.phonenumber, email: user.email, sex: user.sex }
         }
       },
       immediate: true

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,11 +1,15 @@
 package com.ruoyi.web.controller.system;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.lang.Dict;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.mail.TemplateMailUtil;
+import com.ruoyi.system.domain.SysPost;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +19,10 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
@@ -65,6 +72,9 @@ public class SysUserController extends BaseController
     @Autowired
     private SysPasswordService passwordService;
 
+    @Autowired
+    private RuoYiConfig ruoYiConfig;
+
     @RequiresPermissions("system:user:view")
     @GetMapping()
     public String user()
@@ -223,6 +233,7 @@ public class SysUserController extends BaseController
         return prefix + "/resetPwd";
     }
 
+    // TODO: The frontend expects a PUT request to '/resetPwd' with a JSON body. This endpoint uses POST and takes form data.
     @RequiresPermissions("system:user:resetPwd")
     @Log(title = "重置密码", businessType = BusinessType.UPDATE)
     @PostMapping("/resetPwd")
@@ -253,6 +264,7 @@ public class SysUserController extends BaseController
     /**
      * 进入授权角色页
      */
+    // TODO: The frontend expects a GET request to this URL that returns JSON data (user and roles), not a view name.
     @RequiresPermissions("system:user:edit")
     @GetMapping("/authRole/{userId}")
     public String authRole(@PathVariable("userId") Long userId, ModelMap mmap)
@@ -268,6 +280,7 @@ public class SysUserController extends BaseController
     /**
      * 用户授权角色
      */
+    // TODO: The frontend expects a PUT request to '/system/user/authRole'. This endpoint is at '/authRole/insertAuthRole' and uses POST.
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PostMapping("/authRole/insertAuthRole")
@@ -281,6 +294,7 @@ public class SysUserController extends BaseController
         return success();
     }
 
+    // TODO: The frontend expects a DELETE request to '/system/user/{userIds}'. This endpoint is at '/remove' and uses POST.
     @RequiresPermissions("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
@@ -374,11 +388,30 @@ public class SysUserController extends BaseController
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
-    @RequiresPermissions("system:user:list")
+
-    @GetMapping("/{userId}")
+    // TODO: The frontend 'getUser' call expects this endpoint to return not just the user, but also 'posts', 'roles', 'postIds', and 'roleIds' for the add/edit dialog.
+    /**
+     * 根据用户编号获取详细信息
+     */
+
+    @GetMapping(value = { "/", "/{userId}" })
     @ResponseBody
-    public AjaxResult query(@PathVariable("userId") Long userId) {
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
-        return success(userService.selectUserById(userId));
+    {
+        AjaxResult ajax = AjaxResult.success();
+        if (StringUtils.isNotNull(userId))
+        {
+            userService.checkUserDataScope(userId);
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put(AjaxResult.DATA_TAG, sysUser);
+            List<SysPost> postList = postService.selectPostsByUserId(userId);
+            ajax.put("postIds", postList.stream().filter(SysPost::isFlag).map(SysPost::getPostId).collect(Collectors.toList()));
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+        }
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
+        return ajax;
     }
 
     /**
@@ -390,4 +423,120 @@ public class SysUserController extends BaseController
     public AjaxResult deptTree(SysDept dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
+    /**
+     * 新增保存用户
+     */
+    @RequiresPermissions("system:user:add")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping()
+    @ResponseBody
+    public AjaxResult insertUser(@RequestBody @Validated SysUser user)
+    {
+       return addSave(user);
+    }
+    /**
+     * 修改保存用户
+     */
+    @RequiresPermissions("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    @ResponseBody
+    public AjaxResult updateUser(@RequestBody @Validated SysUser user)
+    {
+      return editSave(user);
+    }
+
+    //    ----------------------新增的个人信息 业务处理---------------------------
+    /**
+     * 个人信息
+     */
+    @GetMapping("/profile")
+    @ResponseBody
+    public AjaxResult profile()
+    {
+        SysUser user = getSysUser();
+        AjaxResult ajax = AjaxResult.success(user);
+        ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserId()));
+        ajax.put("postGroup", userService.selectUserPostGroup(user.getUserId()));
+        return ajax;
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/profile")
+    @ResponseBody
+    public AjaxResult updateProfile(@RequestBody SysUser user)
+    {
+        SysUser currentUser = getSysUser();
+        currentUser.setUserName(user.getUserName());
+        currentUser.setEmail(user.getEmail());
+        currentUser.setPhonenumber(user.getPhonenumber());
+        currentUser.setSex(user.getSex());
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
+        {
+            return error("修改用户'" + currentUser.getLoginName() + "'失败，手机号码已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
+        {
+            return error("修改用户'" + currentUser.getLoginName() + "'失败，邮箱账号已存在");
+        }
+        if (userService.updateUserInfo(currentUser) > 0)
+        {
+            setSysUser(currentUser);
+            return success();
+        }
+        return error();
+    }
+
+    /**
+     * 重置密码
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/profile/updatePwd")
+    @ResponseBody
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    {
+        SysUser user = getSysUser();
+        if (!passwordService.matches(user, oldPassword))
+        {
+            return error("修改密码失败，旧密码错误");
+        }
+        if (passwordService.matches(user, newPassword))
+        {
+            return error("新密码不能与旧密码相同");
+        }
+        user.setSalt(ShiroUtils.randomSalt());
+        user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
+        user.setPwdUpdateDate(DateUtils.getNowDate());
+        if (userService.resetUserPwd(user) > 0)
+        {
+            setSysUser(userService.selectUserById(user.getUserId()));
+            return success();
+        }
+        return error("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     */
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping("/profile/avatar")
+    @ResponseBody
+    public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+    {
+        if (!file.isEmpty())
+        {
+            SysUser currentUser = getSysUser();
+            String avatar = FileUploadUtils.upload(ruoYiConfig.getAvatarPath(), file);
+            currentUser.setAvatar(avatar);
+            if (userService.updateUserInfo(currentUser) > 0)
+            {
+                setSysUser(currentUser);
+                return AjaxResult.success().put("imgUrl", avatar);
+            }
+        }
+        return error();
+    }
 }