From 4d5eff3b824dac8e50400b2ec1114cba4ed6a87c Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 07 Apr 2021 17:05:43 +0800 Subject: [PATCH] screen-manage 完成sysarea模块查询 拦截器逻辑代码完成 修改organization和accountBug --- screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 332 ++++++++++++++++++++---------------------------------- 1 files changed, 123 insertions(+), 209 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 d5f40cb..9d89da3 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 @@ -14,23 +14,25 @@ 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.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.api.config.mybatis.wrapper.NullFilterWrapper; +import com.moral.api.service.ManageMenuService; +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 com.moral.util.*; 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; import org.springframework.util.ObjectUtils; -import javax.annotation.Resource; import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * <p> @@ -43,30 +45,24 @@ @Service public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService { - @Value("${AES.KEY}") - private String AESKey; + @Autowired ManageAccountMapper manageAccountMapper; @Autowired ManageRoleMapper manageRoleMapper; @Autowired - ManageMenuMapper manageMenuMapper; + ManageMenuService manageMenuService; @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> - * @Author: ��������� - * @Date: 2021/3/11 - */ + * @Description: ������������ + * @Param: [loginForm] + * @return: com.moral.api.pojo.dto.login.LoginDTO + * @Author: ��������� + * @Date: 2021/3/30 + */ @Override public LoginDTO login(LoginForm loginForm) { LoginDTO loginDTO = new LoginDTO(); @@ -74,7 +70,7 @@ String account = loginForm.getAccount(); String AESPassword = loginForm.getPassword(); //������ - String password = AESUtils.decrypt(AESPassword, AESKey); + String password = AESUtils.decrypt(AESPassword); //������������������ QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>(); wrapper.eq("account", account); @@ -87,7 +83,7 @@ //������������������������ ManageAccount manageAccount = null; for (ManageAccount value : manageAccounts) { - if ("0".equals(value.getIsDelete())) + if (Constants.NOT_DELETE.equals(value.getIsDelete())) manageAccount = value; } @@ -98,8 +94,8 @@ } //������������ if (!MD5Utils.saltMD5Verify(password, manageAccount.getPassword())) { - loginDTO.setCode(ResponseCodeEnum.PASSWORD_INVALID.getCode()); - loginDTO.setMsg(ResponseCodeEnum.PASSWORD_INVALID.getMsg()); + loginDTO.setCode(ResponseCodeEnum.PASSWORD_ERROR.getCode()); + loginDTO.setMsg(ResponseCodeEnum.PASSWORD_ERROR.getMsg()); return loginDTO; } @@ -109,7 +105,7 @@ //������������ List<ManageMenu> menus = null; if (!ObjectUtils.isEmpty(roles)) { - menus = manageMenuMapper.getParentChildrenMenusByRoles(roles); + menus = manageMenuService.getParentChildrenMenusByRoles(roles); } //������������������ @@ -133,7 +129,7 @@ /** * @Description: ������ * @Param: [parameters] - * @return: java.util.Map<java.lang.String , java.lang.Object> + * @return: * @Author: ��������� * @Date: 2021/3/11 */ @@ -154,76 +150,28 @@ */ @Override @Transactional - public AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm) { - AccountInsertDTO accountInsertDTO = new AccountInsertDTO(); + public AccountDTO insertAccount(AccountInsertForm accountInsertForm) { + AccountDTO accountDTO = new AccountDTO(); //������ - String account = accountInsertForm.getAccount(); - String AESPassword = accountInsertForm.getPassword(); - String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword, AESKey)); - String userName = accountInsertForm.getUserName(); - String email = accountInsertForm.getEmail(); - String mobile = accountInsertForm.getMobile(); - String wechat = accountInsertForm.getWechat(); + ManageAccount manageAccount = accountInsertForm.formConvertEntity(); List<String> roleIdsStr = accountInsertForm.getRoleIds(); - //������������������������������������ - /*���������������������������������������*/ - if (isSpecialChar(account)) { - accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST_SPECIAL_CHAR.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST_SPECIAL_CHAR.getMsg()); - return accountInsertDTO; - } - /*������������������������������������*/ - if (isSpecialChar(password)) { - accountInsertDTO.setCode(ResponseCodeEnum.PASSWORD_EXIST_SPECIAL_CHAR.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.PASSWORD_EXIST_SPECIAL_CHAR.getMsg()); - return accountInsertDTO; - } - /*���������������������������������*/ - if (account.length() >= 20 || account.length() <= 6) { - accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_LENGTH_INVALID.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_LENGTH_INVALID.getMsg()); - return accountInsertDTO; - } - /*������������������������������*/ - if (AESUtils.decrypt(AESPassword, AESKey).length() >= 20 || AESUtils.decrypt(AESPassword, AESKey).length() <= 6) { - accountInsertDTO.setCode(ResponseCodeEnum.PASSWORD_LENGTH_INVALID.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.PASSWORD_LENGTH_INVALID.getMsg()); - return accountInsertDTO; - } - /*���������������������������������*/ - if (!isValidMobile(mobile)) { - accountInsertDTO.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg()); - return accountInsertDTO; - } - /*������������������������������*/ - if (!isValidEmail(email)) { - accountInsertDTO.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg()); - return accountInsertDTO; - } + /*������������������������*/ - 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(ResponseCodeEnum.ACCOUNT_EXIST.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST.getMsg()); - 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; } - //������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 /*String to Integer*/ List<ManageRole> roles = null; @@ -244,11 +192,11 @@ roles = manageRoleMapper.selectBatchIds(roleIds); } //������������������ - accountInsertDTO.setAccount(manageAccount); - accountInsertDTO.setRoles(roles); - accountInsertDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); - accountInsertDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); - return accountInsertDTO; + accountDTO.setAccount(manageAccount); + accountDTO.setRoles(roles); + accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); + accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); + return accountDTO; } /** @@ -261,50 +209,45 @@ @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(); + String order = accountQueryForm.getOrder(); + String orderType = accountQueryForm.getOrderType(); + Date createStartTime = accountQueryForm.getCreateStartTime(); + Date createEndTime = DateUtils.getDateOfDay(accountQueryForm.getCreateEndTime(), 1); - //������������ + //������������������ Page<ManageAccount> page = new Page<>(pageCount, size); - QueryWrapper<ManageAccount> wrapper = new QueryWrapper(); - if(!ObjectUtils.isEmpty(accountId)){ - wrapper.eq("id",accountId); + 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(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)) + if (!ObjectUtils.isEmpty(isDelete))//������������������������ wrapper.eq("is_delete", isDelete); else - wrapper.eq("is_delete", "0"); + wrapper.eq("is_delete", Constants.NOT_DELETE); + //������������ Page resultPage = manageAccountMapper.selectPage(page, wrapper); + //��������������������������� List<ManageAccount> accounts = resultPage.getRecords(); List<AccountDTO> accountDTOS = new ArrayList<>(); @@ -317,6 +260,7 @@ accountDTOS.add(accountDTO); } } + //������������������ accountQueryDTO.setAccountDTOS(accountDTOS); accountQueryDTO.setCurrent(resultPage.getCurrent()); @@ -338,69 +282,58 @@ */ @Override @Transactional - public AccountUpdateDTO updateAccount(AccountUpdateForm accountUpdateForm) { - AccountUpdateDTO accountUpdateDTO = new AccountUpdateDTO(); + public AccountDTO updateAccount(AccountUpdateForm accountUpdateForm) { + AccountDTO accountDTO = new AccountDTO(); //������ - Integer accountId = accountUpdateForm.getAccountId(); - String email = accountUpdateForm.getEmail(); - String mobile = accountUpdateForm.getMobile(); - String wechat = accountUpdateForm.getWechat(); - String userName = accountUpdateForm.getUserName(); + ManageAccount manageAccount = accountUpdateForm.formConvertEntity(); List<Integer> roleIds = accountUpdateForm.getRoleIds(); - //������������������������������ - /*������������������������������������*/ + + //������������������������������������ QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>(); ManageAccount exitManageAccount = new ManageAccount(); - exitManageAccount.setId(accountId); - exitManageAccount.setIsDelete("0"); + exitManageAccount.setId(manageAccount.getId()); + 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; + accountDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode()); + accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg()); + return accountDTO; } - /*���������������������������������*/ - if (!isValidMobile(mobile)) { - accountUpdateDTO.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode()); - accountUpdateDTO.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg()); - return accountUpdateDTO; - } - /*������������������������������*/ - if (!isValidEmail(email)) { - accountUpdateDTO.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode()); - accountUpdateDTO.setMsg(ResponseCodeEnum.EMAIL_INVALID.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); + manageAccountMapper.updateById(manageAccount); + + //���������������������������������ManageAccountRole��� + /* + * ������roleIds���null������������������������������������������ + * ������roleIds��������������������������������������������������� + * ������roleIds��������������������������������������������� + * */ + List<ManageRole> roles = null; + 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); + } + //������������������������ + if (roleIds.size() != 0) + roles = manageRoleMapper.selectBatchIds(roleIds); + } else { + roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId()); } - //������������������������ - List<ManageRole> manageRoles = manageRoleMapper.selectBatchIds(roleIds); + accountDTO.setRoles(roles); //������������������ - accountUpdateDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); - accountUpdateDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); - accountUpdateDTO.setRoles(manageRoles); - accountUpdateDTO.setAccount(manageAccountMapper.selectById(accountId)); - return accountUpdateDTO; + accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); + accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); + accountDTO.setAccount(manageAccountMapper.selectById(manageAccount.getId())); + return accountDTO; } @@ -413,55 +346,36 @@ */ @Override @Transactional - public AccountDeleteDTO deleteAccount(AccountDeleteForm accountDeleteForm) { - AccountDeleteDTO accountDeleteDTO = new AccountDeleteDTO(); + public AccountDTO deleteAccount(AccountDeleteForm accountDeleteForm) { + AccountDTO accountDTO = new AccountDTO(); //������ Integer accountId = accountDeleteForm.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); + ManageAccount existManageAccount = manageAccountMapper.selectOne(queryWrapper); if (ObjectUtils.isEmpty(existManageAccount)) { - accountDeleteDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode()); - accountDeleteDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg()); - return accountDeleteDTO; + 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()); + 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()); + 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; - } - - - 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(); + accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); + accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); + accountDTO.setAccount(existManageAccount); + return accountDTO; } -- Gitblit v1.8.0