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 | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 7d4b446..69752c4 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -10,12 +10,6 @@
import java.util.Optional;
import java.util.Set;
-import static com.moral.common.bean.Constants.IS_DELETE_FALSE;
-import static com.moral.common.bean.Constants.IS_DELETE_TRUE;
-import static com.moral.common.util.ResourceUtil.getValue;
-import static org.apache.commons.lang3.StringUtils.isNumeric;
-import static org.springframework.util.ObjectUtils.isEmpty;
-
import javax.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
@@ -43,6 +37,12 @@
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.entity.Example.Criteria;
+import static com.moral.common.bean.Constants.IS_DELETE_FALSE;
+import static com.moral.common.bean.Constants.IS_DELETE_TRUE;
+import static com.moral.common.util.ResourceUtil.getValue;
+import static org.apache.commons.lang3.StringUtils.isNumeric;
+import static org.springframework.util.ObjectUtils.isEmpty;
+
@Service
public class AccountServiceImpl implements AccountService {
@Resource
@@ -56,6 +56,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) {
@@ -229,12 +308,16 @@
@Override
public Map<String, Object> getMenuListsByAccountName(String accountName) {
List<Menu> menuList = accountMapper.getParentMenuListsByAccountName(accountName);
+ Integer organizationId = accountMapper.getByAccountName(accountName).getOrganizationId();
+ Map<String, Object> organizationMap = new LinkedHashMap<>();
+ organizationMap.put("organizationId", organizationId);
String email = accountMapper.getEmailByAccountName(accountName);
Map<String, Object> mapList = new LinkedHashMap<>();
Map<String, Object> appMap = new LinkedHashMap<>();
appMap.put("name", "������������������������");
appMap.put("description", "������������������������������������������");
mapList.put("app", appMap);
+ mapList.put("organization", organizationMap);
Map<String, Object> userMap = new LinkedHashMap<>();
userMap.put("name", accountName);
userMap.put("avatar", "./assets/img/zorro.svg");
@@ -283,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