From 466ee3bc7c7bccf1e74ba46289900e24e6784d7b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 17 Mar 2021 11:49:41 +0800
Subject: [PATCH] common模块： 添加常量枚举
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 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 a78cd9b..41b198b 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,7 @@
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;
@@ -10,10 +11,7 @@
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.AccountDTO;
-import com.moral.api.pojo.dto.account.AccountInsertDTO;
-import com.moral.api.pojo.dto.account.AccountQueryDTO;
-import com.moral.api.pojo.dto.account.AccountUpdateDTO;
+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.request.*;
@@ -79,13 +77,19 @@
//������������������
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("account", account);
- ManageAccount manageAccount = manageAccountMapper.selectOne(wrapper);
- if (ObjectUtils.isEmpty(manageAccount)) {
+ List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wrapper);
+ if (ObjectUtils.isEmpty(manageAccounts)) {
loginDTO.setCode(LoginDTO.NOT_EXIST);
return loginDTO;
}
//������������������������
- if (manageAccount.getIsDelete().equals("1")) {
+ ManageAccount manageAccount = null;
+ for (ManageAccount value : manageAccounts) {
+ if("0".equals(value.getIsDelete()))
+ manageAccount = value;
+ }
+
+ if (ObjectUtils.isEmpty(manageAccount)) {
loginDTO.setCode(LoginDTO.IS_DELETE);
return loginDTO;
}
@@ -160,7 +164,6 @@
String email = accountInsertRequest.getEmail();
String mobile = accountInsertRequest.getMobile();
String wechat = accountInsertRequest.getWechat();
- String isDelete = accountInsertRequest.getIsDelete();
List<String> roleIdsStr = accountInsertRequest.getRoleIds();
//������������������������������������
/*���������������������������������������*/
@@ -193,7 +196,7 @@
accountInsertDTO.setCode(AccountInsertDTO.EMAIL_INVALID);
return accountInsertDTO;
}
- /*���������������������������*/
+ /*������������������������*/
ManageAccount exitAccount = new ManageAccount();
exitAccount.setAccount(account);
exitAccount.setIsDelete("0");
@@ -217,7 +220,6 @@
manageAccount.setEmail(email);
manageAccount.setMobile(mobile);
manageAccount.setWechat(wechat);
- manageAccount.setIsDelete(isDelete);
manageAccountMapper.insert(manageAccount);
//������account_role
Integer accountId = manageAccount.getId();
@@ -265,7 +267,11 @@
queryParams.put("email", email);
queryParams.put("mobile", mobile);
queryParams.put("wechat", wechat);
- queryParams.put("is_delete", isDelete);
+ if(!ObjectUtils.isEmpty(isDelete))
+ queryParams.put("is_delete", isDelete);
+ else
+ queryParams.put("is_delete","0");
+ //���������null���������
queryParams.values().removeIf(value -> ObjectUtils.isEmpty(value));
//������������
Page<ManageAccount> page = new Page<>(pageCount, size);
@@ -292,6 +298,13 @@
return accountQueryDTO;
}
+ /**
+ * @Description: ������������������
+ * @Param: [accountUpdateRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
@Override
@Transactional
public AccountUpdateDTO updateAccount(AccountUpdateRequest accountUpdateRequest) {
@@ -301,7 +314,6 @@
String email = accountUpdateRequest.getEmail();
String mobile = accountUpdateRequest.getMobile();
String wechat = accountUpdateRequest.getWechat();
- String isDelete = accountUpdateRequest.getIsDelete();
String userName = accountUpdateRequest.getUserName();
List<Integer> roleIds = accountUpdateRequest.getRoleIds();
//������������������������������
@@ -331,7 +343,6 @@
manageAccount.setEmail(email);
manageAccount.setMobile(mobile);
manageAccount.setWechat(wechat);
- manageAccount.setIsDelete(isDelete);
manageAccount.setUserName(userName);
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("id",accountId);
@@ -358,7 +369,44 @@
}
-
+ /**
+ * @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.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;
+ }
+ //������������������
+ existManageAccount.setIsDelete("1");
+ UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
+ deleteAccountWrapper.set("is_delete","1").eq("id",manageAccount.getId());
+ manageAccountMapper.update(null,deleteAccountWrapper);
+ //������������������������������
+ UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
+ deleteManageAccountRoleWrapper.set("is_delete","1").eq("account_id",manageAccount.getId());
+ manageAccountRoleMapper.update(null,deleteManageAccountRoleWrapper);
+ //������������������
+ accountDeleteDTO.setCode(AccountDeleteDTO.SUCCESS);
+ accountDeleteDTO.setAccount(existManageAccount);
+ return accountDeleteDTO;
+ }
private static boolean isSpecialChar(String str) {
--
Gitblit v1.8.0