Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -484,6 +484,39 @@ public class SysUserController extends CoreBaseController {
     }
 
     /**
+     * 根据id重置用户密码,自己设置密码
+     * @param id 用户id
+     * @return 处理结果
+     */
+    @PostMapping("/reset-pwd/{id}/{password}")
+    @ApiOperation(value = "密码重置(输入)",notes = "根据id和录入密码重置用户密码")
+    public ResultBean updateResetPassword(@PathVariable String id,@PathVariable String password){
+        try {
+            startMultiService();
+
+            SysUser user = sysUserService.getSysUserById(Long.parseLong(id));
+            if(user != null){
+                Integer num = personnelService.checkSysUserResetPassword(user);
+                num = CommonConstWords.CONFIG_PWD_RESET_PASSWORD_DEFAULT - num;
+
+                userPasswordService.updatePassword(user.getId(),password);
+                LOGGER.info("系统提示：{} 使用密码重置功能帮{}重置了{}账号的密码，新密码是：{}",
+                        getSessionUser().getUserName(),user.getUserName(),user.getUserLoginName(),password);
+
+                String result = "操作成功，【"+user.getUserName()+"】账号今日重置密码次数剩余" +num+ "次";
+                return ResultBean.success(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            }else{
+                return ResultBean.success("操作失败")
+                        .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode())
+                        .setErrorMsg("用户不存在");
+            }
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+    /**
      * 发送验证码
      *
      * @param email 邮箱