| | |
| | | AccountDTO accountDTO = new AccountDTO(); |
| | | //取参 |
| | | ManageAccount manageAccount = accountUpdateForm.formConvertEntity(); |
| | | List<Integer> roleIds = accountUpdateForm.getRoleIds(); |
| | | |
| | | //查找要更新的用户用于插入日志 |
| | | QueryWrapper<ManageAccount> oldAccountWrapper = new QueryWrapper<>(); |
| | |
| | | } |
| | | |
| | | //更新ManageAccount表 |
| | | Map manageAccountMap = JSONObject.parseObject(JSON.toJSONString(manageAccount), Map.class);//转换为Map判断属性是否有更新 |
| | | if (manageAccountMap.size() > 1) {//判断如果没有除了id以外的任何属性则不更新 |
| | | manageAccountMapper.updateById(manageAccount); |
| | | } |
| | | manageAccountMapper.updateById(manageAccount); |
| | | |
| | | //获取账号更新前的角色 |
| | | List<ManageRole> oldRoles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId()); |
| | | |
| | | //如果角色有变动,则更新ManageAccountRole表 |
| | | /* |
| | | * 如果roleIds为null,则是该账号角色没有发生改变 |
| | | * 如果roleIds为空,则是该账号所有的角色都被移除 |
| | | * 如果roleIds有元素,则是该账号的角色有更新 |
| | | * */ |
| | | if (roleIds != null) { |
| | | //删除原有角色 |
| | | UpdateWrapper<ManageAccountRole> deleteWrapper = new UpdateWrapper<>(); |
| | | deleteWrapper.eq("account_id", manageAccount.getId()).set("is_delete", Constants.DELETE); |
| | | manageAccountRoleMapper.update(null, deleteWrapper); |
| | | /*重新添加角色*/ |
| | | for (Integer roleId : roleIds) { |
| | | ManageAccountRole manageAccountRole = new ManageAccountRole(); |
| | | manageAccountRole.setAccountId(manageAccount.getId()); |
| | | manageAccountRole.setRoleId(roleId); |
| | | manageAccountRoleMapper.insert(manageAccountRole); |
| | | } |
| | | } |
| | | //操作插入日志 |
| | | insertUpdateLog(accountUpdateForm, oldManageAccount, oldRoles); |
| | | insertUpdateLog(accountUpdateForm, oldManageAccount); |
| | | //销毁token |
| | | TokenUtils.destoryToken(manageAccount.getId()); |
| | | //封装返回结果 |
| | |
| | | * @Author: 陈凯裕 |
| | | * @Date: 2021/4/8 |
| | | */ |
| | | private void insertUpdateLog(AccountUpdateForm updateForm, ManageAccount oldAccount, List<ManageRole> oldRoles) { |
| | | private void insertUpdateLog(AccountUpdateForm updateForm, ManageAccount oldAccount) { |
| | | //操作插入日志 |
| | | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); |
| | | StringBuilder content = new StringBuilder(); |
| | |
| | | if ("password".equals(key)) {//密码特殊处理,不显示在日志上 |
| | | if (!ObjectUtils.isEmpty(updateForm.getPassword())) {//判断密码是否进行了更新 |
| | | content.append("修改了密码;"); |
| | | } |
| | | } else if ("roleIds".equals(key)) {//角色特殊处理,将Id转化为角色名称 |
| | | List<Integer> newRoleIds = updateForm.getRoleIds(); |
| | | |
| | | if (newRoleIds != null && 0 == newRoleIds.size()) {//如果新的角色集合为空,则是删除了所有的角色 |
| | | content.append("角色:删除了所有角色;"); |
| | | } |
| | | if ((newRoleIds != null) && (newRoleIds.size() != 0)) {//如果新的角色集合不为空,且不为null,则角色进行了更新 |
| | | StringBuilder oldRolesName = new StringBuilder("空"); |
| | | StringBuilder newRolesName = new StringBuilder("空"); |
| | | |
| | | List<ManageRole> newRoles = null; |
| | | if (!ObjectUtils.isEmpty(updateForm.getRoleIds())) { |
| | | newRoles = manageRoleMapper.selectBatchIds(updateForm.getRoleIds()); |
| | | } |
| | | |
| | | if (!ObjectUtils.isEmpty(oldRoles)) { |
| | | oldRolesName.deleteCharAt(oldRolesName.length() - 1);//删除 "空" |
| | | oldRolesName.append("["); |
| | | for (ManageRole role : oldRoles) { |
| | | oldRolesName.append(role.getName() + ","); |
| | | } |
| | | oldRolesName.deleteCharAt(oldRolesName.length() - 1);//移除最后一个逗号 |
| | | oldRolesName.append("]"); |
| | | } |
| | | |
| | | if (!ObjectUtils.isEmpty(newRoles)) { |
| | | newRolesName.deleteCharAt(newRolesName.length() - 1);//删除 "空" |
| | | newRolesName.append("["); |
| | | for (ManageRole role : newRoles) { |
| | | newRolesName.append(role.getName() + ","); |
| | | } |
| | | newRolesName.deleteCharAt(newRolesName.length() - 1);//移除最后一个逗号 |
| | | newRolesName.append("]"); |
| | | } |
| | | //拼接完整content |
| | | content.append(value + ":" + oldRolesName + "->" + newRolesName + ";"); |
| | | } |
| | | } else {//其他属性处理 |
| | | if (newParameters.get(key) != null) { |