From ee0e4c362e299f9be9a3859d0c142f26871cacf6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/service/impl/OperateUserServiceImpl.java |   68 ++++++++++++++++++++++++++++------
 1 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index f574667..3079783 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -1,19 +1,19 @@
 package com.moral.service.impl;
 
-import java.util.List;
-
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import com.moral.common.exception.BusinessException;
 import com.moral.common.util.Crypto;
+import com.moral.common.util.ValidateUtil;
 import com.moral.entity.OperateUser;
 import com.moral.mapper.OperateUserMapper;
 import com.moral.service.OperateUserService;
 
-import tk.mybatis.mapper.entity.Example;
+import java.util.List;
 
 @Service
 public class OperateUserServiceImpl implements OperateUserService {
@@ -22,28 +22,34 @@
 	private OperateUserMapper operateUserMapper;
 
 	@Override
-	public List<OperateUser> getUserList(String mobile) {
-		Example example = new Example(OperateUser.class);
-		example.or().andEqualTo("mobile", mobile);
-		return operateUserMapper.selectByExample(example);
+	public OperateUser getOperateUserByMobile(String mobile) {
+		OperateUser operateUser = new OperateUser();
+		operateUser.setMobile(mobile);
+		return operateUserMapper.selectOne(operateUser);
 	}
 
 	@Override
 	public OperateUser mobileLogin(String mobile, String password) {
-		Example example = new Example(OperateUser.class);
-		example.or().andEqualTo("mobile", mobile).andEqualTo("password", Crypto.md5(password));
-		List<OperateUser> operateUsers = operateUserMapper.selectByExample(example);
-		if (ObjectUtils.isEmpty(operateUsers) || operateUsers.size() > 1) {
+		ValidateUtil.notEmpty(mobile, "param.is.null");
+		ValidateUtil.notEmpty(password, "param.is.null");
+		OperateUser operateUser = new OperateUser();
+		operateUser.setMobile(mobile);
+		operateUser.setPassword(Crypto.md5(password));
+		operateUser = operateUserMapper.selectOne(operateUser);
+		if (ObjectUtils.isEmpty(operateUser)) {
 			throw new BusinessException("������������������������,���������������");
 		}else {
-			OperateUser operateUser = operateUsers.get(0);
 			operateUser.setPassword(password);
 			return operateUser;
 		}
 	}
 
 	@Override
+	@Transactional
 	public OperateUser updatePassword(Integer uid, String password, String newPassword) {
+		ValidateUtil.notNull(uid, "param.is.null");
+		ValidateUtil.notEmpty(password, "param.is.null");
+		ValidateUtil.notEmpty(newPassword, "param.is.null");
 		OperateUser operateUser = operateUserMapper.selectByPrimaryKey(uid);
 		if (ObjectUtils.isEmpty(operateUser) || !Crypto.md5(password).equals(operateUser.getPassword())) {
 			throw new BusinessException("���������������,���������������������");
@@ -55,4 +61,42 @@
 		}
 	}
 
+	@Override
+	public List<OperateUser> findOperateUserList() {
+		return operateUserMapper.findOperateUserList();
+	}
+
+	@Override
+	public Long findOperateUserCount() {
+		return operateUserMapper.findOperateUserCount();
+	}
+
+	@Override
+	public OperateUser findOperateUser(int id) {
+		return operateUserMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	@Transactional
+	public int insertOperateUser(OperateUser user) {
+		return operateUserMapper.insertSelective(user);
+	}
+
+	@Override
+	@Transactional
+	public int updateOperateUser(OperateUser user) {
+		return operateUserMapper.updateByPrimaryKeySelective(user);
+	}
+
+	@Override
+	@Transactional
+	public int deleteOperateUser(int id) {
+		return operateUserMapper.deleteByPrimaryKey(id);
+	}
+
+	@Override
+	@Transactional
+	public int deleteOperateUserList(String[] ids) {
+		return operateUserMapper.deleteOperateUserList(ids);
+	}
 }

--
Gitblit v1.8.0