I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重置用户状态同时会重置用户登录错误次数

Browse Source
yun-zuoyi
nies 3 years ago
parent b51fa31e06
commit 38b024d8e4
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.*;
import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsScheduleJobCloud;
import cn.estsh.i3plus.icloud.andon.sdk.IAndonScheduleJobCloud;
import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud;
import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud;
@ -99,6 +100,9 @@ public class SysTaskCycleController extends CoreBaseController {
@Autowired
private IAndonScheduleJobCloud andonScheduleJobCloud;
@Autowired
private IQmsScheduleJobCloud qmsScheduleJobCloud;
/**
* 根据来源切换定时任务服务
*
@ -123,6 +127,8 @@ public class SysTaskCycleController extends CoreBaseController {
// ANDON
} else if (source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()) {
quartzJobService = andonScheduleJobCloud;
}else if (source == CommonEnumUtil.SOFT_TYPE.QMS.getValue()) {
quartzJobService = qmsScheduleJobCloud;
}
return quartzJobService;
}

9
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java
Unescape Escape View File

@ -4,6 +4,8 @@ import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsCommonCloud;
import cn.estsh.i3plus.ext.qms.icloud.sdk.IQmsScheduleJobCloud;
import cn.estsh.i3plus.icloud.andon.sdk.IAndonScheduleJobCloud;
import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud;
import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud;
@ -123,6 +125,11 @@ public class SysTaskPlanController extends CoreBaseController {
@Autowired
private IScreenScheduleJobCloud screenScheduleJobCloud;
@Autowired
private IQmsScheduleJobCloud qmsScheduleJobCloud;
/**
* 根据来源切换定时任务服务
*
@ -155,6 +162,8 @@ public class SysTaskPlanController extends CoreBaseController {
quartzJobService = ptlScheduleJobCloud;
} else if (source == CommonEnumUtil.SOFT_TYPE.SCREEN.getValue()) {
quartzJobService = screenScheduleJobCloud;
}else if (source == CommonEnumUtil.SOFT_TYPE.QMS.getValue()) {
quartzJobService = qmsScheduleJobCloud;
}
return quartzJobService;
}

31
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
Unescape Escape View File

@ -34,6 +34,7 @@ import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.text.StrBuilder;
import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -100,6 +101,9 @@ public class SysUserController extends CoreBaseController {
@Resource(name = CommonConstWords.IMPP_REDIS_RES)
private ImppRedis redisRes;
@Resource(name = CommonConstWords.IMPP_REDIS_CORE)
protected ImppRedis redisCore;
/**
* 新增系统用户
*
@ -277,7 +281,10 @@ public class SysUserController extends CoreBaseController {
ValidatorBean.checkNotZero(status, "功能状态不能为空");
sysUserService.updateBatchSysUserStatus(StringTool.getArrayLong(ids), status, AuthUtil.getSessionUser());
//当解除锁定状态 重置当天登录错误次数上限
if (CommonEnumUtil.USER_STATUS.ENABLE.getValue() == status) {
deleteRedisLoginErrorKeys(ids);
}
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
@ -287,6 +294,22 @@ public class SysUserController extends CoreBaseController {
}
/**
* 删除登录错误的次数
*
* @param ids
*/
private void deleteRedisLoginErrorKeys(String[] ids) {
String[] keys = new String[ids.length];
StringBuilder redisKey = new StringBuilder();
for (int i = 0; i < ids.length; i++) {
redisKey.append(CommonConstWords.USER_LOGIN_ERROR).append(":").append(TimeTool.getToday()).append(":").append(ids[i]);
keys[i] = redisKey.toString();
redisKey.setLength(0);
}
redisCore.deleteKey(keys);
}
/**
* 根据登录的用户名批量修改账号状态
*
* @param userLoginNames 用户名数组
@ -297,12 +320,12 @@ public class SysUserController extends CoreBaseController {
@ApiOperation(value = "根据用户名批量修改账号状态", notes = "根据用户名批量修改账号状态")
public ResultBean updateBatchStatusByUserLoginNames(String[] userLoginNames, Integer status) {
try {
if(ObjectUtils.isEmpty(userLoginNames)){
if (ObjectUtils.isEmpty(userLoginNames)) {
return ResultBean.success("操作失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setErrorMsg("用户名不能为空");
}
ValidatorBean.checkNotZero(status, "账号状态不能为空");
List<String> userLoginNameList = Stream.of(userLoginNames).collect(Collectors.toList());
sysUserService.updateBatchSysUserStatusByUserLoginNames(userLoginNameList,status);
sysUserService.updateBatchSysUserStatusByUserLoginNames(userLoginNameList, status);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
@ -569,7 +592,7 @@ public class SysUserController extends CoreBaseController {
String password = SysUserPasswordUtil.generateRandomPassword();
userPasswordService.updatePasswordResetLastModifyTime(user.getId(), password, false);
//重置成随机密码会让用户首次登录修改密码
sysUserService.updateUserLoginNum(user.getId(),0);
sysUserService.updateUserLoginNum(user.getId(), 0);
String content = "系统提示：\n" +
"\t" + getSessionUser().getUserName() + "使用密码重置功能帮您重置了【" + user.getUserLoginName() + "】账号的密码，" +
"新密码是：" + password + "";

Write Preview
Loading…
Cancel
Save