From 280bb5aa4f30011e4d9b2990e5eb37de7bf3fc23 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 12 Jan 2026 09:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8Cpc=E5=92=8C?= =?UTF-8?q?app=20userid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/web/UserController.java | 6 ++++ .../zcloud/basic/info/command/UserAddExe.java | 5 +-- .../basic/info/command/UserRemoveExe.java | 4 +-- .../info/command/query/UserQueryExe.java | 6 ++++ .../basic/info/service/UserServiceImpl.java | 5 +++ .../zcloud/basic/info/api/UserServiceI.java | 2 ++ .../basic/info/dto/GetUserIdByPhoneCmd.java | 32 +++++++++++++++++++ .../info/persistence/mapper/UserMapper.java | 2 ++ .../repository/UserRepository.java | 2 ++ .../repository/impl/UserRepositoryImpl.java | 5 +++ .../src/main/resources/mapper/UserMapper.xml | 3 ++ 11 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/GetUserIdByPhoneCmd.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java index b929d19d..22637371 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java @@ -169,5 +169,11 @@ public class UserController { return SingleResponse.buildSuccess(); } + @ApiOperation("根据手机号获取用户userId") + @PostMapping("/getUserIdByPhone") + public SingleResponse getUserIdByPhone(@Validated @RequestBody GetUserIdByPhoneCmd getUserIdByPhoneCmd) { + return userService.getUserIdByPhone(getUserIdByPhoneCmd); + } + } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index 15628c31..d969ff02 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -337,7 +337,7 @@ public class UserAddExe { UserDO user = firstUserWithIdCard.get(); BeanUtils.copyProperties(user, userE); userE.setId(null); - userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(), UuidUtil.get32UUID()); + userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(),userDO.getUserId()); userE.setFlowFlag(flowFlag); userRepository.saveOnboardingUser(userE); } else { @@ -377,7 +377,7 @@ public class UserAddExe { UserDO user = firstUserWithIdCard.get(); BeanUtils.copyProperties(user, userE); userE.setId(null); - userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(), UuidUtil.get32UUID()); + userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(), userDO.getUserId()); userE.setFlowFlag(flowFlag); userRepository.saveOnboardingUser(userE); } else { @@ -502,6 +502,7 @@ public class UserAddExe { userDOUpdate = optionalUserDO.get(); } } + userE.setUserId(userList.get(0).getUserId()); } boolean res = false; diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java index 2ea44021..eb5096cc 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java @@ -58,12 +58,12 @@ public class UserRemoveExe { UserDO userDO = userRepository.getById(cmd.getId()); - // 获取redis验证码 + /*// 获取redis验证码 Object phoneCodeObj = zcloudRedisUtil.get(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); if(phoneCodeObj == null || !phoneCodeObj.toString().equals(cmd.getPhoneCode())){ throw new BizException("验证码已过期或错误"); } - zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone()); + zcloudRedisUtil.del(RedisConstant.PHONE_CODE_KEY + userDO.getPhone());*/ try { //TODO 处理所有未完成的工作，如果是非固定人员，包括所有企业的未完成工作 diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 4a3dc160..3c6b896d 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -282,5 +282,11 @@ public class UserQueryExe { captchaCO.setCaptchaKey(captchaKey); return captchaCO; } + + public SingleResponse getUserIdByPhone(GetUserIdByPhoneCmd getUserIdByPhoneCmd) { + UserDO userDO =userRepository.getUserIdByPhone(getUserIdByPhoneCmd.getPhone()); + return SingleResponse.of(userCoConvertor.converDOToCO(userDO)); + + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index 62df3c1e..b04c1ebb 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -218,5 +218,10 @@ public class UserServiceImpl implements UserServiceI { return userQueryExe.generateCaptcha(); } + + @Override + public SingleResponse getUserIdByPhone(GetUserIdByPhoneCmd getUserIdByPhoneCmd) { + return userQueryExe.getUserIdByPhone(getUserIdByPhoneCmd); + } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index acc3c083..0c099920 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -84,5 +84,7 @@ public interface UserServiceI { List getUserCorpList(Long id); CaptchaCO generateCaptcha(); + + SingleResponse getUserIdByPhone(GetUserIdByPhoneCmd getUserIdByPhoneCmd); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/GetUserIdByPhoneCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/GetUserIdByPhoneCmd.java new file mode 100644 index 00000000..59316515 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/GetUserIdByPhoneCmd.java @@ -0,0 +1,32 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.Command; +import com.jjb.saas.security.starter.serialize.dto.MaskDTO; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-04 14:07:38 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class GetUserIdByPhoneCmd { + + @ApiModelProperty(value = "手机号", name = "phone") + @NotEmpty(message = "手机号不能为空") + private String phone; + + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java index 32eee1c4..9230b088 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java @@ -41,5 +41,7 @@ public interface UserMapper extends BaseMapper { List getListByUserIds(List userIds); void deletedUserByPhone(String phone); + + UserDO getUserIdByPhone(String phone); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index 4cedef20..a7089655 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -92,5 +92,7 @@ public interface UserRepository extends BaseRepository { void updateXgf(UserE userE); void deletedUserByPhone(String phone); + + UserDO getUserIdByPhone(@NotEmpty(message = "手机号不能为空") String phone); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index aeb9b1ab..bae4c78c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -614,5 +614,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i public void deletedUserByPhone(String phone) { userMapper.deletedUserByPhone(phone); } + + @Override + public UserDO getUserIdByPhone(String phone) { + return userMapper.getUserIdByPhone(phone); + } } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 19bece7e..5040e6d4 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -365,5 +365,8 @@ update user set delete_enum = 'TRUE' where phone = #{phone} +