From 3bf4a89e8470abf09ca61db5a5e8e8e84f45455b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 30 Sep 2020 14:12:56 +0800
Subject: [PATCH] 添加标识符
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 129 ++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index fe05269..69752c4 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -57,6 +57,85 @@
@Resource
private OrganizationMapper organizationMapper;
+
+
+ @Override
+ public Map<String, Object> getAccountInfoById(String accountId) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ Account account = new Account();
+ account.setId(Integer.parseInt(accountId));
+ account = accountMapper.selectOne(account);
+ if (ObjectUtils.isEmpty(account)) {
+ result.put("msg", "token������");
+ result.put("accountId", -1);
+ } else {
+ result = judgeAccountInfo(account);
+ if (!String.valueOf(result.get("accountId")).equals("-1")) {
+ List<Menu> menuList = accountMapper.getScreenMenuListsByAccountName(account.getAccountName());
+ result.put("msg", "���������������");
+ result.put("accountId", account.getId());
+ result.put("orgId", account.getOrganizationId());
+ result.put("data", menuList);
+ setOrgIdsByAccount(result);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> webLogin(Map<String, Object> parameters) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ Account account = new Account();
+ account.setAccountName((String) parameters.get("account"));
+ String rawPassword = (String) parameters.get("password");
+ account = accountMapper.selectOne(account);
+ boolean isValid = account == null ? false : encoder.matches(rawPassword, account.getPassword());
+ if (!isValid) {
+ result.put("msg", "���������������������������������");
+ result.put("accountId", -1);
+ } else {
+ result = judgeAccountInfo(account);
+ }
+ return result;
+ }
+
+
+ @Override
+ public Map<String, Object> screenLoginNew(Map<String, Object> parameters) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ Account account = new Account();
+ account.setAccountName((String) parameters.get("account"));
+ String rawPassword = (String) parameters.get("password");
+// account.setPassword(encoder.encode((String) parameters.get("password")));
+ account = accountMapper.selectOne(account);
+ Integer existRole = null;
+ List<Menu> menuList = new ArrayList<>();
+ if (account != null) {
+ existRole = accountMapper.getScreenRoleByAccountName(account.getAccountName());
+ menuList = accountMapper.getScreenMenuListsByAccountName(account.getAccountName());
+ }
+ boolean isValid = account == null ? false : encoder.matches(rawPassword, account.getPassword());
+ if (!isValid) {
+ result.put("msg", "���������������������������������");
+ result.put("accountId", -1);
+ } else {
+ if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
+ if (existRole != null) {
+ result.put("msg", "���������������");
+ result.put("accountId", account.getId());
+ result.put("orgId", account.getOrganizationId());
+ result.put("data", menuList);
+ setOrgIdsByAccount(result);
+ } else {
+ result.put("msg", "���������������������");
+ }
+ } else {
+ result.put("msg", "���������������������������������������������");
+ }
+ }
+ return result;
+ }
+
@Override
public Map<String, Object> screenLogin(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
@@ -74,37 +153,6 @@
result.put("accountId", account.getId());
result.put("orgId", account.getOrganizationId());
setOrgIdsByAccount(result);
- } else {
- result.put("msg", "���������������������������������������������");
- }
- }
- return result;
- }
-
- @Override
- public Map<String, Object> screenLoginNew(Map<String, Object> parameters) {
- Map<String, Object> result = new HashMap<String, Object>();
- Account account = new Account();
- account.setAccountName((String) parameters.get("account"));
- String rawPassword = (String) parameters.get("password");
-// account.setPassword(encoder.encode((String) parameters.get("password")));
- account = accountMapper.selectOne(account);
- Integer existRole=accountMapper.getScreenRoleByAccountName(account.getAccountName());
- List<Menu> menuList = accountMapper.getScreenMenuListsByAccountName(account.getAccountName());
- boolean isValid = account == null ? false : encoder.matches(rawPassword, account.getPassword());
- if (!isValid) {
- result.put("msg", "���������������������������������");
- } else {
- if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
- if(existRole!=null) {
- result.put("msg", "���������������");
- result.put("accountId", account.getId());
- result.put("orgId", account.getOrganizationId());
- result.put("data",menuList);
- setOrgIdsByAccount(result);
- }else{
- result.put("msg", "���������������������");
- }
} else {
result.put("msg", "���������������������������������������������");
}
@@ -262,7 +310,7 @@
List<Menu> menuList = accountMapper.getParentMenuListsByAccountName(accountName);
Integer organizationId = accountMapper.getByAccountName(accountName).getOrganizationId();
Map<String, Object> organizationMap = new LinkedHashMap<>();
- organizationMap.put("organizationId",organizationId);
+ organizationMap.put("organizationId", organizationId);
String email = accountMapper.getEmailByAccountName(accountName);
Map<String, Object> mapList = new LinkedHashMap<>();
Map<String, Object> appMap = new LinkedHashMap<>();
@@ -318,4 +366,21 @@
return mapList;
}
+ private Map<String, Object> judgeAccountInfo(Account account) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ Integer existRole = accountMapper.getScreenRoleByAccountName(account.getAccountName());
+ if (!IS_DELETE_FALSE.equals(account.getIsDelete())) {
+ result.put("msg", "���������������������������������������������");
+ result.put("accountId", -1);
+ } else if (ObjectUtils.isEmpty(existRole)) {
+ result.put("msg", "���������������������");
+ result.put("accountId", -1);
+ } else {
+ result.put("msg", "���������������");
+ result.put("accountId", account.getId());
+ }
+ return result;
+ }
+
+
}
--
Gitblit v1.8.0