From 6baf6a0dd84df8e988390342253810f2eb53f249 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Mon, 5 Jan 2026 09:39:48 +0800 Subject: [PATCH] openid --- .../com/zcloud/basic/info/command/query/UserQueryExe.java | 6 +++++- .../main/java/com/zcloud/basic/info/dto/UserAddCmd.java | 3 +++ .../java/com/zcloud/basic/info/dto/UserUpdateCmd.java | 3 +++ .../com/zcloud/basic/info/dto/clientobject/UserCO.java | 3 +++ .../com/zcloud/basic/info/domain/gateway/UserGateway.java | 4 ++++ .../java/com/zcloud/basic/info/domain/model/UserE.java | 2 ++ .../zcloud/basic/info/gatewayimpl/UserGatewayImpl.java | 8 ++++++++ .../zcloud/basic/info/persistence/dataobject/UserDO.java | 3 +++ 8 files changed, 31 insertions(+), 1 deletion(-) 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 393a36b2..1f79132f 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 @@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.utils.CaptchaUtils; +import com.jjb.saas.system.client.user.facade.UserFacade; +import com.jjb.saas.system.client.user.response.UserDetailCO; import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.constant.RedisConstant; @@ -28,6 +30,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.ZcloudRedisUtil; import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -71,7 +74,8 @@ public class UserQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - + @DubboReference + private UserFacade userFacade; /** * 查询集合 * diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java index be2055b4..691f8cbe 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java @@ -129,6 +129,9 @@ public class UserAddCmd extends Command { // 入职状态 @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员") private Integer flowFlag; + // 微信openid + @ApiModelProperty(value = "微信openid") + private String openId; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java index 91e71ad4..90a13960 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java @@ -92,5 +92,8 @@ public class UserUpdateCmd extends Command { // 入职状态 @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员") private Integer flowFlag; + // 微信openid + @ApiModelProperty(value = "微信openid") + private String openId; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java index 798fb9da..aef2e0c8 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java @@ -189,5 +189,8 @@ public class UserCO extends ClientObject { // 性别 @ApiModelProperty(value = "性别") private String sex; + // 微信openid + @ApiModelProperty(value = "微信openid") + private String openId; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java index cc294f80..baae6b0f 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserGateway.java @@ -26,6 +26,10 @@ public interface UserGateway { * 修改 */ Boolean update(UserE userE); + /** + * 修改 + */ + Boolean updateInfo(UserE userE); Boolean updateByPhone(UserE userE); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index a130ffe2..f6461385 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -158,6 +158,8 @@ public class UserE extends BaseE { // 性别 private String sex; + // 微信openid + private String openId; public static Boolean checkUserInfoComplete(UserE userE) { return StringUtils.isNotEmpty(userE.getUsername()) && diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java index e0927aad..a53df953 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java @@ -169,6 +169,14 @@ public class UserGatewayImpl implements UserGateway { return true; } + @Override + public Boolean updateInfo(UserE userE) { + UserDO d = new UserDO(); + BeanUtils.copyProperties(userE, d); + userRepository.updateInfoById(d); + return true; + } + @Override public void deletedUserById(Long id) { userRepository.deleteUserById(id); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java index 3bba7eec..67ad29ae 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java @@ -156,6 +156,9 @@ public class UserDO extends BaseDO { @TableField(exist = false) private String sex; + // 微信openid + @ApiModelProperty(value = "微信openid") + private String openId; public UserDO(String userId) {