From e7eb9aff4f348f2b6c245be5215f571c2789fb8e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Apr 2020 15:42:58 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 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..fe05269 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;
@@ -42,6 +36,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 {
@@ -74,6 +74,37 @@
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", "���������������������������������������������");
}
@@ -229,12 +260,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");
--
Gitblit v1.8.0