From 1ec0374d08be45c6c6854705211dbd6c067dfab7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 17:23:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 394 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 268 insertions(+), 126 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 389c024..641d362 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,6 +1,8 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageAccount;
import com.moral.api.entity.ManageAccountRole;
import com.moral.api.entity.ManageMenu;
@@ -9,17 +11,18 @@
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.pojo.dto.account.*;
+import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.pojo.dto.login.LoginDTO;
+import com.moral.api.pojo.form.*;
import com.moral.api.service.ManageAccountService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
import com.moral.util.TokenUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -41,68 +44,67 @@
@Service
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {
- @Value("${AES.KEY}")
- private String AESKey;
- @Resource
+
+ @Autowired
ManageAccountMapper manageAccountMapper;
- @Resource
+ @Autowired
ManageRoleMapper manageRoleMapper;
- @Resource
+ @Autowired
ManageMenuMapper manageMenuMapper;
- @Resource
+ @Autowired
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]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/11
*/
@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);
- ManageAccount manageAccount = manageAccountMapper.selectOne(wrapper);
- if (ObjectUtils.isEmpty(manageAccount)) {
- loginDTO.setCode(LoginDTO.NOT_EXIST);
+ List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wrapper);
+ if (ObjectUtils.isEmpty(manageAccounts)) {
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
//������������������������
- if (manageAccount.getIsDelete().equals("1")) {
- loginDTO.setCode(LoginDTO.IS_DELETE);
+ ManageAccount manageAccount = null;
+ for (ManageAccount value : manageAccounts) {
+ if (Constants.NOT_DELETE.equals(value.getIsDelete()))
+ manageAccount = value;
+ }
+
+ if (ObjectUtils.isEmpty(manageAccount)) {
+ 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 = null;
+ if (!ObjectUtils.isEmpty(roles)) {
+ menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
}
//������������������
@@ -115,7 +117,8 @@
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);
@@ -125,85 +128,51 @@
/**
* @Description: ������
* @Param: [parameters]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/11
*/
@Override
- public boolean logout(LogoutRequest logoutRequest) {
- String accountId = logoutRequest.getAccountId();
- String token = logoutRequest.getToken();
- TokenUtils.destoryToken(accountId,token);
+ public boolean logout(LogoutForm logoutForm) {
+ String accountId = logoutForm.getAccountId();
+ String token = logoutForm.getToken();
+ TokenUtils.destoryToken(accountId, token);
return true;
}
/**
- * @Description: ������������������
- * @Param: [accountAddRequest]
- * @return: com.moral.api.pojo.dto.AccountDTO
- * @Author: ���������
- * @Date: 2021/3/13
- */
+ * @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();
+ public AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm) {
+ AccountInsertDTO accountInsertDTO = new AccountInsertDTO();
//������
- 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;
- }
- /*���������������������������*/
+ String account = accountInsertForm.getAccount();
+ String AESPassword = accountInsertForm.getPassword();
+ String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword));
+ String userName = accountInsertForm.getUserName();
+ String email = accountInsertForm.getEmail();
+ String mobile = accountInsertForm.getMobile();
+ String wechat = accountInsertForm.getWechat();
+ List<String> roleIdsStr = accountInsertForm.getRoleIds();
+
+ /*������������������������*/
ManageAccount exitAccount = new ManageAccount();
exitAccount.setAccount(account);
+ exitAccount.setIsDelete(Constants.NOT_DELETE);
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;
+ if (!ObjectUtils.isEmpty(exitAccounts)) {
+ accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
+ return accountInsertDTO;
}
-
- //String to Integer
- List<Integer> roleIds = new ArrayList<>();
- roleIdsStr.forEach(str->roleIds.add(Integer.parseInt(str)));
//������account
ManageAccount manageAccount = new ManageAccount();
@@ -213,44 +182,217 @@
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);
- }
- );
+ /*String to Integer*/
+ List<ManageRole> roles = null;
+ //������������������������������������������������������
+ if (!ObjectUtils.isEmpty(roleIdsStr)) {
+ List<Integer> roleIds = new ArrayList<>();
+ roleIdsStr.forEach(str -> roleIds.add(Integer.parseInt(str)));
+
+ Integer accountId = manageAccount.getId();
+ roleIdsStr.forEach(
+ value -> {
+ ManageAccountRole manageAccountRole = new ManageAccountRole();
+ manageAccountRole.setAccountId(accountId);
+ manageAccountRole.setRoleId(Integer.parseInt(value));
+ manageAccountRoleMapper.insert(manageAccountRole);
+ }
+ );
+ roles = manageRoleMapper.selectBatchIds(roleIds);
+ }
//������������������
- List<ManageRole> roles = manageRoleMapper.selectBatchIds(roleIds);
- accountDTO.setAccount(manageAccount);
- accountDTO.setRoles(roles);
- accountDTO.setCode(AccountDTO.SUCCESS);
- return accountDTO;
+ accountInsertDTO.setAccount(manageAccount);
+ accountInsertDTO.setRoles(roles);
+ accountInsertDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return accountInsertDTO;
}
- private static boolean isSpecialChar(String str){
- Pattern pattern = Pattern.compile(specialCharRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
+ /**
+ * @Description: ������������������
+ * @Param: [accountQueryRequest]
+ * @return: com.moral.api.pojo.dto.AccountDTO
+ * @Author: ���������
+ * @Date: 2021/3/15
+ */
+ @Override
+ public AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm) {
+ AccountQueryDTO accountQueryDTO = new AccountQueryDTO();
+ //������
+ Integer pageCount = accountQueryForm.getPage();
+ Integer size = accountQueryForm.getSize();
+ Integer accountId = accountQueryForm.getAccountId();
+ String account = accountQueryForm.getAccount();
+ String userName = accountQueryForm.getUserName();
+ String email = accountQueryForm.getEmail();
+ String mobile = accountQueryForm.getMobile();
+ String wechat = accountQueryForm.getWechat();
+ String isDelete = accountQueryForm.getIsDelete();
+
+ //������������
+ Page<ManageAccount> page = new Page<>(pageCount, size);
+ QueryWrapper<ManageAccount> wrapper = new QueryWrapper();
+ if(!ObjectUtils.isEmpty(accountId)){
+ wrapper.eq("id",accountId);
+ }
+
+ if(!ObjectUtils.isEmpty(userName)){
+ wrapper.like("user_name",userName);
+ }
+
+ if(!ObjectUtils.isEmpty(account)){
+ wrapper.like("account",account);
+ }
+
+ if(!ObjectUtils.isEmpty(email)){
+ wrapper.like("email",email);
+ }
+
+ if(!ObjectUtils.isEmpty(mobile)){
+ wrapper.like("mobile",mobile);
+ }
+
+ if(!ObjectUtils.isEmpty(wechat)){
+ wrapper.like("wechat",wechat);
+ }
+
+ if (!ObjectUtils.isEmpty(isDelete))
+ wrapper.eq("is_delete", isDelete);
+ else
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+
+ Page resultPage = manageAccountMapper.selectPage(page, wrapper);
+ //���������������������������
+ List<ManageAccount> accounts = resultPage.getRecords();
+ List<AccountDTO> accountDTOS = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(accounts)) {
+ for (ManageAccount manageAccount : accounts) {
+ AccountDTO accountDTO = new AccountDTO();
+ List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
+ accountDTO.setRoles(roles);
+ 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;
}
- private static boolean isValidMobile(String str){
- Pattern pattern = Pattern.compile(mobileRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
+ /**
+ * @Description: ������������������
+ * @Param: [accountUpdateRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
+ @Override
+ @Transactional
+ public AccountUpdateDTO updateAccount(AccountUpdateForm accountUpdateForm) {
+ AccountUpdateDTO accountUpdateDTO = new AccountUpdateDTO();
+ //������
+ Integer accountId = accountUpdateForm.getAccountId();
+ String email = accountUpdateForm.getEmail();
+ String mobile = accountUpdateForm.getMobile();
+ String wechat = accountUpdateForm.getWechat();
+ String userName = accountUpdateForm.getUserName();
+ List<Integer> roleIds = accountUpdateForm.getRoleIds();
+ //������������������������������
+ /*������������������������������������*/
+ QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
+ ManageAccount exitManageAccount = new ManageAccount();
+ exitManageAccount.setId(accountId);
+ exitManageAccount.setIsDelete(Constants.NOT_DELETE);
+ exitWrapper.setEntity(exitManageAccount);
+ List<ManageAccount> manageAccounts = manageAccountMapper.selectList(exitWrapper);
+ if (ObjectUtils.isEmpty(manageAccounts)) {
+ accountUpdateDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return accountUpdateDTO;
+ }
+ //������ManageAccount���
+ 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(ResponseCodeEnum.SUCCESS.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ accountUpdateDTO.setRoles(manageRoles);
+ accountUpdateDTO.setAccount(manageAccountMapper.selectById(accountId));
+ return accountUpdateDTO;
}
- private static boolean isValidEmail(String str){
- Pattern pattern = Pattern.compile(emailRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
+
+ /**
+ * @Description: ������������������
+ * @Param: [accountDeleteRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
+ @Override
+ @Transactional
+ public AccountDeleteDTO deleteAccount(AccountDeleteForm accountDeleteForm) {
+ AccountDeleteDTO accountDeleteDTO = new AccountDeleteDTO();
+ //������
+ Integer accountId = accountDeleteForm.getAccountId();
+ //������������������
+ ManageAccount manageAccount = new ManageAccount();
+ 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(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountDeleteDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return accountDeleteDTO;
+ }
+ //������������������
+ existManageAccount.setIsDelete(Constants.DELETE);
+ UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
+ deleteAccountWrapper.set("is_delete", Constants.DELETE).eq("id", manageAccount.getId());
+ manageAccountMapper.update(null, deleteAccountWrapper);
+ //������������������������������
+ UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
+ deleteManageAccountRoleWrapper.set("is_delete", Constants.DELETE).eq("account_id", manageAccount.getId());
+ manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
+ //������������������
+ accountDeleteDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountDeleteDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ accountDeleteDTO.setAccount(existManageAccount);
+ return accountDeleteDTO;
}
+
}
--
Gitblit v1.8.0