From 7a5024966dcce9811f4c1faf694b6b9bf0c2983e Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 13 Dec 2017 12:01:35 +0800
Subject: [PATCH] api程序更新
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 64 ++++++++------------------------
1 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index aee503f..fada657 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -8,44 +8,42 @@
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.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+
import org.springframework.stereotype.Service;
-import com.moral.common.bean.ResultBean;
import com.moral.common.exception.BusinessException;
-import com.moral.common.util.Crypto;
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;
@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 = md5((String) parameters.get("account"));
- example.or().andAccountNameEqualTo((String) parameters.get("account")).andPasswordEqualTo(password);
- List<Account> accounts = accountMapper.selectByExample(example);
- if (isEmpty(accounts) || accounts.size() != 1) {
+ Account account = new Account();
+ account.setAccountName((String) parameters.get("account"));
+ account.setPassword(md5((String) parameters.get("password")));
+ account = accountMapper.selectOne(account);
+ if (isEmpty(account)) {
result.put("msg", "���������������������������������");
} else {
- Account account = accounts.get(0);
if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
result.put("msg", "���������������");
result.put("accountId", account.getId());
+ result.put("orgId", account.getOrganizationId());
} else {
result.put("msg","���������������������������������������������");
}
@@ -54,40 +52,10 @@
}
@Override
- public ResultBean<Account> screenLogin1(Map<String, Object> parameters) {
- ResultBean<Account> resultBean = new ResultBean<Account>();
- AccountExample example = new AccountExample();
- String password = Crypto.md5((String) parameters.get("password"));
- example.or().andAccountNameEqualTo((String) parameters.get("account")).andPasswordEqualTo(password);
- List<Account> accounts = accountMapper.selectByExample(example);
- if (isEmpty(accounts) || accounts.size() != 1) {
- resultBean.setMsg("���������������������������������");
- resultBean.setCode(ResultBean.FAIL);
- } else {
- Account account = accounts.get(0);
- if (IS_DELETE_FALSE.equals(account.getIsDelete())) {
- resultBean.setData(account);
- } else {
- resultBean.setCode(ResultBean.NO_PERMISSION);
- resultBean.setMsg("���������������������������������������������");
- }
- }
- return resultBean;
- }
-
-
- @Override
- public List<Account> getAccountLists(String accountName, String password) {
- AccountExample example = new AccountExample();
- example.or().andAccountNameEqualTo(accountName).andPasswordEqualTo(password);
- return accountMapper.selectByExample(example);
- }
-
- @Override
- public List<Account> getAccountList(String accountName) {
- AccountExample example = new AccountExample();
- example.or().andAccountNameEqualTo(accountName);
- return accountMapper.selectByExample(example);
+ public Account getAccountByAccountName(String accountName) {
+ Account account = new Account();
+ account.setAccountName(accountName);
+ return accountMapper.selectOne(account);
}
@Override
@@ -105,7 +73,7 @@
Integer orgId = account.getOrganizationId();
// ���������������������������������������������������������������
- if (!(-1 == orgId || 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