From 2ddf3630707aa6515f8c193334f928d5255542cd Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 15 Mar 2021 08:24:05 +0800
Subject: [PATCH] manage模块： 添加账户功能完成
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 144 insertions(+), 29 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 07f3022..389c024 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
@@ -2,13 +2,19 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.ManageAccount;
+import com.moral.api.entity.ManageAccountRole;
import com.moral.api.entity.ManageMenu;
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.AccountDTO;
import com.moral.api.pojo.dto.AccountInfoDTO;
import com.moral.api.pojo.dto.LoginDTO;
+import com.moral.api.pojo.request.AccountAddRequest;
+import com.moral.api.pojo.request.LoginRequest;
+import com.moral.api.pojo.request.LogoutRequest;
import com.moral.api.service.ManageAccountService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.util.AESUtils;
@@ -16,10 +22,13 @@
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* <p>
@@ -35,12 +44,19 @@
@Value("${AES.KEY}")
private String AESKey;
@Resource
- ManageAccountMapper accountMapper;
+ ManageAccountMapper manageAccountMapper;
@Resource
- ManageRoleMapper roleMapper;
+ ManageRoleMapper manageRoleMapper;
@Resource
ManageMenuMapper manageMenuMapper;
+ @Resource
+ ManageAccountRoleMapper manageAccountRoleMapper;
+ public final static String specialCharRegEx = "[ _`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~���@#���%������&*������������+|{}������������������������������������]|\n|\r|\t";
+
+ 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+)*$";
/**
* @Description: ������
* @Param: [parameters]
@@ -49,15 +65,18 @@
* @Date: 2021/3/11
*/
@Override
- public LoginDTO login(String AESAccount,String AESPassword) {
+ public LoginDTO login(LoginRequest loginRequest) {
LoginDTO loginDTO = new LoginDTO();
+ //������
+ String AESAccount = loginRequest.getAccount();
+ String AESPassword = loginRequest.getPassword();
//������
String account = AESUtils.decrypt(AESAccount, AESKey);
String password = AESUtils.decrypt(AESPassword, AESKey);
//������������������
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("account", account);
- ManageAccount manageAccount = accountMapper.selectOne(wrapper);
+ ManageAccount manageAccount = manageAccountMapper.selectOne(wrapper);
if (ObjectUtils.isEmpty(manageAccount)) {
loginDTO.setCode(LoginDTO.NOT_EXIST);
return loginDTO;
@@ -74,7 +93,7 @@
}
//������������
- List<ManageRole> roles = roleMapper.getManageRoleByAccountId(manageAccount.getId());
+ List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
if (ObjectUtils.isEmpty(roles)) {//������������������������������
loginDTO.setCode(LoginDTO.ROLE_EMPTY);
return loginDTO;
@@ -86,38 +105,18 @@
return loginDTO;
}
-
//������������������
AccountInfoDTO accountInfoDTO = new AccountInfoDTO();
- /*������������������������*/
- ArrayList<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
- /*������menu������������*/
- for (ManageMenu menu : menus) {
- menu.setCreateTime(null);
- menu.setIsDelete(null);
- menu.setUpdateTime(null);
- menu.setParentId(null);
- List<ManageMenu> children = menu.getChildren();
- for (ManageMenu child : children) {
- child.setCreateTime(null);
- child.setIsDelete(null);
- child.setUpdateTime(null);
- child.setParentId(null);
- }
- }
- accountInfoDTO.setAccountId(String.valueOf(manageAccount.getId()));
- accountInfoDTO.setAccountName(manageAccount.getUserName());
+ accountInfoDTO.setAccount(manageAccount);
accountInfoDTO.setMenus(menus);
- accountInfoDTO.setRoles(roleNames);
-
+ accountInfoDTO.setRoles(roles);
//������token ������������������
String token = TokenUtils.getToken(String.valueOf(manageAccount.getId()), accountInfoDTO);
//������������������
loginDTO.setCode(LoginDTO.SUCCESS);
- loginDTO.setAccountInfo(accountInfoDTO);
+ loginDTO.setAccountInfoDTO(accountInfoDTO);
loginDTO.setToken(token);
return loginDTO;
@@ -131,11 +130,127 @@
* @Date: 2021/3/11
*/
@Override
- public boolean logout(String accountId,String token) {
+ public boolean logout(LogoutRequest logoutRequest) {
+ String accountId = logoutRequest.getAccountId();
+ String token = logoutRequest.getToken();
TokenUtils.destoryToken(accountId,token);
return true;
}
+ /**
+ * @Description: ������������������
+ * @Param: [accountAddRequest]
+ * @return: com.moral.api.pojo.dto.AccountDTO
+ * @Author: ���������
+ * @Date: 2021/3/13
+ */
+ @Override
+ @Transactional
+ public AccountDTO addAccount(AccountAddRequest accountAddRequest) {
+ AccountDTO accountDTO = new AccountDTO();
+ //������
+ String AESAccount = accountAddRequest.getAccount();
+ String AESPassword = accountAddRequest.getPassword();
+ String account = AESUtils.decrypt(AESAccount,AESKey);
+ String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword,AESKey));
+ String userName = accountAddRequest.getUserName();
+ String email = accountAddRequest.getEmail();
+ String mobile = accountAddRequest.getMobile();
+ String wechat = accountAddRequest.getWechat();
+ String isDelete = accountAddRequest.getIsDelete();
+ List<String> roleIdsStr = accountAddRequest.getRoleIds();
+ //������������������������������������
+ /*���������������������������������������*/
+ if(isSpecialChar(account)){
+ accountDTO.setCode(AccountDTO.ACCOUNT_EXIST_SPECIAL_CHAR);
+ return accountDTO;
+ }
+ /*������������������������������������*/
+ if(isSpecialChar(password)){
+ accountDTO.setCode(AccountDTO.PASSWORD_EXIST_SPECIAL_CHAR);
+ return accountDTO;
+ }
+ /*���������������������������������*/
+ if(account.length()>=20){
+ accountDTO.setCode(AccountDTO.ACCOUNT_LENGTH_INVALID);
+ return accountDTO;
+ }
+ /*������������������������������*/
+ if(AESUtils.decrypt(AESPassword,AESKey).length()>=20){
+ accountDTO.setCode(AccountDTO.PASSWORD_LENGTH_INVALID);
+ return accountDTO;
+ }
+ /*���������������������������������*/
+ if(!isValidMobile(mobile)){
+ accountDTO.setCode(AccountDTO.MOBILE_INVALID);
+ return accountDTO;
+ }
+ /*������������������������������*/
+ if(!isValidEmail(email)){
+ accountDTO.setCode(AccountDTO.EMAIL_INVALID);
+ return accountDTO;
+ }
+ /*���������������������������*/
+ ManageAccount exitAccount = new ManageAccount();
+ exitAccount.setAccount(account);
+ QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
+ wrapper.setEntity(exitAccount);
+ List<ManageAccount> exitAccounts = manageAccountMapper.selectList(wrapper);
+ if(!ObjectUtils.isEmpty(exitAccounts)){
+ accountDTO.setCode(AccountDTO.ACCOUNT_EXIST);
+ 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);
+ manageAccount.setIsDelete(isDelete);
+ 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);
+ }
+ );
+ //������������������
+ List<ManageRole> roles = manageRoleMapper.selectBatchIds(roleIds);
+ accountDTO.setAccount(manageAccount);
+ accountDTO.setRoles(roles);
+ accountDTO.setCode(AccountDTO.SUCCESS);
+ return accountDTO;
+ }
+
+ private static boolean isSpecialChar(String str){
+ Pattern pattern = Pattern.compile(specialCharRegEx);
+ Matcher matcher = pattern.matcher(str);
+ return matcher.find();
+ }
+
+ 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();
+ }
+
}
--
Gitblit v1.8.0