From bd9f3d7178a56be201a9cdd2f54bdf7e627abcc1 Mon Sep 17 00:00:00 2001 From: penggle Date: Thu, 11 May 2017 18:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xproject/admin/consts/AdminConstants.java | 2 +- .../controller/AdminUserMgtController.java | 8 +- .../src/main/webapp/admin/user/index.html | 49 +++++- .../main/webapp/resources/css/admin-login.css | 1 + .../resources/images/default-user-avatar.png | Bin 0 -> 6888 bytes .../resources/images/default-user-icon.png | Bin 4626 -> 0 bytes .../resources/scripts/admin/user/index.js | 148 ++++++++++++++++-- .../xproject/admin/dao/AdminUserDAO.java | 8 + .../admin/dao/impl/AdminUserDAOImpl.java | 8 +- .../service/impl/AdminRoleServiceImpl.java | 3 +- .../service/impl/AdminUserServiceImpl.java | 3 +- .../mybatis/mapper/AdminUserMapper.xml | 5 + 12 files changed, 211 insertions(+), 24 deletions(-) create mode 100644 xproject-admin/src/main/webapp/resources/images/default-user-avatar.png delete mode 100644 xproject-admin/src/main/webapp/resources/images/default-user-icon.png diff --git a/xproject-admin/src/main/java/com/certusnet/xproject/admin/consts/AdminConstants.java b/xproject-admin/src/main/java/com/certusnet/xproject/admin/consts/AdminConstants.java index 904c937..05c6d38 100644 --- a/xproject-admin/src/main/java/com/certusnet/xproject/admin/consts/AdminConstants.java +++ b/xproject-admin/src/main/java/com/certusnet/xproject/admin/consts/AdminConstants.java @@ -14,7 +14,7 @@ public class AdminConstants extends AbstractConstants { /** * 用户默认头像 */ - public static final String DEFAULT_USER_ICON = valueOf("/resources/images/default-user-icon.png"); + public static final String DEFAULT_USER_AVATAR = valueOf("/resources/images/default-user-avatar.png"); /** * 用户头像默认保存路径,相对于#GlobalConstants.IMAGE_SERVER_ROOT diff --git a/xproject-admin/src/main/java/com/certusnet/xproject/admin/web/controller/AdminUserMgtController.java b/xproject-admin/src/main/java/com/certusnet/xproject/admin/web/controller/AdminUserMgtController.java index fda4221..af7deef 100644 --- a/xproject-admin/src/main/java/com/certusnet/xproject/admin/web/controller/AdminUserMgtController.java +++ b/xproject-admin/src/main/java/com/certusnet/xproject/admin/web/controller/AdminUserMgtController.java @@ -85,7 +85,7 @@ public Object addUser(HttpServletRequest request, HttpServletResponse response, userAddForm.setUserType(AdminUserTypeEnum.ADMIN_USER_TYPE_NORMAL.getTypeCode()); if(StringUtils.isEmpty(userAddForm.getUserIcon())){ - userAddForm.setUserIcon(AdminConstants.DEFAULT_USER_ICON); + userAddForm.setUserIcon(AdminConstants.DEFAULT_USER_AVATAR); }else{ String userIcon = userAddForm.getUserIcon(); if(userIcon.toLowerCase().startsWith(GlobalConstants.DEFAULT_UPLOAD_SAVE_PATH)){ @@ -115,7 +115,7 @@ public Object editUser(HttpServletRequest request, HttpServletResponse response, userEditForm.setUpdateTime(DateTimeUtils.formatNow()); if(StringUtils.isEmpty(userEditForm.getUserIcon())){ - userEditForm.setUserIcon(AdminConstants.DEFAULT_USER_ICON); + userEditForm.setUserIcon(AdminConstants.DEFAULT_USER_AVATAR); }else{ String userIcon = userEditForm.getUserIcon(); if(userIcon.toLowerCase().startsWith(GlobalConstants.DEFAULT_UPLOAD_SAVE_PATH)){ @@ -138,9 +138,9 @@ public Object editUser(HttpServletRequest request, HttpServletResponse response, * @return */ @RequestMapping(value="/admin/user/del") - public Object delUser(HttpServletRequest request, HttpServletResponse response, Long userId) { + public Object delUser(HttpServletRequest request, HttpServletResponse response, Long id) { AdminUser user = new AdminUser(); - user.setUserId(userId); + user.setUserId(id); adminUserService.deleteUserById(user); return genSuccessResult("删除成功!", null); } diff --git a/xproject-admin/src/main/webapp/admin/user/index.html b/xproject-admin/src/main/webapp/admin/user/index.html index 448f621..f4c5fdf 100644 --- a/xproject-admin/src/main/webapp/admin/user/index.html +++ b/xproject-admin/src/main/webapp/admin/user/index.html @@ -113,7 +113,7 @@

@@ -124,6 +124,7 @@

查看详情 修改用户 + 修改密码 配置用户角色 删除用户 @@ -379,6 +380,52 @@

关 闭 + + 修改用户密码 +
+ + + + + + {{changePwdForm.userName}} + + + + + + + + + + + + + +

由6~20位个字母或数字组成.

+ + + + + + + + + + + +

请再次确认您输入的密码.

+ + + + + +
+
+ 取 消 + 确 定 +
+ diff --git a/xproject-admin/src/main/webapp/resources/css/admin-login.css b/xproject-admin/src/main/webapp/resources/css/admin-login.css index 7950899..262141b 100644 --- a/xproject-admin/src/main/webapp/resources/css/admin-login.css +++ b/xproject-admin/src/main/webapp/resources/css/admin-login.css @@ -108,6 +108,7 @@ html, body, .el-container { float: right; font-size: 12px; color: #999; + line-height: 30px; } .admin-login-forgotpwd:hover { color: #337ab7; diff --git a/xproject-admin/src/main/webapp/resources/images/default-user-avatar.png b/xproject-admin/src/main/webapp/resources/images/default-user-avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..d77bd4cf8888890bf3d1e8c452c63b0b7a6c8254 GIT binary patch literal 6888 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 IM6N<$g0g_>vj6}9 diff --git a/xproject-admin/src/main/webapp/resources/scripts/admin/user/index.js b/xproject-admin/src/main/webapp/resources/scripts/admin/user/index.js index 126de78..40a7a83 100644 --- a/xproject-admin/src/main/webapp/resources/scripts/admin/user/index.js +++ b/xproject-admin/src/main/webapp/resources/scripts/admin/user/index.js @@ -1,5 +1,9 @@ var ADMIN_USER_TYPE_SYSTEM = 0; var IMAGE_TYPES = ['image/jpeg', 'image/jpg', 'image/png']; +var USER_STATUS = { + 1: '启用', + 0: '禁用' +}; var vm = null; Vue.onDocumentReady(function() { vm = new Vue({ @@ -24,6 +28,7 @@ Vue.onDocumentReady(function() { userList: [], editDialogVisible: false, viewConfigDialogVisible: false, + changePwdDialogVisible: false, viewConfigActiveTabName: 'userDetail', uploadHeaders: { Accept: 'application/json' @@ -66,6 +71,12 @@ Vue.onDocumentReady(function() { lastLoginTime: '', loginTimes: '' }, + changePwdForm: { + userId: '', + userName: '', + password: '', + repassword: '' + }, userEditRules: { userName: [{ required: true, @@ -119,6 +130,32 @@ Vue.onDocumentReady(function() { message: 'EMAIL不合法!' }] }, + changePwdRules: { + password: [{ + required: true, + message: '请输入账户密码!' + },{ + validator: regex, + regex: /^[a-zA-Z0-9]{6,20}$/, + message: '账户密码由6~20个字母或数字组成!' + }], + repassword: [{ + required: true, + message: '请再次输入账户密码!' + },{ + validator: regex, + regex: /^[a-zA-Z0-9]{6,20}$/, + message: '账户密码由6~20个字母或数字组成!' + },{ + validator: equalTo, + compareTarget: { + vue: 'vm', + form: 'changePwdForm', + field: 'password' + }, + message: '两次密码不一致!' + }] + }, roleQuering: false, userRoleQueryForm: { userId: '', @@ -259,6 +296,8 @@ Vue.onDocumentReady(function() { this.deleteUser(row); }else if(cmd == 'conf'){ this.openUserViewConfigDialog(cmd, row); + }else if(cmd == 'changepwd'){ + this.openChangePwdDialog(cmd, row); } }, openUserEditDialog: function(cmd, row){ @@ -274,6 +313,10 @@ Vue.onDocumentReady(function() { } this.editDialogVisible = true; }, + closeEditDialog: function(){ + this.editDialogVisible = false; + this.$refs.userEditForm.resetFields(); + }, openUserViewConfigDialog: function(cmd, row){ this.currentActionType = cmd; this.userViewConfigForm.userId = row.userId; @@ -302,6 +345,26 @@ Vue.onDocumentReady(function() { } this.viewConfigDialogVisible = true; }, + closeUserViewConfigDialog: function(){ + this.viewConfigDialogVisible = false; + this.resetUserRoleQueryForm(); + this.userRoleList = []; + if(this.currentActionType == 'conf'){ + this.resetRoleQueryForm(); + this.roleList = []; + this.selectedRoleIds = []; + } + }, + openChangePwdDialog: function(cmd, row){ + this.currentActionType = cmd; + this.changePwdForm.userId = row.userId; + this.changePwdForm.userName = row.userName; + this.changePwdDialogVisible = true; + }, + closeChangePwdDialog: function(){ + this.changePwdDialogVisible = false; + this.$refs.changePwdForm.resetFields(); + }, saveUser: function(){ var url = ''; if(this.currentActionType == 'add'){ @@ -364,10 +427,77 @@ Vue.onDocumentReady(function() { }); } }, - closeEditDialog: function(){ - this.editDialogVisible = false; - this.$refs.userEditForm.resetFields(); - }, + changePasswd: function(){ + var url = ADMIN_CONTEXT_PATH + '/admin/user/changepwd/submit?forceUpdate=true'; + var _this = this; + this.$refs.changePwdForm.validate(function(valid){ + if(valid && !_this.submiting){ + _this.$confirm('你确定要修改该用户的密码?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + callback: function(action, instance){ + if(action == 'confirm'){ + _this.submiting = true; + setTimeout(function(){ + axios.post(url, _this.changePwdForm).then(function(response){ + _this.submiting = false; + var result = response.data; + if(result.success){ + _this.closeChangePwdDialog(); + _this.$message.success('修改成功!'); + }else{ + _this.$message.error(result.message); + } + }).catch(function(error){ + _this.submiting = false; + _this.$message.error('请求出错!'); + }); + }, 1500); + } + } + }); + }else{ + return false; + } + }); + }, + changeUserStatus: function(event, row){ + if(ADMIN_USER_TYPE_SYSTEM == row.userType){ + this.$message.error('系统用户禁止此操作!'); + }else{ + //var switchVm = event.currentTarget.__vue__; + var targetStatus = row.status == 1 ? 0 : 1; + var url = ''; + if(targetStatus == 1){ + url = ADMIN_CONTEXT_PATH + '/admin/user/enable?userId=' + row.userId; + }else{ + url = ADMIN_CONTEXT_PATH + '/admin/user/disable?userId=' + row.userId; + } + this.$confirm('你确定要' + USER_STATUS[targetStatus] + '该用户?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + callback: function(action, instance){ + if(action == 'confirm'){ + axios.get(url).then(function(response){ + var result = response.data; + if(result.success){ + //_this.$message.success('操作成功!'); + row.status = targetStatus; + }else{ + _this.$message.error(result.message); + } + }).catch(function(error){ + _this.$message.error('请求出错!'); + }); + } + } + }); + } + event.preventDefault(); + return false; + }, queryUserRoleList: function(loading){ this.userRoleQueryForm.userId = this.userViewConfigForm.userId; var _this = this; @@ -445,16 +575,6 @@ Vue.onDocumentReady(function() { resetRoleQueryForm: function(){ this.$refs.roleQueryForm.resetFields(); }, - closeUserViewConfigDialog: function(){ - this.viewConfigDialogVisible = false; - this.resetUserRoleQueryForm(); - this.userRoleList = []; - if(this.currentActionType == 'conf'){ - this.resetRoleQueryForm(); - this.roleList = []; - this.selectedRoleIds = []; - } - }, delUserRoleConfig: function(){ if(this.selectedRoleIds.length){ var userId = this.userViewConfigForm.userId; diff --git a/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/AdminUserDAO.java b/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/AdminUserDAO.java index 8689345..4ff58c2 100644 --- a/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/AdminUserDAO.java +++ b/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/AdminUserDAO.java @@ -123,6 +123,14 @@ public interface AdminUserDAO */ public void deleteUserRoles(Long userId, List roleIdList); + /** + * 删除用户的所有角色 + * + * @param userId + * @param roleIdList + */ + public void deleteUserAllRoles(Long userId); + /** * 根据用户名获取用户信息 * diff --git a/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/impl/AdminUserDAOImpl.java b/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/impl/AdminUserDAOImpl.java index e824314..0649993 100644 --- a/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/impl/AdminUserDAOImpl.java +++ b/xproject-service/src/main/java/com/certusnet/xproject/admin/dao/impl/AdminUserDAOImpl.java @@ -98,10 +98,14 @@ public void deleteUserRoles(Long userId, List roleIdList) { Map paramMap = new HashMap(); paramMap.put("userId", userId); paramMap.put("roleIdList", roleIdList); - getSqlSessionTemplate().insert(getMapperKey("deleteUserRoles"), paramMap); + getSqlSessionTemplate().delete(getMapperKey("deleteUserRoles"), paramMap); } - public AdminUser getUserByUserName(String userName, boolean fatUser) { + public void deleteUserAllRoles(Long userId) { + getSqlSessionTemplate().delete(getMapperKey("deleteUserAllRoles"), userId); + } + + public AdminUser getUserByUserName(String userName, boolean fatUser) { if (fatUser) { return getSqlSessionTemplate().selectOne(getMapperKey("getUserByUserName"), userName, new AdminUserModelHandler()); } diff --git a/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminRoleServiceImpl.java b/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminRoleServiceImpl.java index 3bd2502..abe1ea4 100644 --- a/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminRoleServiceImpl.java +++ b/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminRoleServiceImpl.java @@ -59,7 +59,8 @@ public void deleteRoleById(Long roleId) { ValidationAssert.notNull(role, "该角色已经不存在了!"); BusinessAssert.isTrue(!AdminRoleTypeEnum.ADMIN_ROLE_TYPE_SYSTEM.getTypeCode().equals(role.getRoleType()), "删除角色失败,系统角色不允许删除!"); BusinessAssert.isTrue(!role.isInuse(), "删除角色失败,该角色已经在使用不允许删除!"); - roleDAO.deleteRoleById(roleId); + roleDAO.deleteRoleById(roleId); //删除角色信息 + roleDAO.deleteRoleResourcesByRoleId(roleId); //删除该角色下的所有资源关系 } public AdminRole getRoleById(Long roleId) { diff --git a/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminUserServiceImpl.java b/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminUserServiceImpl.java index f6e5ac3..12072ad 100644 --- a/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminUserServiceImpl.java +++ b/xproject-service/src/main/java/com/certusnet/xproject/admin/service/impl/AdminUserServiceImpl.java @@ -86,7 +86,8 @@ public void deleteUserById(AdminUser user) { ValidationAssert.notNull(puser, "该用户已经不存在了!"); BusinessAssert.isTrue(!AdminUserTypeEnum.ADMIN_USER_TYPE_SYSTEM.getTypeCode().equals(puser.getUserType()), "系统级用户不能被删除!"); user.setUserName(puser.getUserName()); - userDAO.deleteUserById(user.getUserId()); + userDAO.deleteUserById(user.getUserId()); //删除用户信息 + userDAO.deleteUserAllRoles(user.getUserId()); //删除用户的所有角色关系 } @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED) diff --git a/xproject-service/src/main/resources/mybatis/mapper/AdminUserMapper.xml b/xproject-service/src/main/resources/mybatis/mapper/AdminUserMapper.xml index 7355ac1..ac428d7 100644 --- a/xproject-service/src/main/resources/mybatis/mapper/AdminUserMapper.xml +++ b/xproject-service/src/main/resources/mybatis/mapper/AdminUserMapper.xml @@ -215,6 +215,11 @@ + + DELETE a FROM admin_user_role a + WHERE a.user_id = #{userId, jdbcType=BIGINT} + + DELETE a FROM admin_user_role a WHERE a.user_id = #{userId, jdbcType=BIGINT}