From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/sys/UserService.java | 103 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index f312134..2301bee 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -1,19 +1,18 @@
package com.lf.server.service.sys;
-import com.lf.server.entity.all.RedisCacheKey;
-import com.lf.server.entity.all.SettingData;
+import com.lf.server.entity.sys.RoleEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.Md5Helper;
import com.lf.server.helper.RsaHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.sys.UserMapper;
import com.lf.server.service.all.RedisService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.cache.RedisCache;
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.concurrent.TimeUnit;
/**
* 鐢ㄦ埛琛�
@@ -29,11 +28,20 @@
@Autowired
RedisService redisService;
- @Override
- public Integer selectCount(String uname) {
- uname = StringHelper.getLikeStr(uname);
+ @Autowired
+ LoginService loginService;
- return userMapper.selectCount(uname);
+ @Autowired
+ TokenService tokenService;
+
+ private final static Log log = LogFactory.getLog(UserService.class);
+
+ @Override
+ public Integer selectCount(String uname, String depcode) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
+
+ return userMapper.selectCount(uname, depcode);
}
@Override
@@ -52,15 +60,36 @@
}
@Override
- public List<UserEntity> selectByPage(String uname, Integer limit, Integer offset) {
- uname = StringHelper.getLikeStr(uname);
+ public List<UserEntity> selectByPage(String uname, String depcode, Integer limit, Integer offset) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
- return userMapper.selectByPage(uname, limit, offset);
+ return userMapper.selectByPage(uname, depcode, limit, offset);
}
@Override
public UserEntity selectByToken(String token) {
return userMapper.selectByToken(token);
+ }
+
+ @Override
+ public Integer selectForIsAdmin(Integer id) {
+ return userMapper.selectForIsAdmin(id);
+ }
+
+ @Override
+ public List<UserEntity> selectAdminUsers(Integer type) {
+ return userMapper.selectAdminUsers(type);
+ }
+
+ @Override
+ public List<RoleEntity> selectRoleByUserId(Integer id) {
+ return userMapper.selectRoleByUserId(id);
+ }
+
+ @Override
+ public List<UserEntity> selectUserByRoleId(Integer roleId) {
+ return userMapper.selectUserByRoleId(roleId);
}
@Override
@@ -84,22 +113,24 @@
}
@Override
- public Integer updateUsers(UserEntity userEntity) {
- return userMapper.updateUsers(userEntity);
+ public Integer updateUser(UserEntity userEntity) {
+ return userMapper.updateUser(userEntity);
}
@Override
- public Integer selectCountForRole(String uname, Integer roleid, Integer depid) {
- uname = StringHelper.getLikeStr(uname);
+ public Integer selectCountForRole(String uname, Integer roleid, String depcode) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
- return userMapper.selectCountForRole(uname, roleid, depid);
+ return userMapper.selectCountForRole(uname, roleid, depcode);
}
@Override
- public List<UserEntity> selectByPageForRole(String uname, Integer roleid, Integer depid, Integer limit, Integer offset) {
- uname = StringHelper.getLikeStr(uname);
+ public List<UserEntity> selectByPageForRole(String uname, Integer roleid, String depcode, Integer limit, Integer offset) {
+ uname = StringHelper.getLikeUpperStr(uname);
+ depcode = StringHelper.getRightLike(depcode);
- return userMapper.selectByPageForRole(uname, roleid, depid, limit, offset);
+ return userMapper.selectByPageForRole(uname, roleid, depcode, limit, offset);
}
@Override
@@ -141,15 +172,21 @@
entity.setUid(uid);
entity.setPwd(pwd);
+ if (tokenService.isUidDisable(entity)) {
+ return "鐢ㄦ埛ID宸茬鐢�";
+ }
+
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
}
}
/**
* 楠岃瘉鏂扮敤鎴峰瘑鐮�
*/
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public String validateNewPwd(UserEntity entity) {
try {
String str = validateUserEntity(entity);
@@ -159,18 +196,19 @@
// 瑙ｅ瘑
String uid = RsaHelper.decrypt(entity.getUid());
- String pwd = RsaHelper.decrypt(entity.getPwd());
- if (!StringHelper.checkPwdValid(pwd)) {
+ /*String pwd = RsaHelper.decrypt(entity.getPwd());
+ if (!StringHelper.isPwdValid(pwd)) {
return "瀵嗙爜涓嶇鍚堣姹�";
}
String newPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
- entity.setPwd(newPwd);
+ entity.setPwd(newPwd);*/
entity.setUid(uid);
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
}
}
@@ -196,10 +234,10 @@
return "娌℃湁鎵惧埌鐢ㄦ埛";
}
if (!Md5Helper.validatePassword(pwd, ue.getPwd())) {
- //
- return "鏃у瘑鐮佽緭鍏ラ敊璇�";
+ tokenService.setPwdErrCache(ue);
+ return "鏃у瘑鐮佷笉姝ｇ‘";
}
- if (!StringHelper.checkPwdValid(salt)) {
+ if (StringHelper.isPwdInvalid(salt)) {
return "瀵嗙爜涓嶇鍚堣姹�";
}
@@ -210,7 +248,8 @@
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
}
}
@@ -228,12 +267,13 @@
try {
String pwd = RsaHelper.decrypt(adminPwd);
if (!Md5Helper.validatePassword(pwd, ue.getPwd())) {
+ tokenService.setPwdErrCache(ue);
return "绠＄悊鍛樺瘑鐮佷笉姝ｇ‘";
}
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ return "瑙ｅ瘑澶辫触";
}
}
@@ -247,7 +287,7 @@
try {
String pwd = RsaHelper.decrypt(newPwd);
- if (!StringHelper.checkPwdValid(pwd)) {
+ if (StringHelper.isPwdInvalid(pwd)) {
return "瀵嗙爜涓嶇鍚堣姹�";
}
@@ -256,7 +296,8 @@
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
}
}
}
--
Gitblit v1.9.3