diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserPasswordService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserPasswordService.java new file mode 100644 index 0000000..b3a8f8d --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserPasswordService.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.SysUserPassword; +import cn.estsh.impp.framework.base.service.ICrudService; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-6-4 下午3:47 + * @Modify: + **/ +public interface ISysUserPasswordService extends ICrudService { + +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 4957aee..fc4655e 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -41,6 +41,9 @@ public interface ISysUserService { @ApiOperation(value = "修改状态",notes = "修改指定账号状态") void updateSysUserStatus(Long id, int status, SessionUser user); + @ApiOperation(value = "锁定用户",notes = "锁定用户") + void doLockSysUserById(Long id); + /** * 批量修改账号状态 * @param ids diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 5952926..2a7991f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.base.ISynchronizedService; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.core.api.iservice.busi.*; +import cn.estsh.i3plus.core.apiservice.util.SysUserPasswordUtil; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.*; import cn.estsh.i3plus.platform.common.util.CommonConstWords; @@ -13,6 +14,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.model.license.ImppLicense; import cn.estsh.i3plus.pojo.model.platform.UserDetailModel; import cn.estsh.i3plus.pojo.model.platform.UserDetailPagerModel; import cn.estsh.i3plus.pojo.platform.bean.*; @@ -20,6 +22,8 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; +import cn.estsh.impp.framework.boot.license.serviceimpl.ImppLicenseDecoder; import cn.estsh.impp.framework.boot.util.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -85,7 +89,7 @@ public class WhiteController extends CoreBaseController { private ISysConfigService configService; @Autowired - private ISysMenuService sysMenuService; + private SysUserPasswordUtil userPasswordUtil; @Resource(name=CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; @@ -146,6 +150,9 @@ public class WhiteController extends CoreBaseController { LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode); ResultBean result = null; + Exception userLoginException = null; + CommonEnumUtil.USER_LOGIN_STATUS userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS; + try { ValidatorBean.checkNotNull(loginName,"用户名不能为空"); ValidatorBean.checkNotNull(loginPwd,"密码不能为空"); @@ -176,44 +183,50 @@ public class WhiteController extends CoreBaseController { result.setErrorMsg("密码输入错误。再输入错误"+ num +"次，用户将被锁定。"); } - // 记录登录记录 - recordSysUserLog(null, loginName, CommonEnumUtil.USER_LOGIN_STATUS.WRONG_PASSWORD.getValue(), ipAddr); + userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.WRONG_PASSWORD; + userLoginException = e; } catch (CredentialsException e) { // 用户名或密码错误 result = ResultBean.fail(ImppExceptionEnum.LOGIN_EXCEPTION_USER_NAME); // 记录登录记录 - recordSysUserLog(null, loginName,CommonEnumUtil.USER_LOGIN_STATUS.WRONG_USERNAME_OR_PASSWORD.getValue(), ipAddr); + userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.WRONG_USERNAME_OR_PASSWORD; + userLoginException = e; } catch (LockedAccountException e) { // 账号已锁定 result = ResultBean.fail(ImppExceptionEnum.LOGIN_EXCEPTION_USER_LOCKING); // 记录登录记录 - recordSysUserLog(null, loginName,CommonEnumUtil.USER_LOGIN_STATUS.USER_LOGIN_LOCKING.getValue(), ipAddr); + userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.USER_LOGIN_LOCKING; } catch (UnknownAccountException e) { // 用户信息不存在 result = ResultBean.fail(ImppExceptionEnum.LOGIN_EXCEPTION_USER_INFO_NULL); // 记录登录记录 - recordSysUserLog(null, loginName,CommonEnumUtil.USER_LOGIN_STATUS.USER_INFO_NULL.getValue(), ipAddr); + userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.USER_INFO_NULL; } catch (AuthenticationException e) { // 系统异常 result = ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); result.setErrorMsg(e.getMessage()); // 记录登录记录 - recordSysUserLog(null, loginName,CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR.getValue(), ipAddr); + userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR; } catch (ImppBusiException e) { result = ResultBean.fail(e); // 记录登录记录 - recordSysUserLog(null, loginName,CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR.getValue(), ipAddr); + userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR; + userLoginException = e; } catch (Exception e) { result = ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()) .setErrorMsg(LocaleUtils.getEnumLocaleResDesc(ImppExceptionEnum.SYSTEM_EXCEPTION, ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription())); // 记录登录记录 - recordSysUserLog(null, loginName,CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR.getValue(), ipAddr); + userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR; + }finally { + // 记录登录记录 + recordSysUserLog(null, loginName,userLoginStatus.getValue(), ipAddr); + userPasswordUtil.checkLoginErrorNumber(loginName,result,userLoginException); } LOGGER.info("会员{}登陆登录完成 , 登录耗时:{}",loginName,(System.currentTimeMillis() - startTime)); @@ -559,4 +572,23 @@ public class WhiteController extends CoreBaseController { return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + + @PostMapping(value = "/license") + @ApiOperation(value = "缺失资源开关", notes = "缺失资源开关") + public ResultBean updateLicense(String content){ + try { + ImppLicense license = ImppLicenseDecoder.getLicenseDecoder(content); + if(Objects.nonNull(license)){ + ImppLicenseTool.updateImppLicense(license); + }else{ + return ResultBean.fail("错误的授权信息"); + } + return ResultBean.success("操作成功"); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index cb817cd..1d2819f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -416,7 +416,7 @@ public class SysUserController extends CoreBaseController{ SysUser user = sysUserService.getSysUserById(Long.parseLong(id)); if(user != null){ Integer num = personnelService.checkSysUserResetPassword(user); - num = CommonConstWords.LOCK_USER_RESET_PASSWORD - num; + num = CommonConstWords.CONFIG_PWD_RESET_PASSWORD_DEFAULT - num; String password = RandomStringUtils.random(6, true, false); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index 9897e53..9f39965 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; +import cn.estsh.i3plus.core.apiservice.util.SysUserPasswordUtil; import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -11,7 +12,9 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.boot.util.ImppLdapUtils; import cn.estsh.impp.framework.boot.util.ImppRedis; +import cn.estsh.impp.framework.boot.util.ImppSwitchUtil; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.CredentialsException; @@ -38,6 +41,9 @@ public class SystemLoginService implements ISystemLoginService { @Autowired private SysUserRepository sysUserRDao; + @Autowired + private SysUserPasswordUtil userPasswordUtil; + /** * 核心的缓存 */ @@ -134,6 +140,11 @@ public class SystemLoginService implements ISystemLoginService { LOGGER.error("登录密码加密出错。"); throw new IncorrectCredentialsException("登陆密码错误"); } + + // 登录AD 域检查 + userPasswordUtil.checkActiveDirectory(user); + + // 登录密码校验 if (!StringUtils.equals(user.getUserLoginPassword(), pwd)) { //密码不符 LOGGER.error("密码验证错误。"); throw new IncorrectCredentialsException("登陆密码错误"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 61e4131..5b354d2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -673,22 +673,22 @@ public class PersonnelServiceService implements IPersonnelService { public Integer checkSysUserResetPassword(SysUser user) { LOGGER.info("平台用户岗位 SysUser user:{}", user); Integer num = 0; - if(user != null){ - String day = DateFormatUtils.ISO_8601_EXTENDED_DATE_FORMAT.format(new Date()); - String redisKey = CommonConstWords.REDIS_PREFIX_USER_RESET_PASSWORD + "-" + day + "-" + user.getId(); - Object redisValue = redisCore.getObject(redisKey); - num = redisValue == null ? 1 : Integer.parseInt(redisValue.toString()) + 1; - - if(num > CommonConstWords.LOCK_USER_RESET_PASSWORD){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.USER_PERMISSION_RUN_OUT.getCode()) - .setErrorDetail("重置密码次数已使用完毕") - .setErrorSolution("请明日再次使用") - .build(); - } - redisCore.putObject(redisKey,num,CommonConstWords.REDIS_TIME_DAY_ONE); - } +// if(user != null){ +// String day = DateFormatUtils.ISO_8601_EXTENDED_DATE_FORMAT.format(new Date()); +// String redisKey = CommonConstWords.REDIS_PREFIX_USER_RESET_PASSWORD + "-" + day + "-" + user.getId(); +// Object redisValue = redisCore.getObject(redisKey); +// num = redisValue == null ? 1 : Integer.parseInt(redisValue.toString()) + 1; +// +// if(num > CommonConstWords.LOCK_USER_RESET_PASSWORD){ +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) +// .setErrorCode(ImppExceptionEnum.USER_PERMISSION_RUN_OUT.getCode()) +// .setErrorDetail("重置密码次数已使用完毕") +// .setErrorSolution("请明日再次使用") +// .build(); +// } +// redisCore.putObject(redisKey,num,CommonConstWords.REDIS_TIME_DAY_ONE); +// } return num; } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java new file mode 100644 index 0000000..fc5f6fc --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserSavePasswordService.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserPasswordService; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysUserPassword; +import cn.estsh.i3plus.pojo.platform.repository.SysUserPasswordRepository; +import cn.estsh.impp.framework.base.service.CrudService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-6-4 下午3:49 + * @Modify: + **/ +@Primary +@Service +public class SysUserSavePasswordService extends CrudService implements ISysUserPasswordService { + + @Autowired + private SysUserPasswordRepository userPasswordRDao; + + + @Override + public BaseRepository getRepository() { + return userPasswordRDao; + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 55258d8..d03048c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -57,7 +57,7 @@ public class SysUserService implements ISysUserService { public static final Logger LOGGER = LoggerFactory.getLogger(SysUserService.class); @Autowired - private SysUserRepository sysUserRDao; + private SysUserRepository userRDao; @Autowired private SysUserInfoRepository sysUserInfoRDao; @@ -173,10 +173,19 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "修改账号", notes = "修改账号状态") public void updateSysUserStatus(Long id, int status, SessionUser user) { LOGGER.debug("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName()); - SysUser sysUser = sysUserRDao.getById(id); + SysUser sysUser = userRDao.getById(id); sysUser.setUserStatus(status); sysUser.setModifyUser(user.getUserName()); - sysUserRDao.update(sysUser); + userRDao.update(sysUser); + } + + @Override + public void doLockSysUserById(Long id) { + SysUser user = userRDao.getById(id); + if(Objects.nonNull(user)){ + user.setUserStatus(CommonEnumUtil.USER_STATUS.LOCKING.getValue()); + userRDao.save(user); + } } @Override @@ -185,14 +194,14 @@ public class SysUserService implements ISysUserService { LOGGER.debug("平台用户 SYS_USER DELETE By ids :{} status:{}, SessionUser :{}", ids,status,user); String where = CoreHqlPack.packHqlIds("id", ids); - List list = sysUserRDao.findByHqlWhere(where); + List list = userRDao.findByHqlWhere(where); if(null != list && list.size() > 0){ for (SysUser sysUser : list) { sysUser.setUserStatus(status); sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.modelUpdate(sysUser,user); } - sysUserRDao.saveAll(list); + userRDao.saveAll(list); } } @@ -200,19 +209,19 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "修改账号", notes = "修改账号信息") public void updateSysUser(SysUser sysUser) throws Exception{ LOGGER.debug("平台用户 SYS_USER SysUser :{}", sysUser); - sysUserRDao.save(sysUser); + userRDao.save(sysUser); } @Override @ApiOperation(value = "修改账号", notes = "修改账号登录密码") public void updateSysUserPassword(Long userId, String password, String newPwd) throws Exception { LOGGER.debug("平台用户 SYS_USER Override:{} password:{} newPwd:{}", userId,password,newPwd); - SysUser user = sysUserRDao.getById(userId); + SysUser user = userRDao.getById(userId); if(user != null){ String pwdMd5 = EncryptTool.hexMD5(password); if(pwdMd5.equals(user.getUserLoginPassword())){ user.setUserLoginPassword(EncryptTool.hexMD5(newPwd)); - sysUserRDao.save(user); + userRDao.save(user); }else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -234,10 +243,10 @@ public class SysUserService implements ISysUserService { @Override @ApiOperation(value = "刷新账号", notes = "刷新账号登录信息") public void refreshUserLoginInformation(Long userId) { - SysUser user = sysUserRDao.getById(userId); + SysUser user = userRDao.getById(userId); user.setUserLoginLastDateTime(TimeTool.getNowTime(true)); user.setUserLoginNum(user.getUserLoginNum() + 1); - sysUserRDao.save(user); + userRDao.save(user); SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId()); userInfo.setUserLoginLastDateTime(TimeTool.getNowTime(true)); @@ -255,7 +264,7 @@ public class SysUserService implements ISysUserService { // 密码加密 输入的密码不等于密码一致时修改密码 String md5 = EncryptTool.hexMD5(sysUser.getUserLoginPassword()); sysUser.setUserLoginPassword(md5); - return sysUserRDao.insert(sysUser); + return userRDao.insert(sysUser); } else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -312,7 +321,7 @@ public class SysUserService implements ISysUserService { // 角色名称冗余 // sysUser.setRoleNameRdd(String.join(",", roleNameList)); - sysUserRDao.save(sysUser); + userRDao.save(sysUser); } } @@ -320,9 +329,9 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "删除账号", notes = "删除账号信息，逻辑删除，账号关系业务物理删除") public void deleteSysUserById(Long id) { LOGGER.debug("平台用户 SYS_USER DELETE By id :{}", id); - SysUser user = sysUserRDao.getById(id); + SysUser user = userRDao.getById(id); user.setIsValid(CommonEnumUtil.IS_VAILD.INVAILD.getValue()); - sysUserRDao.save(user); + userRDao.save(user); // 删除用户关系(物理删除) refUserRoleRDao.deleteByProperty("userId", id); // 删除用户角色关系 @@ -338,13 +347,13 @@ public class SysUserService implements ISysUserService { // 标记用户已删除 String where = CoreHqlPack.packHqlIds("id", ids); - List list = sysUserRDao.findByHqlWhere(where); + List list = userRDao.findByHqlWhere(where); if(null != list && list.size() > 0){ for (SysUser sysUser : list) { sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); } - sysUserRDao.saveAll(list); + userRDao.saveAll(list); refUserRoleRDao.deleteByPropertyIn("userId",ids); } } @@ -353,7 +362,7 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "账号查询", notes = "查询所有账号信息") public List list() { LOGGER.debug("平台用户 SYS_USER find All"); - return sysUserRDao.findByProperty( + return userRDao.findByProperty( new String[]{"isDeleted","isValid","organizeCode"}, new Object[]{ CommonEnumUtil.IS_DEAL.NO.getValue(), @@ -434,22 +443,22 @@ public class SysUserService implements ISysUserService { //生成hql查询语句 String hqlPack = CoreHqlPack.packHqlSysUser(user); - pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager); + pager = PagerHelper.getPager(pager, userRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(userRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager); } @Override public ListPager querySysUserByPager(SysUser user, List idList, Pager pager) { DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUser(user, idList); - pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean)); - return new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager); + pager = PagerHelper.getPager(pager, userRDao.findByHqlWhereCount(packBean)); + return new ListPager(userRDao.findByHqlWherePage(packBean, pager), pager); } @Override @ApiOperation(value = "账号查询", notes = "根据ID 查询账号信息") public SysUser getSysUserById(Long id) { LOGGER.debug("平台用户 SYS_USER get By id :{}", id); - return sysUserRDao.getById(id); + return userRDao.getById(id); } @Override @@ -463,21 +472,21 @@ public class SysUserService implements ISysUserService { public SysUser getSysUserByLoginName(String loginName) { LOGGER.debug("平台用户 SYS_USER find By Login Name :{}", loginName); - return sysUserRDao.getByProperty(new String[]{"userLoginName", "isValid"}, + return userRDao.getByProperty(new String[]{"userLoginName", "isValid"}, new Object[]{loginName, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()}); } @Override @ApiOperation(value = "账号查询", notes = "根据邮箱查询用户信息") public SysUser getSysUserByEmail(String email) { - return sysUserRDao.getByProperty(new String[]{"userEmail", "isValid"}, + return userRDao.getByProperty(new String[]{"userEmail", "isValid"}, new Object[]{email, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()}); } @Override @ApiOperation(value = "账号查询", notes = "根据手机号查询用户信息") public SysUser getSysUserByPhone(String phone) { - return sysUserRDao.getByProperty(new String[]{"userPhone", "isValid"}, + return userRDao.getByProperty(new String[]{"userPhone", "isValid"}, new Object[]{phone, CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()}); } @@ -495,10 +504,10 @@ public class SysUserService implements ISysUserService { StringBuffer sw = new StringBuffer(); HqlPack.getStringEqualPack(userLoginName,"userLoginName",sw); HqlPack.getNumNOEqualPack(id,"id",sw); - count = sysUserRDao.findByHqlWhereCount(sw.toString()); + count = userRDao.findByHqlWhereCount(sw.toString()); }else{ - count = sysUserRDao.findByPropertyCount("userLoginName",userLoginName); + count = userRDao.findByPropertyCount("userLoginName",userLoginName); } return count <= 0 ; } @@ -511,10 +520,10 @@ public class SysUserService implements ISysUserService { StringBuffer sw = new StringBuffer(); HqlPack.getStringEqualPack(email,"userEmail",sw); HqlPack.getNumNOEqualPack(id,"id",sw); - count = sysUserRDao.findByHqlWhereCount(sw.toString()); + count = userRDao.findByHqlWhereCount(sw.toString()); }else{ - count = sysUserRDao.findByPropertyCount("userEmail",email); + count = userRDao.findByPropertyCount("userEmail",email); } return count <= 0 ; } @@ -527,10 +536,10 @@ public class SysUserService implements ISysUserService { StringBuffer sw = new StringBuffer(); HqlPack.getStringEqualPack(phone,"userPhone",sw); HqlPack.getNumNOEqualPack(id,"id",sw); - count = sysUserRDao.findByHqlWhereCount(sw.toString()); + count = userRDao.findByHqlWhereCount(sw.toString()); }else{ - count = sysUserRDao.findByPropertyCount("userPhone",phone); + count = userRDao.findByPropertyCount("userPhone",phone); } return count <= 0 ; } @@ -574,7 +583,7 @@ public class SysUserService implements ISysUserService { @Override @ApiOperation(value = "查询账户数量") public long getSysUserCount() { - return sysUserRDao.listCount(); + return userRDao.listCount(); } /** @@ -669,7 +678,7 @@ public class SysUserService implements ISysUserService { public List findSysUserByIds(Long[] ids) { DdlPackBean ddlPackBean = new DdlPackBean(); DdlPreparedPack.getInPackArray(ids, "id", ddlPackBean); - return sysUserRDao.findByHqlWhere(ddlPackBean); + return userRDao.findByHqlWhere(ddlPackBean); } /** @@ -762,6 +771,7 @@ public class SysUserService implements ISysUserService { if(CollectionUtils.isNotEmpty(menuList)){ for (SysMenu menu : menuList) { if(CommonConstWords.SYSTEM_MENU_ROOT_ID.equals(menu.getParentId())){ + menu.getChildList().clear(); list.add(menu); } }