Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

src/main/java/com/glxp/api/controller/auth/AuthUserController.java

@@ -166,7 +166,11 @@ public class AuthUserController extends BaseController {
         if (updateUserRequset.getNewPassword().equals(authAdmin.getPassWord())) {
             return ResultVOUtils.error(500, "新密码与旧密码重复！请重新修改！");
         }
-        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword()) && updateUserRequset.getPassWord().equals(authAdmin.getPassWord())) {
+        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword()) &&
+                PasswordUtils.authAdminPwd(updateUserRequset.getPassWord()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
+                || updateUserRequset.getPassWord().equals(authAdmin.getPassWord())
+                || updateUserRequset.getPassWord().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
+        ) {
             customerService.update(updateUserRequset);
             return ResultVOUtils.success("修改成功");
         } else {
@@ -175,34 +179,81 @@ public class AuthUserController extends BaseController {
 
     }
 
-
+//    @AuthRuleAnnotation("")
+//    @PostMapping("/admin/auth/admin/force/updateUser")
+//    public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) {
+//        if (bindingResult.hasErrors()) {
+//            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+//        }
+//        AuthAdmin authAdmin = customerService.getUserBean();
+//        if (StringUtils.isBlank(updateUserRequset.getNewPassword())) {
+//            return ResultVOUtils.error(500, "请输入新密码！");
+//        }
+//        if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())) {
+//            return ResultVOUtils.error(500, "请输入确认密码！");
+//        }
+//
+//        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getOldPassword())) {
+//            return ResultVOUtils.error(500, "新密码与旧密码重复！请重新修改！");
+//        }
+//        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword())
+//                &&
+//                (
+//                        PasswordUtils.authAdminPwd(updateUserRequset.getOldPassword()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
+//                                || updateUserRequset.getOldPassword().equals(authAdmin.getPassWord())
+//                                || updateUserRequset.getOldPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
+//                )) {
+//            String newPwd = PasswordUtils.authAdminPwd(updateUserRequset.getNewPassword());
+//            authAdmin.setPassWord(newPwd);
+//            authAdmin.setLastUpdatePwdTime(new Date());
+//            authAdminService.updateAuthAdmin(authAdmin);
+//            return ResultVOUtils.success("修改成功");
+//        } else {
+//            return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！");
+//        }
+//
+//    }
     @AuthRuleAnnotation("")
     @PostMapping("/admin/auth/admin/force/updateUser")
-    public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) {
+    public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
         AuthAdmin authAdmin = customerService.getUserBean();
-        if (StringUtils.isBlank(updateUserRequset.getNewPassword())) {
+
+        if (StringUtils.isBlank(updateUserRequest.getNewPassword())) {
             return ResultVOUtils.error(500, "请输入新密码！");
         }
-        if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())) {
+        if (StringUtils.isBlank(updateUserRequest.getConfirmPassword())) {
             return ResultVOUtils.error(500, "请输入确认密码！");
         }
 
-        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getOldPassword())) {
+        if (updateUserRequest.getNewPassword().equals(updateUserRequest.getOldPassword())) {
             return ResultVOUtils.error(500, "新密码与旧密码重复！请重新修改！");
         }
-        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword()) && updateUserRequset.getOldPassword().equals(authAdmin.getPassWord())) {
+
-            String newPwd = PasswordUtils.authAdminPwd(updateUserRequset.getNewPassword());
+        if (updateUserRequest.getNewPassword().equals(updateUserRequest.getConfirmPassword())) {
-            authAdmin.setPassWord(newPwd);
+            String encryptedOldPassword = PasswordUtils.authAdminPwd(updateUserRequest.getOldPassword());
-            authAdmin.setLastUpdatePwdTime(new Date());
+            String storedEncryptedPassword = PasswordUtils.authAdminPwd(authAdmin.getPassWord());
-            authAdminService.updateAuthAdmin(authAdmin);
+
-            return ResultVOUtils.success("修改成功");
+            if (encryptedOldPassword.equals(storedEncryptedPassword) ||
+                    updateUserRequest.getOldPassword().equals(authAdmin.getPassWord()) ||
+                    encryptedOldPassword.equals(authAdmin.getPassWord())) {
+
+                String newEncryptedPassword = PasswordUtils.authAdminPwd(updateUserRequest.getNewPassword());
+                authAdmin.setPassWord(newEncryptedPassword);
+                authAdmin.setLastUpdatePwdTime(new Date());
+                authAdminService.updateAuthAdmin(authAdmin);
+
+                return ResultVOUtils.success("修改成功");
+            } else {
+                return ResultVOUtils.error(500, "旧密码不正确！");
+            }
         } else {
             return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！");
         }
-
     }
 
+
 }

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<String, Object> 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);

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -239,7 +239,7 @@ public class BasicOrderPrintController {
                     bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate());
                     bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
-
+                    bizData.put("udiCode", obj.getCode().replaceAll("\u001D", ""));
                     bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
 //                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
 //                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -397,7 +397,6 @@ public class IoCodeTempController extends BaseController {
                 }
                 return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！");
             }
-        }
 
 //        if (bussinessTypeEntity.getRequireScanCode() == 1) {
 //            if (udiInfoEntity.getRequireScanCode() != 1){
@@ -410,6 +409,7 @@ public class IoCodeTempController extends BaseController {
 //        }
             //是否校验耗材材质  1：高值耗材；2.普通耗材
             if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+            }
                 if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
                     return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
                 }