diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java index 04590e6..dfb3f99 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java @@ -67,8 +67,8 @@ public class OrgPersonnelController { @ApiOperation("重置人员密码") @PostMapping("/reset-password") - public SingleResponse resetPassword(@ApiParam("主键ID") @RequestBody Req req) { - return orgPersonnelApi.resetPassword(req.getData()); + public SingleResponse resetPassword(@ApiParam("主键ID") @RequestBody Req req) { + return orgPersonnelApi.resetPassword(req.getData().getId(), req.getData().getResetPassword()); } @ApiOperation("导入人员信息") diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index 12e7def..4a44ae4 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -34,7 +34,6 @@ import org.qinan.safetyeval.infrastructure.adapter.gbs.GbsUserFacadeClient; import org.qinan.safetyeval.infrastructure.mapper.OrgPersonnelMapper; import org.qinan.safetyeval.infrastructure.mapper.QualFilingPersonnelCertMapper; import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelDO; -import org.qinan.safetyeval.infrastructure.mapper.OrgPersonnelMapper; import org.qinan.safetyeval.infrastructure.support.UserOrgIdResolver; import org.qinan.safetyeval.infrastructure.utils.CommonUtil; import org.slf4j.Logger; @@ -55,7 +54,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import java.util.*; -import java.util.stream.Collectors; /** * 人员信息执行器(App层) @@ -189,7 +187,7 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { } @Override - public SingleResponse resetPassword(Long id) { + public SingleResponse resetPassword(Long id, String resetPassword) { OrgPersonnelEntity entity = orgPersonnelDomainService.get(id); if (entity == null) { throw new BizException(ErrorCode.ORG_PERSONNEL_NOT_FOUND); @@ -197,7 +195,11 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { // 联调阶段:密码重置占位,后续对接统一用户中心 UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd(); userUpdatePasswordCmd.setId(entity.getId()); - String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey); + String pass = defPassword; + if (resetPassword != null) { + pass = resetPassword; + } + String encrypt = Sm2Util.encryptHex(MD5.md5(pass), publicKey); userUpdatePasswordCmd.setPassword(encrypt); gbsUserFacadeClient.updatePassword(userUpdatePasswordCmd); return SingleResponse.success(); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java index 4a40729..224de5d 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java @@ -28,7 +28,7 @@ public interface OrgPersonnelApi { PageResponse filingPage(OrgFilingPersonnelPageQuery query); - SingleResponse resetPassword(Long id); + SingleResponse resetPassword(Long id, String resetPassword); SingleResponse updateOriginFace(OrgPersonnelUpdateOriginFaceCmd cmd); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/ResetPasswordCDTO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/ResetPasswordCDTO.java new file mode 100644 index 0000000..9321f62 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/ResetPasswordCDTO.java @@ -0,0 +1,18 @@ +package org.qinan.safetyeval.client.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 人员信息修改命令 + * + * @author safety-eval + */ +@Data +public class ResetPasswordCDTO { + + @ApiModelProperty(value = "主键ID") + private Long id; + + private String resetPassword; +}