diff --git a/pom.xml b/pom.xml index 550411028..aa15b270a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,9 @@ UTF-8 1.8 1.3.2 - 1.2.1 + 3.0.2.RELEASE + 2.0.1 + 2.0.0 1.1.1 1.2.31 1.0.28 diff --git a/sql/ry_20180423.sql b/sql/ry_20180505.sql similarity index 98% rename from sql/ry_20180423.sql rename to sql/ry_20180505.sql index ee6c15c6d..fe0cc6f68 100644 --- a/sql/ry_20180423.sql +++ b/sql/ry_20180505.sql @@ -44,6 +44,8 @@ create table sys_user ( user_name varchar(30) default '' comment '用户昵称', email varchar(100) default '' comment '用户邮箱', phonenumber varchar(20) default '' comment '手机号码', + sex char(20) default '0' comment '用户性别:0男,1女', + avatar varchar(100) default '' comment '头像路径', password varchar(100) default '' comment '密码', salt varchar(100) default '' comment '盐加密', user_type char(1) default 'N' comment '类型:Y默认用户,N非默认用户', @@ -59,8 +61,8 @@ create table sys_user ( -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, 106, 'admin', '若依', 'yzz_ivy@163.com', '15088888888', '29c67a30398638269fe600f73a054934', '111111', 'Y', 0, '维护中', 'admin', '2018-03-01', 'ry', '2018-03-01'); -insert into sys_user values(2, 108, 'ry', '若依', 'ry@163.com', '15288888888', '8e6d98b90472783cc73c17047ddccf36', '222222', 'N', 1, '锁定中', 'admin', '2018-03-01', 'ry', '2018-03-01'); +insert into sys_user values(1, 106, 'admin', '若依', 'yzz_ivy@163.com', '15088888888', '0', 'img/a5.jpg', '29c67a30398638269fe600f73a054934', '111111', 'N', 1, '维护中', 'admin', '2018-03-01', 'ry', '2018-03-01'); +insert into sys_user values(2, 108, 'ry', '若依', 'ry@163.com', '15288888888', '1', 'img/a5.jpg', '8e6d98b90472783cc73c17047ddccf36', '222222', 'N', 1, '锁定中', 'admin', '2018-03-01', 'ry', '2018-03-01'); -- ---------------------------- diff --git a/src/main/java/com/ruoyi/project/system/post/dao/IPostDao.java b/src/main/java/com/ruoyi/project/system/post/dao/IPostDao.java index a48b3456f..39f26f3c9 100644 --- a/src/main/java/com/ruoyi/project/system/post/dao/IPostDao.java +++ b/src/main/java/com/ruoyi/project/system/post/dao/IPostDao.java @@ -12,10 +12,10 @@ public interface IPostDao { /** - * 查询系统操作日志集合 + * 查询岗位数据集合 * * @param post 岗位信息 - * @return 操作日志集合 + * @return 岗位数据集合 */ public List selectPostList(Post post); diff --git a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java index f079bfc5e..458c9110d 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java +++ b/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"; - } - } diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java index 7ba1968cc..920e49764 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java +++ b/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"; + } + } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/project/system/user/domain/User.java b/src/main/java/com/ruoyi/project/system/user/domain/User.java index 8b992c73f..4608aadee 100644 --- a/src/main/java/com/ruoyi/project/system/user/domain/User.java +++ b/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; diff --git a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java index f0aa3b9d8..d07fcf245 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java +++ b/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); + } diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java index b02ccb2c1..b1edf2b88 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java +++ b/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 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 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(); + } } diff --git a/src/main/resources/mybatis/system/RoleMapper.xml b/src/main/resources/mybatis/system/RoleMapper.xml index e2ec3f2ad..e03e4bdfd 100644 --- a/src/main/resources/mybatis/system/RoleMapper.xml +++ b/src/main/resources/mybatis/system/RoleMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml index cb3c2772f..5bdef16bb 100644 --- a/src/main/resources/mybatis/system/UserMapper.xml +++ b/src/main/resources/mybatis/system/UserMapper.xml @@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -32,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +
@@ -45,6 +45,19 @@
+
+ +
+
+ + +
+
+ + +
+
+
diff --git a/src/main/resources/templates/system/user/edit.html b/src/main/resources/templates/system/user/edit.html index 48eef5f53..436bb5f2b 100644 --- a/src/main/resources/templates/system/user/edit.html +++ b/src/main/resources/templates/system/user/edit.html @@ -31,7 +31,7 @@
- +
@@ -40,6 +40,19 @@
+
+ +
+
+ + +
+
+ + +
+
+
diff --git a/src/main/resources/templates/system/user/profile.html b/src/main/resources/templates/system/user/profile.html index 43295314e..e86f603f1 100644 --- a/src/main/resources/templates/system/user/profile.html +++ b/src/main/resources/templates/system/user/profile.html @@ -18,23 +18,35 @@
-
个人资料
+
个人信息
+
+ + + + + + +
- image + image
CEO
-

admin

-

若依 / 管理员

-

15888888888

-

开发一部 / 初级开发

-

女

-

ruoyi@163.com

-

2018-05-20 13:14:00

+

[[${user.loginName}]]

+

[[${user.userName}]] / [[${#strings.defaultString(roleGroup,'无角色')}]] +

[[${user.phonenumber}]]

+

[[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]

+

[[${user.sex}]]

+

[[${user.email}]]

+

[[${user.createTime}]]

@@ -43,7 +55,23 @@
- - + +
+ diff --git a/src/main/resources/templates/system/user/resetPwd.html b/src/main/resources/templates/system/user/resetPwd.html index 9edaaf420..f008e5c79 100644 --- a/src/main/resources/templates/system/user/resetPwd.html +++ b/src/main/resources/templates/system/user/resetPwd.html @@ -45,7 +45,7 @@ $.ajax({ cache : true, type : "post", - url : ctx + "/system/user/resetPwd", + url : ctx + "system/user/resetPwd", data : $('#form-user-resetPwd').serialize(), async : false, error : function(request) {