From 0c7e1701017a531b7b82a123b9d7b1e89dc3e6f2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 14 Jun 2024 11:11:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=86=E7=A0=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/AuthUserController.java | 2 +- .../com/glxp/api/controller/auth/LoginController.java | 8 +++++++- .../glxp/api/controller/inout/IoCodeTempController.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 596fdee58..f8f080200 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -176,7 +176,7 @@ public class AuthUserController extends BaseController { } - @AuthRuleAnnotation("") +// @AuthRuleAnnotation("") @PostMapping("/admin/auth/admin/force/updateUser") public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) { if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 46bbee11c..1ad8a55b9 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -118,6 +118,12 @@ public class LoginController extends BaseController { // 登录成功后获取权限，这里面会设置到缓存 // authLoginService.listRuleByAdminId(authAdmin.getId()); +// cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? + if (cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date() : authAdmin.getLastUpdatePwdTime() + , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 90) { + return ResultVOUtils.error(509, "密码已过期，请修改密码"); + } + Map claims = new HashMap<>(); claims.put("admin_id", authAdmin.getId()); String token = JwtUtils.createToken(claims, 86400L); // 一天后过期 @@ -132,7 +138,7 @@ public class LoginController extends BaseController { loginResponse.setDept(authAdmin.getLocDeptCode()); loginResponse.setDeptName(authAdmin.getDeptName()); loginResponse.setNeedChangePwd(cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date() : authAdmin.getLastUpdatePwdTime() - , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 90); + , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 60); logininforService.recordLogininfor(authAdmin.getEmployeeName(), Constant.LOGIN_SUCCESS, "登录成功！", request); return ResultVOUtils.success(loginResponse); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 1d8e06220..29e78ff10 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -396,11 +396,11 @@ public class IoCodeTempController extends BaseController { } return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！"); } - } if (udiInfoEntity.getRequireScanCode() == 1){ //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { + } if (IntUtil.value(udiInfoEntity.getHcType()) != 1) { return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); }