From 91b4b995d9273eaeda9a06829c624077a92ef17a Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Thu, 6 Nov 2025 18:10:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84=E8=8E=B7=E5=8F=96=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E5=B2=97=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/facade/ZcloudUserFacadeImpl.java | 6 +++++- .../zcloud/basic/info/web/UserController.java | 18 ++++++++++++++++++ .../basic/info/command/query/UserQueryExe.java | 8 ++++++++ .../basic/info/service/UserServiceImpl.java | 5 +++++ .../zcloud/basic/info/api/UserServiceI.java | 2 ++ .../basic/info/dto/clientobject/UserCO.java | 14 ++++++++++++++ .../info/persistence/dataobject/UserDO.java | 4 ++++ 7 files changed, 56 insertions(+), 1 deletion(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java index 4694dcd..bf6bdaf 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java @@ -10,6 +10,7 @@ import com.zcloud.basic.info.dto.clientobject.UserCO; import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade; import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo; import org.apache.dubbo.config.annotation.DubboService; +import org.springframework.beans.BeanUtils; import javax.annotation.Resource; import java.util.ArrayList; @@ -38,7 +39,10 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade { @Override public SingleResponse getInfoByUserId(Long aLong) { - return null; + UserCO user = userServiceI.getInfoByUserId(aLong); + ZcloudUserCo zcloudUserCo = new ZcloudUserCo(); + BeanUtils.copyProperties(user, zcloudUserCo); + return SingleResponse.of(zcloudUserCo); } @Override 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 d838803..d3d27f4 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 @@ -10,6 +10,9 @@ import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.api.UserServiceI; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.UserCO; +import com.zcloud.gbscommon.translateaop.TranslateField; +import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo; +import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -17,6 +20,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * web-adapter @@ -29,6 +34,19 @@ import java.util.ArrayList; @AllArgsConstructor public class UserController { private final UserServiceI userService; + private final TranslateField translateField; + @ApiOperation("新增用户") + @PostMapping("/test") + public SingleResponse test(@RequestBody UserCO cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + List userCOS = translateField.translateZcloudCommonInformation(Arrays.asList(cmd), UserCO.class); + ZcloudDepartmentInfoCo zcloudDpetInfoById = translateField.getZcloudDpetInfoById(1985993429287899137L); + ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985906883444662274L); + + return SingleResponse.of(cmd); + } + + @ApiOperation("新增用户") @PostMapping("/save") 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 59d9176..1a11c10 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 @@ -13,6 +13,7 @@ import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; @@ -72,5 +73,12 @@ public class UserQueryExe { List list = userRepository.list(); return userCoConvertor.converDOsToCOs(list); } + + public UserCO getInfoByUserId(Long aLong) { + UserDO byId = userRepository.getById(aLong); + UserCO userCO = new UserCO(); + BeanUtils.copyProperties(byId,userCO); + return userCO; + } } 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 99855f3..2dcb6bd 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 @@ -84,5 +84,10 @@ public class UserServiceImpl implements UserServiceI { public List getUserList() { return userQueryExe.getUserList(); } + + @Override + public UserCO getInfoByUserId(Long aLong) { + return userQueryExe.getInfoByUserId(aLong); + } } 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 8253dd7..176466d 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 @@ -33,5 +33,7 @@ public interface UserServiceI { List listByUserIds(Collection collection); List getUserList(); + + UserCO getInfoByUserId(Long aLong); } 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 4371cb6..6495ca0 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 @@ -3,6 +3,9 @@ package com.zcloud.basic.info.dto.clientobject; import com.alibaba.cola.dto.ClientObject; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.zcloud.gbscommon.translateaop.TranslateEunm; +import com.zcloud.gbscommon.translateaop.ZCloudTranslate; +import com.zcloud.gbscommon.translateaop.ZCloudTranslates; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,6 +19,13 @@ import java.util.Date; * @Date 2025-11-04 14:07:33 */ @Data +@ZCloudTranslates( + { + @ZCloudTranslate(primaryKeyType = TranslateEunm.USER, primaryKey = "id", mappedFields = {"mappingName:name", "mappingUserName:username"}), + @ZCloudTranslate(primaryKeyType = TranslateEunm.DEPT, primaryKey = "departmentId", mappedFields = {"mappingDeptName:name"}), + @ZCloudTranslate(primaryKeyType = TranslateEunm.CORP, primaryKey = "corpinfoId", mappedFields = {"mappingCorpName:corpName"}), + @ZCloudTranslate(primaryKeyType = TranslateEunm.POST, primaryKey = "postId", mappedFields = {"mappingPostName:postName"}) + }) public class UserCO extends ClientObject { //GBS用户id @ApiModelProperty(value = "GBS用户id") @@ -147,5 +157,9 @@ public class UserCO extends ClientObject { //政治面貌名称 @ApiModelProperty(value = "政治面貌名称") private String politicalAffiliationName; + private String mappingName; + private String mappingUserName; + private String mappingPostName; + private String mappingDeptName; } 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 7ae437a..6f035dd 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 @@ -33,6 +33,7 @@ public class UserDO extends BaseDO { private Long corpinfoId; //企业id @ApiModelProperty(value = "企业名称") + @TableField(exist = false) private String corpinfoName; //是否主账号1是0否 @ApiModelProperty(value = "是否主账号1是0否") @@ -45,12 +46,15 @@ public class UserDO extends BaseDO { private Long departmentId; //部门id @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + private String departmentName; //岗位id @ApiModelProperty(value = "岗位id") private Long postId; //岗位id @ApiModelProperty(value = "岗位名称") + @TableField(exist = false) private String postName; //角色id @ApiModelProperty(value = "角色id")