From 657182c7989dc77b69bb3f9adaf6c75b6466ff95 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Jun 2021 10:31:35 +0800
Subject: [PATCH] screen-manage 编辑账号接口删除分配角色功能，分配角色功能变为单独接口
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 535 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 274 insertions(+), 261 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index 41b198b..947fae4 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -1,5 +1,7 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,26 +11,35 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.mapper.ManageAccountMapper;
import com.moral.api.mapper.ManageAccountRoleMapper;
-import com.moral.api.mapper.ManageMenuMapper;
import com.moral.api.mapper.ManageRoleMapper;
import com.moral.api.pojo.dto.account.*;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.pojo.dto.login.LoginDTO;
-import com.moral.api.pojo.request.*;
+import com.moral.api.pojo.form.account.AccountDeleteForm;
+import com.moral.api.pojo.form.account.AccountInsertForm;
+import com.moral.api.pojo.form.account.AccountQueryForm;
+import com.moral.api.pojo.form.account.AccountUpdateForm;
+import com.moral.api.pojo.form.login.LoginForm;
+import com.moral.api.pojo.form.login.LogoutForm;
import com.moral.api.service.ManageAccountService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.util.AESUtils;
-import com.moral.util.MD5Utils;
-import com.moral.util.TokenUtils;
-import org.springframework.beans.factory.annotation.Value;
+import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
+import com.moral.api.service.ManageMenuService;
+import com.moral.api.util.LogUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
-import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.function.Predicate;
/**
* <p>
@@ -39,77 +50,77 @@
* @since 2021-03-09
*/
@Service
+@ConfigurationProperties(prefix = "log-aspect")
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {
- @Value("${AES.KEY}")
- private String AESKey;
- @Resource
+
+ @Autowired
ManageAccountMapper manageAccountMapper;
- @Resource
+ @Autowired
ManageRoleMapper manageRoleMapper;
- @Resource
- ManageMenuMapper manageMenuMapper;
- @Resource
+ @Autowired
+ ManageMenuService manageMenuService;
+ @Autowired
ManageAccountRoleMapper manageAccountRoleMapper;
+ @Autowired
+ LogUtils logUtils;
- public final static String specialCharRegEx = "[ _`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~���@#���%������&*������������+|{}������������������������������������]|\n|\r|\t";
+ Map<String, String> manageAccountFormMap;
- public final static String mobileRegEx = "^((13[0-9])|(14[0,1,4-9])|(15[0-3,5-9])|(16[2,5,6,7])|(17[0-8])|(18[0-9])|(19[0-3,5-9]))\\d{8}$";
-
- public final static String emailRegEx = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
+ public void setManageAccountFormMap(Map<String, String> manageAccountFormMap) {
+ this.manageAccountFormMap = manageAccountFormMap;
+ }
/**
- * @Description: ������
- * @Param: [parameters]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @Description: ������������
+ * @Param: [loginForm]
+ * @return: com.moral.api.pojo.dto.login.LoginDTO
* @Author: ���������
- * @Date: 2021/3/11
+ * @Date: 2021/3/30
*/
@Override
- public LoginDTO login(LoginRequest loginRequest) {
+ public LoginDTO login(LoginForm loginForm) {
LoginDTO loginDTO = new LoginDTO();
//������
- String AESAccount = loginRequest.getAccount();
- String AESPassword = loginRequest.getPassword();
+ String account = loginForm.getAccount();
+ String AESPassword = loginForm.getPassword();
//������
- String account = AESUtils.decrypt(AESAccount, AESKey);
- String password = AESUtils.decrypt(AESPassword, AESKey);
+ String password = AESUtils.decrypt(AESPassword);
//������������������
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("account", account);
List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wrapper);
if (ObjectUtils.isEmpty(manageAccounts)) {
- loginDTO.setCode(LoginDTO.NOT_EXIST);
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
//������������������������
ManageAccount manageAccount = null;
for (ManageAccount value : manageAccounts) {
- if("0".equals(value.getIsDelete()))
+ if (Constants.NOT_DELETE.equals(value.getIsDelete()))
manageAccount = value;
}
if (ObjectUtils.isEmpty(manageAccount)) {
- loginDTO.setCode(LoginDTO.IS_DELETE);
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
//������������
if (!MD5Utils.saltMD5Verify(password, manageAccount.getPassword())) {
- loginDTO.setCode(LoginDTO.PASSWORD_ERROR);
+ loginDTO.setCode(ResponseCodeEnum.PASSWORD_ERROR.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.PASSWORD_ERROR.getMsg());
return loginDTO;
}
//������������
List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
- if (ObjectUtils.isEmpty(roles)) {//������������������������������
- loginDTO.setCode(LoginDTO.ROLE_EMPTY);
- return loginDTO;
- }
+
//������������
- List<ManageMenu> menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
- if (ObjectUtils.isEmpty(menus)) {//������������������������������
- loginDTO.setCode(LoginDTO.MENU_EMPTY);
- return loginDTO;
+ List<ManageMenu> menus = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(roles)) {
+ menus = manageMenuService.getParentChildrenMenusByRoles(roles);
}
//������������������
@@ -122,9 +133,16 @@
String token = TokenUtils.getToken(String.valueOf(manageAccount.getId()), accountInfoDTO);
//������������������
- loginDTO.setCode(LoginDTO.SUCCESS);
+ loginDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
loginDTO.setAccountInfoDTO(accountInfoDTO);
loginDTO.setToken(token);
+
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append(manageAccount.getUserName()).append("���������������������;");
+ logUtils.saveLoginForManage(request, content.toString(), manageAccount, manageAccount.getUserName());
return loginDTO;
}
@@ -132,14 +150,14 @@
/**
* @Description: ������
* @Param: [parameters]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return:
* @Author: ���������
* @Date: 2021/3/11
*/
@Override
- public boolean logout(LogoutRequest logoutRequest) {
- String accountId = logoutRequest.getAccountId();
- String token = logoutRequest.getToken();
+ public boolean logout(LogoutForm logoutForm) {
+ String accountId = logoutForm.getAccountId();
+ String token = logoutForm.getToken();
TokenUtils.destoryToken(accountId, token);
return true;
}
@@ -153,90 +171,52 @@
*/
@Override
@Transactional
- public AccountInsertDTO insertAccount(AccountInsertRequest accountInsertRequest) {
- AccountInsertDTO accountInsertDTO = new AccountInsertDTO();
+ public AccountDTO insertAccount(AccountInsertForm accountInsertForm) {
+ AccountDTO accountDTO = new AccountDTO();
//������
- String AESAccount = accountInsertRequest.getAccount();
- String AESPassword = accountInsertRequest.getPassword();
- String account = AESUtils.decrypt(AESAccount, AESKey);
- String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword, AESKey));
- String userName = accountInsertRequest.getUserName();
- String email = accountInsertRequest.getEmail();
- String mobile = accountInsertRequest.getMobile();
- String wechat = accountInsertRequest.getWechat();
- List<String> roleIdsStr = accountInsertRequest.getRoleIds();
- //������������������������������������
- /*���������������������������������������*/
- if (isSpecialChar(account)) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_EXIST_SPECIAL_CHAR);
- return accountInsertDTO;
- }
- /*������������������������������������*/
- if (isSpecialChar(password)) {
- accountInsertDTO.setCode(AccountInsertDTO.PASSWORD_EXIST_SPECIAL_CHAR);
- return accountInsertDTO;
- }
- /*���������������������������������*/
- if (account.length() >= 20||account.length()<=6) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_LENGTH_INVALID);
- return accountInsertDTO;
- }
- /*������������������������������*/
- if (AESUtils.decrypt(AESPassword, AESKey).length() >= 20||AESUtils.decrypt(AESPassword, AESKey).length() <= 6) {
- accountInsertDTO.setCode(AccountInsertDTO.PASSWORD_LENGTH_INVALID);
- return accountInsertDTO;
- }
- /*���������������������������������*/
- if (!isValidMobile(mobile)) {
- accountInsertDTO.setCode(AccountInsertDTO.MOBILE_INVALID);
- return accountInsertDTO;
- }
- /*������������������������������*/
- if (!isValidEmail(email)) {
- accountInsertDTO.setCode(AccountInsertDTO.EMAIL_INVALID);
- return accountInsertDTO;
- }
+ ManageAccount manageAccount = accountInsertForm.formConvertEntity();
+ List<Integer> roleIds = accountInsertForm.getRoleIds();
+
/*������������������������*/
- ManageAccount exitAccount = new ManageAccount();
- exitAccount.setAccount(account);
- exitAccount.setIsDelete("0");
+ ManageAccount existAccount = new ManageAccount();
+ existAccount.setAccount(manageAccount.getAccount());
+ existAccount.setIsDelete(Constants.NOT_DELETE);
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
- wrapper.setEntity(exitAccount);
- List<ManageAccount> exitAccounts = manageAccountMapper.selectList(wrapper);
- if (!ObjectUtils.isEmpty(exitAccounts)) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_EXIST);
- return accountInsertDTO;
+ wrapper.setEntity(existAccount);
+ ManageAccount exitAccountResult = manageAccountMapper.selectOne(wrapper);
+ if (!ObjectUtils.isEmpty(exitAccountResult)) {
+ accountDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
+ return accountDTO;
}
- //String to Integer
- List<Integer> roleIds = new ArrayList<>();
- roleIdsStr.forEach(str -> roleIds.add(Integer.parseInt(str)));
-
- //������account
- ManageAccount manageAccount = new ManageAccount();
- manageAccount.setAccount(account);
- manageAccount.setPassword(password);
- manageAccount.setUserName(userName);
- manageAccount.setEmail(email);
- manageAccount.setMobile(mobile);
- manageAccount.setWechat(wechat);
+ //������
manageAccountMapper.insert(manageAccount);
- //������account_role
- Integer accountId = manageAccount.getId();
- roleIdsStr.forEach(
- value -> {
- ManageAccountRole manageAccountRole = new ManageAccountRole();
- manageAccountRole.setAccountId(accountId);
- manageAccountRole.setRoleId(Integer.parseInt(value));
- manageAccountRoleMapper.insert(manageAccountRole);
- }
- );
+
+ //������������������������������������������������������
+ if (!ObjectUtils.isEmpty(roleIds)) {
+ Integer accountId = manageAccount.getId();
+ roleIds.forEach(
+ value -> {
+ ManageAccountRole manageAccountRole = new ManageAccountRole();
+ manageAccountRole.setAccountId(accountId);
+ manageAccountRole.setRoleId(value);
+ manageAccountRoleMapper.insert(manageAccountRole);
+ }
+ );
+ }
//������������������
- List<ManageRole> roles = manageRoleMapper.selectBatchIds(roleIds);
- accountInsertDTO.setAccount(manageAccount);
- accountInsertDTO.setRoles(roles);
- accountInsertDTO.setCode(AccountInsertDTO.SUCCESS);
- return accountInsertDTO;
+ accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(manageAccount.getUserName() + ";")
+ .append("account���" + manageAccount.getAccount() + ";");
+ logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+
+ return accountDTO;
}
/**
@@ -247,39 +227,67 @@
* @Date: 2021/3/15
*/
@Override
- public AccountQueryDTO queryAccount(AccountQueryRequest accountQueryRequest) {
+ public AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm) {
AccountQueryDTO accountQueryDTO = new AccountQueryDTO();
+
//������
- Integer pageCount = accountQueryRequest.getPage();
- Integer size = accountQueryRequest.getSize();
- Integer accountId = accountQueryRequest.getAccountId();
- String account = accountQueryRequest.getAccount();
- String userName = accountQueryRequest.getUserName();
- String email = accountQueryRequest.getEmail();
- String mobile = accountQueryRequest.getMobile();
- String wechat = accountQueryRequest.getWechat();
- String isDelete = accountQueryRequest.getIsDelete();
- //������������������
- Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("id", accountId);
- queryParams.put("account", account);
- queryParams.put("user_name", userName);
- queryParams.put("email", email);
- queryParams.put("mobile", mobile);
- queryParams.put("wechat", wechat);
- if(!ObjectUtils.isEmpty(isDelete))
- queryParams.put("is_delete", isDelete);
+ Integer page = accountQueryForm.getPage();
+ Integer size = accountQueryForm.getSize();
+ String userName = accountQueryForm.getUserName();
+ String email = accountQueryForm.getEmail();
+ String mobile = accountQueryForm.getMobile();
+ String wechat = accountQueryForm.getWechat();
+ String isDelete = accountQueryForm.getIsDelete();
+ String order = accountQueryForm.getOrder();
+ String orderType = accountQueryForm.getOrderType();
+ Date createStartTime = accountQueryForm.getCreateStartTime();
+ Date createEndTime = accountQueryForm.getCreateEndTime();
+
+ //������������������
+ Page<ManageAccount> queryPage = new Page<>(page, size);
+ NullFilterWrapper<ManageAccount> wrapper = new NullFilterWrapper<>();
+
+ wrapper.like("user_name", userName);
+ wrapper.like("email", email);
+ wrapper.like("mobile", mobile);
+ wrapper.like("wechat", wechat);
+ wrapper.between("create_time", createStartTime, createEndTime);
+
+ if (!ObjectUtils.isEmpty(order) && !ObjectUtils.isEmpty(orderType)) { //������������������������
+ if (orderType.equals(Constants.ORDER_ASC))
+ wrapper.orderByAsc(ConvertUtils.toLine(order));
+ else
+ wrapper.orderByDesc(ConvertUtils.toLine(order));
+ }
+
+ if (!ObjectUtils.isEmpty(isDelete))//������������������������
+ wrapper.eq("is_delete", isDelete);
else
- queryParams.put("is_delete","0");
- //���������null���������
- queryParams.values().removeIf(value -> ObjectUtils.isEmpty(value));
- //������������
- Page<ManageAccount> page = new Page<>(pageCount, size);
- QueryWrapper<ManageAccount> wrapper = new QueryWrapper();
- wrapper.allEq(queryParams);
- Page resultPage = manageAccountMapper.selectPage(page, wrapper);
- //���������������������������
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+
+ //������������
+ Page resultPage = manageAccountMapper.selectPage(queryPage, wrapper);
List<ManageAccount> accounts = resultPage.getRecords();
+ //������������������������������admin������admin���������������������
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken();
+ List<ManageRole> ownRoles = accountInfoDTO.getRoles();
+ boolean ownAdminRole = false;
+ for (ManageRole ownRole : ownRoles) {
+ String roleName = ownRole.getName();
+ if ("admin".equals(roleName))
+ ownAdminRole = true;
+ }
+ if (!ownAdminRole) {
+ accounts.removeIf(new Predicate<ManageAccount>() {
+ @Override
+ public boolean test(ManageAccount manageAccount) {
+ if (manageAccount.getAccount().equals("admin"))
+ return true;
+ return false;
+ }
+ });
+ }
+ //���������������������������
List<AccountDTO> accountDTOS = new ArrayList<>();
for (ManageAccount manageAccount : accounts) {
AccountDTO accountDTO = new AccountDTO();
@@ -288,143 +296,148 @@
accountDTO.setAccount(manageAccount);
accountDTOS.add(accountDTO);
}
+
+
//������������������
accountQueryDTO.setAccountDTOS(accountDTOS);
accountQueryDTO.setCurrent(resultPage.getCurrent());
accountQueryDTO.setPages(resultPage.getPages());
accountQueryDTO.setSize(resultPage.getSize());
accountQueryDTO.setTotal(resultPage.getTotal());
+ accountQueryDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountQueryDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return accountQueryDTO;
}
/**
- * @Description: ������������������
- * @Param: [accountUpdateRequest]
- * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
- * @Author: ���������
- * @Date: 2021/3/16
- */
+ * @Description: ������������������
+ * @Param: [accountDeleteRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
@Override
@Transactional
- public AccountUpdateDTO updateAccount(AccountUpdateRequest accountUpdateRequest) {
- AccountUpdateDTO accountUpdateDTO = new AccountUpdateDTO();
+ public AccountDTO deleteAccount(AccountDeleteForm accountDeleteForm) {
+ AccountDTO accountDTO = new AccountDTO();
//������
- Integer accountId = accountUpdateRequest.getAccountId();
- String email = accountUpdateRequest.getEmail();
- String mobile = accountUpdateRequest.getMobile();
- String wechat = accountUpdateRequest.getWechat();
- String userName = accountUpdateRequest.getUserName();
- List<Integer> roleIds = accountUpdateRequest.getRoleIds();
- //������������������������������
- /*������������������������������������*/
- QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
- ManageAccount exitManageAccount = new ManageAccount();
- exitManageAccount.setId(accountId);
- exitManageAccount.setIsDelete("0");
- exitWrapper.setEntity(exitManageAccount);
- List<ManageAccount> manageAccounts = manageAccountMapper.selectList(exitWrapper);
- if(ObjectUtils.isEmpty(manageAccounts)){
- accountUpdateDTO.setCode(AccountUpdateDTO.ACCOUNT_NOT_EXIST);
- return accountUpdateDTO;
- }
- /*���������������������������������*/
- if (!isValidMobile(mobile)) {
- accountUpdateDTO.setCode(AccountUpdateDTO.MOBILE_INVALID);
- return accountUpdateDTO;
- }
- /*������������������������������*/
- if (!isValidEmail(email)) {
- accountUpdateDTO.setCode(AccountUpdateDTO.EMAIL_INVALID);
- return accountUpdateDTO;
- }
- //������ManageAccount���
+ Integer accountId = accountDeleteForm.getAccountId();
+ //���������������������������������������������
ManageAccount manageAccount = new ManageAccount();
- manageAccount.setEmail(email);
- manageAccount.setMobile(mobile);
- manageAccount.setWechat(wechat);
- manageAccount.setUserName(userName);
- QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
- wrapper.eq("id",accountId);
- manageAccountMapper.update(manageAccount,wrapper);
- //������ManageAccountRole���
- /*������������������������������*/
- QueryWrapper<ManageAccountRole> deleteWrapper = new QueryWrapper<>();
- deleteWrapper.eq("account_id",accountId);
- manageAccountRoleMapper.delete(deleteWrapper);
- /*������������������*/
- for (Integer roleId : roleIds) {
- ManageAccountRole manageAccountRole = new ManageAccountRole();
- manageAccountRole.setAccountId(accountId);
- manageAccountRole.setRoleId(roleId);
- manageAccountRoleMapper.insert(manageAccountRole);
- }
- //������������������������
- List<ManageRole> manageRoles = manageRoleMapper.selectBatchIds(roleIds);
- //������������������
- accountUpdateDTO.setCode(AccountUpdateDTO.SUCCESS);
- accountUpdateDTO.setRoles(manageRoles);
- accountUpdateDTO.setAccount(manageAccountMapper.selectById(accountId));
- return accountUpdateDTO;
- }
-
-
- /**
- * @Description: ������������������
- * @Param: [accountDeleteRequest]
- * @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
- * @Author: ���������
- * @Date: 2021/3/16
- */
- @Override
- @Transactional
- public AccountDeleteDTO deleteAccount(AccountDeleteRequest accountDeleteRequest) {
- AccountDeleteDTO accountDeleteDTO = new AccountDeleteDTO();
- //������
- Integer accountId = accountDeleteRequest.getAccountId();
- //������������������
- ManageAccount manageAccount = new ManageAccount();
- manageAccount.setIsDelete("0");
+ manageAccount.setIsDelete(Constants.NOT_DELETE);
manageAccount.setId(accountId);
QueryWrapper<ManageAccount> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(manageAccount);
- ManageAccount existManageAccount = manageAccount.selectOne(queryWrapper);
- if(ObjectUtils.isEmpty(existManageAccount)){
- accountDeleteDTO.setCode(AccountDeleteDTO.ACCOUNT_NOT_EXIST);
- return accountDeleteDTO;
+ ManageAccount existManageAccount = manageAccountMapper.selectOne(queryWrapper);
+ if (ObjectUtils.isEmpty(existManageAccount)) {
+ accountDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return accountDTO;
}
//������������������
- existManageAccount.setIsDelete("1");
UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
- deleteAccountWrapper.set("is_delete","1").eq("id",manageAccount.getId());
- manageAccountMapper.update(null,deleteAccountWrapper);
+ deleteAccountWrapper.eq("id", accountId);
+ deleteAccountWrapper.set("is_delete", Constants.DELETE);
+ manageAccountMapper.update(null, deleteAccountWrapper);
//������������������������������
UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
- deleteManageAccountRoleWrapper.set("is_delete","1").eq("account_id",manageAccount.getId());
- manageAccountRoleMapper.update(null,deleteManageAccountRoleWrapper);
+ deleteManageAccountRoleWrapper.set("is_delete", Constants.DELETE).eq("account_id", manageAccount.getId());
+ manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
+ //������token
+ TokenUtils.destoryToken(accountId);
//������������������
- accountDeleteDTO.setCode(AccountDeleteDTO.SUCCESS);
- accountDeleteDTO.setAccount(existManageAccount);
- return accountDeleteDTO;
+ accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(existManageAccount.getUserName() + ";")
+ .append("������:" + existManageAccount.getAccount() + ";");
+ logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+
+ return accountDTO;
}
+ /**
+ * @Description: ������������������
+ * @Param: [accountUpdateRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
+ @Override
+ @Transactional
+ public AccountDTO updateAccount(AccountUpdateForm accountUpdateForm) {
+ AccountDTO accountDTO = new AccountDTO();
+ //������
+ ManageAccount manageAccount = accountUpdateForm.formConvertEntity();
- private static boolean isSpecialChar(String str) {
- Pattern pattern = Pattern.compile(specialCharRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
+ //������������������������������������������
+ QueryWrapper<ManageAccount> oldAccountWrapper = new QueryWrapper<>();
+ ManageAccount oldManageAccount = new ManageAccount();
+ oldManageAccount.setId(manageAccount.getId());
+ oldManageAccount.setIsDelete(Constants.NOT_DELETE);
+ oldAccountWrapper.setEntity(oldManageAccount);
+ oldManageAccount = manageAccountMapper.selectOne(oldAccountWrapper);
+ if (ObjectUtils.isEmpty(oldManageAccount)) {
+ accountDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return accountDTO;
+ }
+
+ //������ManageAccount���
+ manageAccountMapper.updateById(manageAccount);
+
+ //������������������
+ insertUpdateLog(accountUpdateForm, oldManageAccount);
+ //������token
+ TokenUtils.destoryToken(manageAccount.getId());
+ //������������������
+ accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return accountDTO;
}
- private static boolean isValidMobile(String str) {
- Pattern pattern = Pattern.compile(mobileRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
- }
-
- private static boolean isValidEmail(String str) {
- Pattern pattern = Pattern.compile(emailRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
+ /**
+ * @Description: ���������������������������
+ * @Param: [form, newAccount, oldAccount]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/8
+ */
+ private void insertUpdateLog(AccountUpdateForm updateForm, ManageAccount oldAccount) {
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(oldAccount.getUserName() + ";")
+ .append("������:" + oldAccount.getAccount() + ";");
+ //������������Map,���������������������������������
+ Map<String, Object> newParameters = JSONObject.parseObject(JSON.toJSONString(updateForm), Map.class);
+ Map<String, Object> oldParameters = JSONObject.parseObject(JSON.toJSONString(oldAccount), Map.class);
+ //������������������������Map���������������������������
+ Set<String> keys = manageAccountFormMap.keySet();
+ for (String key : keys) {
+ String value = manageAccountFormMap.get(key);//���������������������
+ if ("password".equals(key)) {//������������������������������������������
+ if (!ObjectUtils.isEmpty(updateForm.getPassword())) {//���������������������������������
+ content.append("���������������;");
+ }
+ } else {//������������������
+ if (newParameters.get(key) != null) {
+ String newValue = "���";
+ String oldValue = "���";
+ if (newParameters.get(key) != null && !newParameters.get(key).equals(" ")) {
+ newValue = String.valueOf(newParameters.get(key));
+ }
+ if (oldParameters.get(key) != null && !oldParameters.get(key).equals(" ")) {
+ oldValue = String.valueOf(oldParameters.get(key));
+ }
+ content.append(value + ":" + oldValue + "->" + newValue + ";");
+ }
+ }
+ }
+ logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
}
--
Gitblit v1.8.0