update

于紫祥_1901

2020-10-10 00e38ff225eb948f5234934afc01aa54c94e0de6

 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;

    }





}