新增个人信息修改

src/main/java/com/ruoyi/project/system/post/dao/IPostDao.java

@@ -12,10 +12,10 @@ public interface IPostDao
 {
 
     /**
-     * 查询系统操作日志集合
+     * 查询岗位数据集合
      * 
      * @param post 岗位信息
-     * @return 操作日志集合
+     * @return 岗位数据集合
      */
     public List<Post> selectPostList(Post post);
 

src/main/java/com/ruoyi/project/system/user/controller/IndexController.java

@@ -47,11 +47,4 @@ public class IndexController extends BaseController
         return "main";
     }
 
-    // 个人信息
-    @GetMapping("/system/profile")
-    public String profile(Model model)
-    {
-        return "system/user/profile";
-    }
-
 }

src/main/java/com/ruoyi/project/system/user/controller/UserController.java

@@ -37,10 +37,10 @@ public class UserController extends BaseController
 
     @Autowired
     private IUserService userService;
-    
+
     @Autowired
     private IRoleService roleService;
-    
+
     @Autowired
     private IPostService postService;
 
@@ -92,7 +92,7 @@ public class UserController extends BaseController
         model.addAttribute("posts", posts);
         return prefix + "/add";
     }
-    
+
     @RequiresPermissions("system:user:resetPwd")
     @Log(title = "系统管理", action = "用户管理-重置密码")
     @GetMapping("/resetPwd/{userId}")
@@ -102,7 +102,7 @@ public class UserController extends BaseController
         model.addAttribute("user", user);
         return prefix + "/resetPwd";
     }
-    
+
     @RequiresPermissions("system:user:resetPwd")
     @Log(title = "系统管理", action = "用户管理-重置密码")
     @PostMapping("/resetPwd")
@@ -120,7 +120,7 @@ public class UserController extends BaseController
     @RequiresPermissions("system:user:remove")
     @Log(title = "系统管理", action = "用户管理-删除用户")
     @RequestMapping("/remove/{userId}")
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @ResponseBody
     public Message remove(@PathVariable("userId") Long userId)
     {
@@ -139,7 +139,7 @@ public class UserController extends BaseController
     @RequiresPermissions("system:user:batchRemove")
     @Log(title = "系统管理", action = "用户管理-批量删除")
     @PostMapping("/batchRemove")
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @ResponseBody
     public Message batchRemove(@RequestParam("ids[]") Long[] ids)
     {
@@ -157,7 +157,7 @@ public class UserController extends BaseController
     @RequiresPermissions("system:user:save")
     @Log(title = "系统管理", action = "部门管理-保存部门")
     @PostMapping("/save")
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @ResponseBody
     public Message save(User user)
     {
@@ -183,4 +183,28 @@ public class UserController extends BaseController
         return uniqueFlag;
     }
 
+    /**
+     * 个人信息
+     */
+    @GetMapping("/profile")
+    public String profile(Model model)
+    {
+        User user = getUser();
+        String sex = user.getSex();
+        if ("0".equals(sex))
+        {
+            user.setSex("性别：男");
+        }
+        else if ("1".equals(sex))
+        {
+            user.setSex("性别：女");
+        }
+        String roleGroup = userService.selectUserRoleGroup(user.getUserId());
+        String postGroup = userService.selectUserPostGroup(user.getUserId());
+        model.addAttribute("user", user);
+        model.addAttribute("roleGroup", roleGroup);
+        model.addAttribute("postGroup", postGroup);
+        return prefix + "/profile";
+    }
+
 }

src/main/java/com/ruoyi/project/system/user/domain/User.java

@@ -28,6 +28,10 @@ public class User extends PageDomain
     private String email;
     /** 手机号码 */
     private String phonenumber;
+    /** 用户性别 */
+    private String sex;
+    /** 用户头像 */
+    private String avatar;
     /** 密码 */
     private String password;
     /** 盐加密 */
@@ -123,6 +127,26 @@ public class User extends PageDomain
         this.phonenumber = phonenumber;
     }
 
+    public String getSex()
+    {
+        return sex;
+    }
+
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getAvatar()
+    {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar)
+    {
+        this.avatar = avatar;
+    }
+
     public String getPassword()
     {
         return password;

src/main/java/com/ruoyi/project/system/user/service/IUserService.java

@@ -58,7 +58,7 @@ public interface IUserService
      * @return 结果
      */
     public int saveUser(User user);
-    
+
     /**
      * 修改用户信息
      * 
@@ -75,4 +75,20 @@ public interface IUserService
      */
     public String checkUserNameUnique(String loginName);
 
+    /**
+     * 根据用户ID查询用户所属角色组
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public String selectUserRoleGroup(Long userId);
+
+    /**
+     * 根据用户ID查询用户所属岗位组
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public String selectUserPostGroup(Long userId);
+
 }

src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java

@@ -10,6 +10,10 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.framework.shiro.service.PasswordService;
+import com.ruoyi.project.system.post.dao.IPostDao;
+import com.ruoyi.project.system.post.domain.Post;
+import com.ruoyi.project.system.role.dao.IRoleDao;
+import com.ruoyi.project.system.role.domain.Role;
 import com.ruoyi.project.system.user.dao.IUserDao;
 import com.ruoyi.project.system.user.dao.IUserPostDao;
 import com.ruoyi.project.system.user.dao.IUserRoleDao;
@@ -29,6 +33,12 @@ public class UserServiceImpl implements IUserService
     @Autowired
     private IUserDao userDao;
 
+    @Autowired
+    private IRoleDao roleDao;
+
+    @Autowired
+    private IPostDao postDao;
+
     @Autowired
     private IUserPostDao userPostDao;
 
@@ -220,4 +230,48 @@ public class UserServiceImpl implements IUserService
         }
         return UserConstants.NAME_UNIQUE;
     }
+
+    /**
+     * 查询用户所属角色组
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    public String selectUserRoleGroup(Long userId)
+    {
+        List<Role> list = roleDao.selectRolesByUserId(userId);
+        StringBuffer idsStr = new StringBuffer();
+        for (Role role : list)
+        {
+            idsStr.append(role.getRoleName()).append(",");
+        }
+        if (StringUtils.isNotEmpty(idsStr.toString()))
+        {
+            idsStr.substring(0, idsStr.length() - 1);
+        }
+        return idsStr.toString();
+    }
+
+    /**
+     * 查询用户所属岗位组
+     * 
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    public String selectUserPostGroup(Long userId)
+    {
+        List<Post> list = postDao.selectPostsByUserId(userId);
+        StringBuffer idsStr = new StringBuffer();
+        for (Post post : list)
+        {
+            idsStr.append(post.getPostName()).append(",");
+        }
+        if (StringUtils.isNotEmpty(idsStr.toString()))
+        {
+            idsStr.substring(0, idsStr.length() - 1);
+        }
+        return idsStr.toString();
+    }
 }