From 2096fcf9d948dbdcea2aae6f29d508086da9793b Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 09:09:05 +0800
Subject: [PATCH] updata

---
 src/main/java/com/moral/service/impl/AccountServiceImpl.java |   83 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 5b671e4..69752c4 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -57,29 +57,48 @@
     @Resource
     private OrganizationMapper organizationMapper;
 
+
+
     @Override
-    public Map<String, Object> screenLogin(Map<String, Object> parameters) {
+    public Map<String, Object> getAccountInfoById(String accountId) {
         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.setId(Integer.parseInt(accountId));
         account = accountMapper.selectOne(account);
-        boolean isValid = account == null ? false : encoder.matches(rawPassword, account.getPassword());
-        if (!isValid) {
-            result.put("msg", "���������������������������������");
+        if (ObjectUtils.isEmpty(account)) {
+            result.put("msg", "token������");
+            result.put("accountId", -1);
         } else {
-            if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
-                result.put("msg", "���������������");
+            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);
-            } else {
-                result.put("msg", "���������������������������������������������");
             }
         }
         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) {
@@ -98,6 +117,7 @@
         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) {
@@ -109,6 +129,30 @@
                 } 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>();
+        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);
+        boolean isValid = account == null ? false : encoder.matches(rawPassword, account.getPassword());
+        if (!isValid) {
+            result.put("msg", "���������������������������������");
+        } else {
+            if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
+                result.put("msg", "���������������");
+                result.put("accountId", account.getId());
+                result.put("orgId", account.getOrganizationId());
+                setOrgIdsByAccount(result);
             } else {
                 result.put("msg", "���������������������������������������������");
             }
@@ -322,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