From b28a5002a58d8d0b37082da12e5b218f0951de47 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 04 Dec 2017 16:46:44 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 06808ff..7d414c8 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -1,46 +1,52 @@
package com.moral.service.impl;
+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.Crypto.md5;
+import static com.moral.common.util.ResourceUtil.getValue;
+import static org.apache.commons.lang3.StringUtils.isNumeric;
+import static org.springframework.util.ObjectUtils.isEmpty;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import com.moral.common.exception.BusinessException;
import com.moral.entity.Account;
import com.moral.entity.AccountExample;
import com.moral.mapper.AccountMapper;
import com.moral.service.AccountService;
import com.moral.service.OrganizationService;
-import com.moral.util.BusinessException;
-import com.moral.util.Crypto;
-import com.moral.util.ResourceUtil;
@Service
public class AccountServiceImpl implements AccountService {
- @Autowired
+
+ @Resource
private AccountMapper accountMapper;
- @Autowired
+ @Resource
private OrganizationService organizationService;
@Override
public Map<String, Object> screenLogin(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
AccountExample example = new AccountExample();
- String password = Crypto.md5((String) parameters.get("account"));
+ String password = md5((String) parameters.get("account"));
example.or().andAccountNameEqualTo((String) parameters.get("account")).andPasswordEqualTo(password);
List<Account> accounts = accountMapper.selectByExample(example);
- if (ObjectUtils.isEmpty(accounts) || accounts.size() != 1) {
+ if (isEmpty(accounts) || accounts.size() != 1) {
result.put("msg", "���������������������������������");
} else {
Account account = accounts.get(0);
- if ("1".equals(account.getIsDelete())) {
+ if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
result.put("msg", "���������������");
result.put("accountId", account.getId());
+ result.put("orgId", account.getOrganizationId());
} else {
result.put("msg","���������������������������������������������");
}
@@ -66,18 +72,18 @@
public void setOrgIdsByAccount(Map<String, Object> parameters) {
String accountId = (String) parameters.get("accountId");
accountId = accountId.replaceFirst("-", "");
- if (!StringUtils.isNumeric((String) parameters.get("accountId"))) {
+ if (!isNumeric((String) parameters.get("accountId"))) {
throw new BusinessException("accountId ������������������");
}
Account account = accountMapper.selectByPrimaryKey((Integer.valueOf(accountId)));
- if (ObjectUtils.isEmpty(account) || "1".equals(account.getIsDelete())) {
- throw new BusinessException(accountId + "���������������������");
+ if (isEmpty(account) || IS_DELETE_TRUE.equals(account.getIsDelete())) {
+ throw new BusinessException(accountId + ":���������������������");
}
Integer orgId = account.getOrganizationId();
// ���������������������������������������������������������������
- if (!("-1".equals(orgId) || ResourceUtil.getValue("orgId").equals(orgId))) {
+ if (!(-1 == orgId || getValue("orgId").equals(orgId))) {
Set<Integer> orgIds = organizationService.getChildOrganizationIds(orgId);
parameters.put("orgIds", orgIds);
}
--
Gitblit v1.8.0