From 2a7772352c0cd6827dbc84be76404b751b48beeb Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 5 Aug 2026 15:52:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/facade/ZcloudCorpFacadeImpl.java | 8 +- .../basic/info/command/CorpInfoAddExe.java | 11 +- .../basic/info/command/CorpInfoXgfAddExe.java | 8 +- .../basic/info/command/DepartmentAddExe.java | 1 - .../zcloud/basic/info/command/UserAddExe.java | 14 +- .../basic/info/command/UserImportExe.java | 7 +- .../basic/info/command/UserUpdateExe.java | 23 ++- .../info/command/query/CorpInfoQueryExe.java | 9 +- .../command/query/DepartmentQueryExe.java | 7 +- .../info/command/query/UserQueryExe.java | 9 +- .../info/service/CorpInfoServiceImpl.java | 1 - .../basic/info/domain/enums/CorpTypeEnum.java | 182 +++++++++--------- .../basic/info/domain/enums/UserTypeEnum.java | 29 --- .../basic/info/domain/model/CorpInfoE.java | 5 +- .../zcloud/basic/info/domain/model/UserE.java | 14 +- .../info/gatewayimpl/UserGatewayImpl.java | 7 +- .../impl/CorpInfoRepositoryImpl.java | 23 ++- .../repository/impl/UserRepositoryImpl.java | 11 +- 18 files changed, 189 insertions(+), 180 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java index 3ff7eda8..cd519f0f 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java @@ -5,7 +5,6 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.api.CorpInfoServiceI; import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.dto.CorpInfoAddCmd; import com.zcloud.basic.info.dto.CorpInfoPageQry; import com.zcloud.basic.info.dto.CorpInfoUpdateCmd; @@ -17,6 +16,8 @@ import com.zcloud.gbscommon.zcloudcorp.request.ZcloudCorpInfoPageQry; import com.zcloud.gbscommon.zcloudcorp.request.ZcloudCorpInfoUpdateCmd; import com.zcloud.gbscommon.zcloudcorp.response.ZcloudCorpInfoCO; import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; +import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.BeanUtils; @@ -30,6 +31,9 @@ public class ZcloudCorpFacadeImpl implements ZcloudCorpFacade { private CorpInfoServiceI corpInfoService; @Resource private CorpInfoCoConvertor corpInfoCoConvertor; + + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; @Override public SingleResponse getCorpInfoById(Long id) { CorpInfoCO info = corpInfoService.info(id); @@ -83,7 +87,7 @@ public class ZcloudCorpFacadeImpl implements ZcloudCorpFacade { @Override public MultiResponse listCorpType(Integer enterpriseType) { - return MultiResponse.of(CorpTypeEnum.getCodesByEnterpriseType(enterpriseType)); + return MultiResponse.of(zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(enterpriseType)); } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java index 785f45a2..9579a853 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java @@ -8,7 +8,6 @@ import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd; import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor; import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor; import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.gateway.CorpFormGateway; import com.zcloud.basic.info.domain.gateway.CorpInfoGateway; import com.zcloud.basic.info.domain.gateway.UserGateway; @@ -21,6 +20,7 @@ import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.repository.*; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -52,7 +52,8 @@ public class CorpInfoAddExe { private final CorpFormCoConvertor corpFormCoConvertor; private final CorpFormGateway corpFormGateway; private final CorpFormRepository corpFormRepository; - + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; @Transactional(rollbackFor = Exception.class) public Long execute(CorpInfoAddCmd cmd) { @@ -68,7 +69,8 @@ public class CorpInfoAddExe { examTypeE.checkList(corpinfoByCode == null ? 0 : corpinfoByCode.size()); } try { - examTypeE.initPassWord(cmd.getType()); + + examTypeE.initPassWord(zcloudTenantTypeConfigFacade.getPasswordByCode(cmd.getType())); } catch (Exception e) { throw new RuntimeException(e); } @@ -102,7 +104,8 @@ public class CorpInfoAddExe { UserE userE = new UserE(); - userE.initCorpInfo(examTypeE,departmentId,corpInfoId); + + userE.initCorpInfo(examTypeE,departmentId,corpInfoId, zcloudTenantTypeConfigFacade.getUserTypeByCode(examTypeE.getType())); userRepository.addCorpUser(userE); UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE(); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java index d40d3e4c..6f5f05f0 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoXgfAddExe.java @@ -9,13 +9,13 @@ import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd; import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor; import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor; import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.gateway.CorpFormGateway; import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway; import com.zcloud.basic.info.domain.model.CorpFormE; import com.zcloud.basic.info.domain.model.CorpInfoXgfE; import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd; import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -44,13 +44,16 @@ public class CorpInfoXgfAddExe { @DubboReference private TenantFacade tenantFacade; + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; @Transactional(rollbackFor = Exception.class) public Long execute(CorpInfoXgfAddCmd cmd) { CorpInfoXgfE corpInfoXgfE = new CorpInfoXgfE(); BeanUtils.copyProperties(cmd, corpInfoXgfE); Long corpInfoId ; try { - corpInfoXgfE.setType(CorpTypeEnum.serviceProvider.getCode()); + // TODO zcloudTenantTypeConfigFacade这个方法是否废弃。目前写死CODE + corpInfoXgfE.setType(3); corpInfoId = corpInfoXgfGateway.addInfo(corpInfoXgfE); } catch (Exception e) { throw new RuntimeException(e); @@ -62,6 +65,7 @@ public class CorpInfoXgfAddExe { otaTenantAddCmd.setAccount(corpInfoXgfE.getCorpName()); otaTenantAddCmd.setTenantId(corpInfoId); otaTenantAddCmd.setTenantName(corpInfoXgfE.getCorpName()); + // TODO zcloudTenantTypeConfigFacade这个方法是否废弃。目前写死密码 otaTenantAddCmd.setPassword("Aa@12345678"); log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString()); Response response = tenantFacade.addOtaTenant(otaTenantAddCmd); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java index 563e150e..1694a475 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java @@ -7,7 +7,6 @@ import com.zcloud.basic.info.command.convertor.DepartmentSuperviseCoConvertor; import com.zcloud.basic.info.command.query.CorpInfoQueryExe; import com.zcloud.basic.info.command.query.DepartmentQueryExe; import com.zcloud.basic.info.domain.enums.CommonFlagEnum; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.basic.info.domain.gateway.DepartmentSuperviseGateway; import com.zcloud.basic.info.domain.model.DepartmentE; 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 8e940261..213bc00c 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 @@ -21,7 +21,6 @@ import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.command.query.CorpInfoQueryExe; import com.zcloud.basic.info.constant.RedisConstant; import com.zcloud.basic.info.domain.config.CodeConfig; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum; import com.zcloud.basic.info.domain.gateway.*; @@ -30,6 +29,7 @@ import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.persistence.dataobject.*; import com.zcloud.basic.info.persistence.repository.*; import com.zcloud.gbscommon.utils.*; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -80,6 +80,8 @@ public class UserAddExe { private final CodeConfig codeConfig; private final UserExpandInfoRepository userExpandInfoRepository; private final ImgFilesRepository imgFilesRepository; + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; @Transactional(rollbackFor = Exception.class) public boolean execute(UserAddCmd cmd) { @@ -119,9 +121,9 @@ public class UserAddExe { userE.setRoleId(roleId); } try { - userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType())); + userE.setUserType(zcloudTenantTypeConfigFacade.getUserTypeByCode(corpInfoDO.getType())); - userE.resetPassword(corpInfoDO.getType()); + userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType())); res = userGateway.add(userE); if (corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())) { corpName = corpInfoDO.getCorpName(); @@ -507,7 +509,7 @@ public class UserAddExe { BeanUtils.copyProperties(cmd, userE); userE.initAdd(tenantId, userE); CorpInfoDO corpInfoDO = corpInfoRepository.getById(userE.getCorpinfoId()); - userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType())); + userE.setUserType(zcloudTenantTypeConfigFacade.getUserTypeByCode(corpInfoDO.getType())); Long roleId = userRepository.getDefaultRoleId(); if (roleId == null) { throw new BizException("未创建默认通用角色，请联系管理员"); @@ -546,7 +548,9 @@ public class UserAddExe { } } else { List userEList = userCoConvertor.convertDOsToEs(userList); - userE.checkXGfPhone(userEList); + // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003 + Integer xgfCode = zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003"); + userE.checkXGfPhone(userEList,xgfCode); Optional optionalUserDO = userList.stream() .filter(u -> AuthContext.getTenantId().equals(u.getCorpinfoId()) || u.getCorpinfoId() == null) .findFirst(); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java index d5274dcf..20261d9c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java @@ -29,6 +29,7 @@ import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity; import com.zcloud.gbscommon.utils.ExcelUtils; import com.zcloud.gbscommon.utils.UuidUtil; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; @@ -63,7 +64,8 @@ public class UserImportExe { private DeptFacade deptFacade; @DubboReference private UserFacade userFacade; - + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; @Transactional(rollbackFor = Exception.class) public void importUserTable(MultipartFile file, Integer corpFlag) { Long corpinfoId = AuthContext.getTenantId(); @@ -418,7 +420,8 @@ public class UserImportExe { user.setUserIdCard(encodeBase64IdCard(importEntity.getUserIdCard())); user.setPersonnelType(importEntity.getPersonnelType()); user.setPersonnelTypeName(importEntity.getPersonnelTypeName()); - user.resetPassword(corpInfoDO.getType()); + + user.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType())); userGateway.add(user); String corpName = null; if(corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())){ diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java index d833c389..9d94a675 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java @@ -27,6 +27,7 @@ import com.zcloud.gbscommon.zcloudhidden.request.HiddenStatisticsListQry; import com.zcloud.gbscommon.zcloudhidden.request.HiddenUpdateCmd; import com.zcloud.gbscommon.zcloudhidden.response.HiddenListByUserCO; import com.zcloud.gbscommon.zcloudrisk.facade.ZcloudRiskFacade; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -71,6 +72,9 @@ public class UserUpdateExe { @DubboReference private ZcloudRiskFacade zcloudRiskFacade; + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; + @Transactional(rollbackFor = Exception.class) public void execute(UserUpdateCmd userUpdateCmd) { @@ -99,9 +103,10 @@ public class UserUpdateExe { CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId()); if(corpInfoDO != null){ - if(corpInfoDO.getType() == CorpTypeEnum.serviceProvider.getCode() - || corpInfoDO.getType() == CorpTypeEnum.cargoOwner.getCode() - || corpInfoDO.getType() == CorpTypeEnum.portUnit.getCode()){ + // TODO 相关方内容先写死 + List typeList = zcloudTenantTypeConfigFacade.listTypeByParentName("相关方"); + Set typeSet = new HashSet<>(typeList); + if(typeSet.contains(corpInfoDO.getType())){ // 先把其他相关方的账号找出来 List userByPhoneList = userRepository.listByPhone(userDO.getPhone()); List userIds = userByPhoneList.stream().map(UserDO::getId).collect(Collectors.toList()); @@ -123,12 +128,13 @@ public class UserUpdateExe { } if(detail.getData() != null){ // 调用底座修改账号 - userE.resetPassword(corpInfoDO.getType()); + + userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType())); userGateway.updateInfoAndPasswordByGBS(userE); if(!userE.getPhone().equals(userDO.getPhone())){ // 修改账号了，需要重置密码 UserE u = new UserE(); - u.resetPassword(corpInfoDO.getType()); + u.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType())); for (Long userId : userIds) { userRepository.changePassword(userId, u.getPassword()); } @@ -162,11 +168,11 @@ public class UserUpdateExe { if(detail.getData() != null){ // 调用底座修改账号 userGateway.updateInfoAndPasswordByGBS(userE); - userE.resetPassword(corpInfoDO.getType()); + userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType())); if(!userE.getPhone().equals(userDO.getPhone())){ // 账号修改了，需要重置密码 UserE u = new UserE(); - u.resetPassword(corpInfoDO.getType()); + u.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType())); userRepository.changePassword(userDO.getId(), u.getPassword()); } } @@ -407,7 +413,8 @@ public class UserUpdateExe { UserE userE = new UserE(); UserDO userDO = userRepository.getById( id); CorpInfoDO corpInfoDO = corpInfoRepository.getById(userDO.getCorpinfoId()); - userE.resetPassword(corpInfoDO.getType()); + + userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(corpInfoDO.getType())); userRepository.changePassword(id, userE.getPassword()); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index b6a433b1..d74f20e6 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -9,8 +9,6 @@ import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.security.starter.api.co.DecryptCmd; import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; -import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.model.CorpDepartmentE; import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.domain.model.UserE; @@ -24,8 +22,10 @@ import com.zcloud.basic.info.dto.clientobject.UserCO; import com.zcloud.basic.info.persistence.dataobject.*; import com.zcloud.basic.info.persistence.repository.*; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -50,6 +50,8 @@ public class CorpInfoQueryExe { private final UserQualificationInfoRepository userQualificationInfoRepository; private final CorpFormRepository corpFormRepository; private final CorpInfoCoConvertor corpFormCoConvertor; + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; // private final SecurityClientApi securityClientApi; // private final DesenstizationClientUtil desenstizationClientUtil; @@ -296,7 +298,8 @@ public class CorpInfoQueryExe { throw new BizException("企业不存在"); } //是相关方才会校验 - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.XGF.getCode()); + // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003 + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003")); if (!enterpriseType.contains(corpInfoDO.getType())) { return true; diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index b42cefa7..1917a2df 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor; import com.zcloud.basic.info.domain.enums.CommonFlagEnum; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.*; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; @@ -17,6 +16,7 @@ import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.apache.dubbo.config.annotation.DubboReference; @@ -44,6 +44,9 @@ public class DepartmentQueryExe { @DubboReference private ZcloudDepartmentFacade zcloudDepartmentFacade; + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; + /** * 分页 * @@ -189,7 +192,7 @@ public class DepartmentQueryExe { public Collection listAllTreeByCorpType(DepartmentTreeQry qry) { Map parmas = PageQueryHelper.toHashMap(qry); - List enterpriseType =CorpTypeEnum.getCodesByEnterpriseType(qry.getEnterpriseType()); + List enterpriseType =zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(qry.getEnterpriseType()); if (CollUtil.isNotEmpty(enterpriseType)) { parmas.put("inType",enterpriseType); } 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 6fe09ca3..2e25d66b 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 @@ -16,7 +16,6 @@ import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.constant.RedisConstant; import com.zcloud.basic.info.domain.config.NineCompanyConfig; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; -import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.dto.*; @@ -32,6 +31,7 @@ import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.ZcloudRedisUtil; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -61,7 +61,8 @@ public class UserQueryExe { private ZcloudRedisUtil zcloudRedisUtil; private final UserExpandInfoRepository userExpandInfoRepository; private final NineCompanyConfig nineCompanyConfig; - + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; /** * 分页 @@ -282,9 +283,11 @@ public class UserQueryExe { if(CollUtil.isEmpty(userDOList)){ throw new BizException("用户不存在"); } + // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003 + Integer xgfCode = zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003"); //获取在职的用户取第一个 UserDO userDO = userDOList.stream().filter(userDO1 -> UserEmploymentFlagEnum.ON.getCode().equals(userDO1.getEmploymentFlag())) - .filter(userDO1 -> UserTypeEnum.XGF.getCode().equals(userDO1.getUserType())).findFirst().orElse(null); + .filter(userDO1 -> xgfCode.equals(userDO1.getUserType())).findFirst().orElse(null); if(userDO == null){ userDO = userDOList.get(0); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index b679dbaf..5c099b56 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -8,7 +8,6 @@ import com.jjb.saas.security.starter.api.co.DecryptCmd; import com.zcloud.basic.info.api.CorpInfoServiceI; import com.zcloud.basic.info.command.*; import com.zcloud.basic.info.command.query.CorpInfoQueryExe; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.*; import com.zcloud.gbscommon.utils.Tools; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java index 4fdcf546..c932ce43 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java @@ -1,91 +1,91 @@ -package com.zcloud.basic.info.domain.enums; - -import cn.hutool.core.collection.CollUtil; -import lombok.Getter; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * corp_info 中的type字段枚举(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) - * 与传入enterpriseType中的关联关系 - * .企业类型1：监管 2：企业 3：相关方 - */ -@Getter -public enum CorpTypeEnum { - // TODO 若修改默认密码通知前端同步修改 - OrdinaryEnterprises(0,"普通企业",UserTypeEnum.QY.getCode(), "Bb@12345678"), - groupUnits(1, "集团单位",UserTypeEnum.QY.getCode(), "Bb@12345678"), - share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"), - serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode(), "Cc@12345678"), - cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"), - portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"), - materialCenter(6, "物资中心",UserTypeEnum.QY.getCode(), "Bb@12345678"); - - private static final Map> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>(); - - private final Integer code; - private final String name; - //传入的企业类型企业类型 1：监管 2：企业 3：相关方 - private final Integer userType; - private final String defaultPassword; - - CorpTypeEnum(Integer code, String name, Integer userType, String defaultPassword) { - this.code = code; - this.name = name; - this.userType = userType; - this.defaultPassword = defaultPassword; - } - static { - Arrays.stream(CorpTypeEnum.values()) - .collect(Collectors.groupingBy(CorpTypeEnum::getUserType)) - .forEach((userType, corpTypes) -> - ENTERPRISE_TYPE_CODE_MAP.put( - userType, - corpTypes.stream().map(CorpTypeEnum::getCode).collect(Collectors.toList()) - ) - ); - } - - public static List getCodesByEnterpriseType(Integer enterpriseType) { - return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()); - } - public static List getCodesByEnterpriseType(List enterpriseTypeList) { - if(CollUtil.isEmpty(enterpriseTypeList)){ - return null; - } - return enterpriseTypeList.stream() - .flatMap(enterpriseType -> - ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()).stream()) - .distinct() - .collect(Collectors.toList()); - - } - - public static Integer getUserTypeByCode(Integer code) { - for (CorpTypeEnum corpType : values()) { - if (corpType.code.equals(code)) { - return corpType.userType; - } - } - return null; - } - - public static String getPasswordByCode(Integer code) { - for (CorpTypeEnum corpType : values()) { - if (corpType.code.equals(code)) { - return corpType.defaultPassword; - } - } - return null; - } - - public static String getNameByCode(Integer code) { - for (CorpTypeEnum corpType : values()) { - if (corpType.code.equals(code)) { - return corpType.name; - } - } - return null; - } -} +//package com.zcloud.basic.info.domain.enums; +// +//import cn.hutool.core.collection.CollUtil; +//import lombok.Getter; +// +//import java.util.*; +//import java.util.stream.Collectors; +// +///** +// * corp_info 中的type字段枚举(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) +// * 与传入enterpriseType中的关联关系 +// * .企业类型1：监管 2：企业 3：相关方 +// */ +//@Getter +//public enum CorpTypeEnum { +// // TODO 若修改默认密码通知前端同步修改 +// OrdinaryEnterprises(0,"普通企业",UserTypeEnum.QY.getCode(), "Bb@12345678"), +// groupUnits(1, "集团单位",UserTypeEnum.QY.getCode(), "Bb@12345678"), +// share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"), +// serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode(), "Cc@12345678"), +// cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"), +// portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"), +// materialCenter(6, "物资中心",UserTypeEnum.QY.getCode(), "Bb@12345678"); +// +// private static final Map> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>(); +// +// private final Integer code; +// private final String name; +// //传入的企业类型企业类型 1：监管 2：企业 3：相关方 +// private final Integer userType; +// private final String defaultPassword; +// +// CorpTypeEnum(Integer code, String name, Integer userType, String defaultPassword) { +// this.code = code; +// this.name = name; +// this.userType = userType; +// this.defaultPassword = defaultPassword; +// } +// static { +// Arrays.stream(CorpTypeEnum.values()) +// .collect(Collectors.groupingBy(CorpTypeEnum::getUserType)) +// .forEach((userType, corpTypes) -> +// ENTERPRISE_TYPE_CODE_MAP.put( +// userType, +// corpTypes.stream().map(CorpTypeEnum::getCode).collect(Collectors.toList()) +// ) +// ); +// } +// +// public static List getCodesByEnterpriseType(Integer enterpriseType) { +// return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()); +// } +// public static List getCodesByEnterpriseType(List enterpriseTypeList) { +// if(CollUtil.isEmpty(enterpriseTypeList)){ +// return null; +// } +// return enterpriseTypeList.stream() +// .flatMap(enterpriseType -> +// ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()).stream()) +// .distinct() +// .collect(Collectors.toList()); +// +// } +// +// public static Integer getUserTypeByCode(Integer code) { +// for (CorpTypeEnum corpType : values()) { +// if (corpType.code.equals(code)) { +// return corpType.userType; +// } +// } +// return null; +// } +// +// public static String getPasswordByCode(Integer code) { +// for (CorpTypeEnum corpType : values()) { +// if (corpType.code.equals(code)) { +// return corpType.defaultPassword; +// } +// } +// return null; +// } +// +// public static String getNameByCode(Integer code) { +// for (CorpTypeEnum corpType : values()) { +// if (corpType.code.equals(code)) { +// return corpType.name; +// } +// } +// return null; +// } +//} diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java index 22c7bcf1..e69de29b 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserTypeEnum.java @@ -1,29 +0,0 @@ -package com.zcloud.basic.info.domain.enums; - -import lombok.Getter; -@Getter -public enum UserTypeEnum { - JG(1,"监管"), - QY(2,"企业"), - XGF(3,"相关方") - ; - private final Integer code; - private final String name; - - UserTypeEnum(Integer code, String name) { - this.code = code; - this.name = name; - } - - public static Integer getUserType(Integer corpType){ - if (corpType.equals(CorpTypeEnum.OrdinaryEnterprises.getCode()) || - corpType.equals(CorpTypeEnum.groupUnits.getCode())){ - return UserTypeEnum.QY.getCode(); - }else if (corpType.equals(CorpTypeEnum.share.getCode())){ - return UserTypeEnum.JG.getCode(); - }else { - return UserTypeEnum.XGF.getCode(); - } - } - -} diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java index 7a60cdc5..8b14c47b 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java @@ -5,7 +5,6 @@ import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.basic.info.domain.enums.CorpStateEnum; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; import io.swagger.annotations.ApiModelProperty; @@ -190,8 +189,8 @@ public class CorpInfoE extends BaseE { @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西") private Integer portArea; - public void initPassWord(Integer type) { - String encrypt = Sm2Util.encryptHex(MD5.md5(CorpTypeEnum.getPasswordByCode(type)), publicKey); + public void initPassWord(String password) { + String encrypt = Sm2Util.encryptHex(MD5.md5(password), publicKey); this.setPassword(encrypt); } 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 d023270d..11f39966 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 @@ -8,10 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.domain.model.BaseE; import com.jjb.saas.framework.utils.DataEncryptDecryptUtil; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum; -import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.gateway.DepartmentGateway; import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity; import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity; @@ -283,12 +281,12 @@ public class UserE extends BaseE { } } - public void initCorpInfo(CorpInfoE examTypeE, Long departmentId, Long corpInfoId) { + public void initCorpInfo(CorpInfoE examTypeE, Long departmentId, Long corpInfoId, Integer userType) { this.setId(corpInfoId); this.setName(examTypeE.getCorpName()); this.setUsername(examTypeE.getCorpName()); this.setDepartmentId(departmentId); - this.setUserType(CorpTypeEnum.getUserTypeByCode(examTypeE.getType())); + this.setUserType(userType); this.setCorpinfoId(corpInfoId); this.setOrgId(examTypeE.getTenantId()); this.setTenantId(examTypeE.getTenantId()); @@ -300,8 +298,8 @@ public class UserE extends BaseE { } } - public void resetPassword(Integer type) { - String encrypt = Sm2Util.encryptHex(MD5.md5(CorpTypeEnum.getPasswordByCode(type)), publicKey); + public void resetPassword(String password) { + String encrypt = Sm2Util.encryptHex(MD5.md5(password), publicKey); this.setPassword(encrypt); } @@ -371,7 +369,7 @@ public class UserE extends BaseE { } } - public void checkXGfPhone(List userEList) { + public void checkXGfPhone(List userEList, Integer xgfCode) { //判断在其他企业是否是固定人员 List userList = userEList.stream(). @@ -386,7 +384,7 @@ public class UserE extends BaseE { } userEList.forEach(userE -> { //如果是企业不是相关方企业，则不行 - if(!userE.getUserType().equals(UserTypeEnum.XGF.getCode()) && (UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag()) + if(!userE.getUserType().equals(xgfCode) && (UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag()) || UserEmploymentFlagEnum.ENTRY_AUDIT.getCode().equals(userE.getEmploymentFlag()) || UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode().equals(userE.getEmploymentFlag()))){ throw new BizException("当前手机号已存在"); 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 63f96413..32fef749 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 @@ -12,6 +12,7 @@ import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.repository.UserRepository; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.AllArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; @@ -37,7 +38,8 @@ public class UserGatewayImpl implements UserGateway { private final UserRepository userRepository; @DubboReference private UserFacade userFacade; - + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; @Override public Boolean add(UserE userE) { UserDO d = new UserDO(); @@ -71,7 +73,8 @@ public class UserGatewayImpl implements UserGateway { // 新增用户默认在职 userE.setEmploymentFlag(UserEmploymentFlagEnum.ON.getCode()); BeanUtils.copyProperties(userE, d); - userE.resetPassword(3); + // TODO zcloudTenantTypeConfigFacade 相关方默认写死 + userE.resetPassword(zcloudTenantTypeConfigFacade.getPasswordByCode(3)); d.setPassword(userE.getPassword()); userRepository.saveUserXgf(d); userE.setId(d.getId()); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index d6c32513..e4aafdef 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -21,7 +21,6 @@ import com.jjb.saas.system.client.unit.facade.UnitFacade; import com.jjb.saas.system.client.unit.request.OpeUnitAddCmd; import com.jjb.saas.system.client.unit.request.OpeUnitUpdateCmd; import com.jjb.saas.system.client.user.facade.UserFacade; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.CorpUseFlagEnum; import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; @@ -31,6 +30,7 @@ import com.zcloud.basic.info.persistence.mapper.CorpInfoMapper; import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; import com.zcloud.basic.info.utils.Query; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -63,6 +63,9 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { @@ -84,7 +87,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl queryWrapper, String menuPerms, Map params){ queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); if (CollUtil.isNotEmpty(enterpriseType)) { queryWrapper.in("type", enterpriseType); } @@ -97,7 +100,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl enterpriseTypeList = (List) params.get("enterpriseTypeList"); if (enterpriseTypeList != null && enterpriseTypeList.size() > 0){ - List entTypeList = CorpTypeEnum.getCodesByEnterpriseType(enterpriseTypeList); + List entTypeList = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(enterpriseTypeList); if (CollUtil.isNotEmpty(entTypeList)) { queryWrapper.in("type", entTypeList); } @@ -116,7 +119,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); if (CollUtil.isNotEmpty(enterpriseType)) { queryWrapper.in("type", enterpriseType); } @@ -134,7 +137,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listAll(Map params) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); if (CollUtil.isNotEmpty(enterpriseType)) { queryWrapper.in("type", enterpriseType); } @@ -143,7 +146,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl enterpriseTypeList = (List) params.get("enterpriseTypeList"); if (enterpriseTypeList != null && enterpriseTypeList.size() > 0){ - List entTypeList = CorpTypeEnum.getCodesByEnterpriseType(enterpriseTypeList); + List entTypeList = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(enterpriseTypeList); if (CollUtil.isNotEmpty(entTypeList)) { queryWrapper.in("type", entTypeList); } @@ -169,7 +172,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl tenantTypeMap = tenantTypeResponse.getData().stream().collect(Collectors.toMap(TenantTypeCO::getTenantTypeName, TenantTypeCO::getId)); OpeUnitAddCmd ouac = new OpeUnitAddCmd(); ouac.setTenantName(corpInfoDO.getCorpName()); - ouac.setTenantTypeId(tenantTypeMap.get(CorpTypeEnum.getNameByCode(corpInfoDO.getType()))); + ouac.setTenantTypeId(tenantTypeMap.get(zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType()))); //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) // if(corpInfoDO.getType() == 0 || corpInfoDO.getType() == 1 || corpInfoDO.getType() == 2){ // ouac.setTenantTypeId(1990693345743208448L); @@ -263,7 +266,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); if (CollUtil.isNotEmpty(enterpriseType)) { params.put("type", enterpriseType); } @@ -311,7 +314,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl corpUserStatisticPage(Map params) { IPage iPage = new Query().getPage(params); if (ObjectUtil.isNotEmpty(params.get("enterpriseType"))) { - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); if (CollUtil.isNotEmpty(enterpriseType)) { params.put("type", enterpriseType); } 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 019ef8bf..f15f091e 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 @@ -22,10 +22,8 @@ import com.jjb.saas.system.client.role.response.RoleCO; import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.*; import com.jjb.saas.system.client.user.response.UserDetailCO; -import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; -import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.persistence.dataobject.DepartmentLeaderStatictiscDO; import com.zcloud.basic.info.persistence.dataobject.UserCorpInfoDO; @@ -37,6 +35,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; +import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -72,6 +71,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i @Autowired private RemoteEventPublisher remoteEventPublisher; + @DubboReference + private ZcloudTenantTypeConfigFacade zcloudTenantTypeConfigFacade; + @Override public PageResponse listPage(Map params) { @@ -131,7 +133,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i } } QueryWrapper queryWrapper = new QueryWrapper<>(); - List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + List enterpriseType = zcloudTenantTypeConfigFacade.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); if (CollUtil.isNotEmpty(enterpriseType)) { params.remove("enterpriseType"); queryWrapper.in("c.type", enterpriseType); @@ -385,7 +387,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i // 相关方 userDO.setCorpinfoId(null); // 默认是相关方 - userDO.setUserType(UserTypeEnum.XGF.getCode()); + // TODO zcloudTenantTypeConfigFacade特定业务，写死的defaultType0003 + userDO.setUserType(zcloudTenantTypeConfigFacade.getDefaultType("defaultType0003")); save(userDO); } From 959c6a2d4192082381881ebb774c1ca4996c904c Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 6 Aug 2026 16:55:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/repository/impl/CorpInfoRepositoryImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index e4aafdef..49b6fce9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -172,7 +172,12 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl tenantTypeMap = tenantTypeResponse.getData().stream().collect(Collectors.toMap(TenantTypeCO::getTenantTypeName, TenantTypeCO::getId)); OpeUnitAddCmd ouac = new OpeUnitAddCmd(); ouac.setTenantName(corpInfoDO.getCorpName()); + log.info("tenantTypeMap", tenantTypeMap); + log.info("corpInfoDO.getType()", corpInfoDO.getType()); + log.info("zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType())", zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType())); ouac.setTenantTypeId(tenantTypeMap.get(zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType()))); + + log.info("ouac", ouac.getTenantTypeId()); //企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) // if(corpInfoDO.getType() == 0 || corpInfoDO.getType() == 1 || corpInfoDO.getType() == 2){ // ouac.setTenantTypeId(1990693345743208448L); From f1f1684f0bd2ebd5d6cfd70b6380c7aabafd639e Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 6 Aug 2026 17:08:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/impl/CorpInfoRepositoryImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 49b6fce9..b09775ae 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -172,9 +172,12 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl tenantTypeMap = tenantTypeResponse.getData().stream().collect(Collectors.toMap(TenantTypeCO::getTenantTypeName, TenantTypeCO::getId)); OpeUnitAddCmd ouac = new OpeUnitAddCmd(); ouac.setTenantName(corpInfoDO.getCorpName()); - log.info("tenantTypeMap", tenantTypeMap); + log.info("tenantTypeMap:{}",tenantTypeMap); + log.info("tenantTypeMap:{}",tenantTypeMap.toString()); + log.info("tenantTypeResponse:{}",tenantTypeResponse.toString()); + System.out.println(corpInfoDO.getType()+"-------------------corpInfoDO.getType()"); log.info("corpInfoDO.getType()", corpInfoDO.getType()); - log.info("zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType())", zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType())); + log.info("zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType()):{}", zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType())); ouac.setTenantTypeId(tenantTypeMap.get(zcloudTenantTypeConfigFacade.getNameByCode(corpInfoDO.getType()))); log.info("ouac", ouac.getTenantTypeId()); From dd02f40658d5a391ed5981c940e5b0716460431c Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 12 Aug 2026 15:35:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E7=A7=9F=E6=88=B7=E4=B8=BB=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/facade/ZcloudCorpFacadeImpl.java | 11 +++++++++++ .../com/zcloud/basic/info/command/CorpInfoAddExe.java | 5 +++++ .../basic/info/service/CorpInfoServiceImpl.java | 5 +++++ .../com/zcloud/basic/info/api/CorpInfoServiceI.java | 2 ++ 4 files changed, 23 insertions(+) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java index cd519f0f..09600e87 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.facade; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.api.CorpInfoServiceI; import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; @@ -20,6 +21,7 @@ import com.zcloud.gbscommon.zcloudsysconfig.facade.ZcloudTenantTypeConfigFacade; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.BeanUtils; +import org.springframework.http.ResponseEntity; import javax.annotation.Resource; import java.util.Collection; @@ -90,4 +92,13 @@ public class ZcloudCorpFacadeImpl implements ZcloudCorpFacade { return MultiResponse.of(zcloudTenantTypeConfigFacade.getCodesByEnterpriseType(enterpriseType)); } + public Response saveAdminCorp() { + Integer type = zcloudTenantTypeConfigFacade.getDefaultType("defaultType0001"); + if (type == null){ + return Response.buildFailure("请先配置默认类型"); + } + + return Response.buildSuccess(); + } + } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java index 9579a853..5b788aaf 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java @@ -114,5 +114,10 @@ public class CorpInfoAddExe { userEmploymentLogRepository.addCorpUserEmploymentLog(userEmploymentLogE); return corpInfoId; } + + @Transactional(rollbackFor = Exception.class) + public Long saveAdminCorp() { +return null; + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 5c099b56..0ae94333 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -155,5 +155,10 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { public CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry) { return corpInfoQueryExe.corpUserSummary(qry); } + + @Override + public void saveAdminCorp() { + corpInfoAddExe.saveAdminCorp(); + } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java index 92f80921..91121f3b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java @@ -59,5 +59,7 @@ public interface CorpInfoServiceI { PageResponse corpUserStatisticPage(CorpUserStatisticQry qry); CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry); + + void saveAdminCorp(); }