From 1a73abc088caa0f5873d8143a6bd71937263a413 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 27 Dec 2017 15:43:46 +0800
Subject: [PATCH] 更新 安装用户
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 125 ++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 47 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..0a93e6b 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -7,45 +7,55 @@
import static org.apache.commons.lang3.StringUtils.isNumeric;
import static org.springframework.util.ObjectUtils.isEmpty;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
-import com.moral.common.bean.ResultBean;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import com.github.pagehelper.PageHelper;
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
import com.moral.common.util.Crypto;
+import com.moral.common.util.ResourceUtil;
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 tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
@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 +64,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,10 +85,61 @@
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);
}
}
+ @Override
+ public PageBean<Account> getAccountListByPage(Map<String, Object> parameters) {
+ Example example = new Example(Account.class);
+ Criteria criteria = example.createCriteria();
+ if (parameters.containsKey("accountName")) {
+ criteria.andLike("accountName", "%" + (String) parameters.get("accountName") + "%");
+ }
+ if (parameters.containsKey("mobile")) {
+ criteria.andLike("mobile", "%" + (String) parameters.get("mobile") + "%");
+ }
+ if (parameters.containsKey("isDelete")) {
+ criteria.andEqualTo("isDelete", parameters.get("isDelete"));
+ }
+ if (parameters.containsKey("sorter")) {
+ example.setOrderByClause((String) parameters.get("sorter"));
+ }
+ PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));
+ List<Account> accounts = accountMapper.selectByExample(example);
+ return new PageBean<Account>(accounts);
+ }
+
+ @Override
+ @Transactional
+ public Integer saveOrUpdateAccount(Account account) {
+ if (ObjectUtils.isEmpty(account.getId())) {
+ account.setIsDelete(Constants.IS_DELETE_FALSE);
+ account.setCreateTime(new Date());
+ account.setPassword(Crypto.md5(ResourceUtil.getValue("password")));
+ return accountMapper.insertSelective(account);
+ } else {
+ return accountMapper.updateByPrimaryKeySelective(account);
+ }
+ }
+
+ @Override
+ @Transactional
+ public Integer deleteAccountByLogic(Account account) {
+ account.setIsDelete(Constants.IS_DELETE_TRUE);
+ return accountMapper.updateByPrimaryKeySelective(account);
+ }
+
+ @Override
+ @Transactional
+ public Integer deleteAccountsByLogic(List<Integer> ids) {
+ Account account = new Account();
+ account.setIsDelete(Constants.IS_DELETE_TRUE);
+ Example example = new Example(Account.class);
+ example.or().andIn("id", ids);
+ return accountMapper.updateByExampleSelective(account, example);
+ }
+
}
--
Gitblit v1.8.0