From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据

---
 src/main/java/com/moral/service/impl/OperateUserServiceImpl.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index 2ad7ff6..81ebdcf 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -6,7 +6,7 @@
 
 import javax.annotation.Resource;
 
-import com.moral.common.util.MyBatisBaseMapUtil;
+import com.moral.common.util.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -15,9 +15,6 @@
 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.common.util.ValidateUtil;
 import com.moral.entity.OperateUser;
 import com.moral.mapper.OperateUserMapper;
 import com.moral.service.OperateUserService;
@@ -30,7 +27,12 @@
     private static Class ENTITY_CLASS = OperateUser.class;
 	@Resource
 	private OperateUserMapper operateUserMapper;
-
+	@Override
+	public boolean isUniqueProperty(String propertyName, Object value){
+		Example example = new Example(ENTITY_CLASS);
+		example.or().andEqualTo(propertyName,value);
+		return operateUserMapper.selectCountByExample(example)==0;
+	}
 	@Override
 	public OperateUser getOperateUserByMobile(String mobile) {
 		OperateUser operateUser = new OperateUser();
@@ -84,7 +86,9 @@
 		if (parameters.containsKey("sorter")) {
 			example.setOrderByClause((String) parameters.get("sorter"));
 		}
-		criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+		Object isDelete = parameters.get("isDelete");
+		criteria.andEqualTo("isDelete",isDelete!=null?isDelete:0);
+//		criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
 		PageHelper.startPage(Integer.valueOf((String) parameters.get("pi")), Integer.valueOf((String) parameters.get("ps")));
 		List<OperateUser> operateUsers = operateUserMapper.selectByExample(example);
 		return new PageBean<OperateUser>(operateUsers);
@@ -99,6 +103,10 @@
 			operateUser.setPassword(Crypto.md5(ResourceUtil.getValue("password")));
 			return operateUserMapper.insertSelective(operateUser);
 		}else {
+			if(!StringUtils.isNullOrEmpty(operateUser.getPassword())){
+				// ������������
+				operateUser.setPassword(Crypto.md5(operateUser.getPassword()));
+			}
 			return operateUserMapper.updateByPrimaryKeySelective(operateUser);
 		}
 	}
@@ -125,4 +133,9 @@
 	public PageBean queryByPageBean(PageBean pageBean) {
 		return MyBatisBaseMapUtil.queryPage(operateUserMapper,pageBean,ENTITY_CLASS);
 	}
+
+	@Override
+	public Integer updateOperateUser(OperateUser operateUser) {
+		return operateUserMapper.updateByPrimaryKeySelective(operateUser);
+	}
 }

--
Gitblit v1.8.0