From fd11ffe72effa487b10523dcbcc7f7486354055f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 5 Nov 2025 11:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=92=8C=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/command/CorpInfoAddExe.java | 30 ++++++++++++++++++- .../basic/info/command/DepartmentAddExe.java | 15 +++++----- .../impl/DepartmentRepositoryImpl.java | 2 -- 3 files changed, 37 insertions(+), 10 deletions(-) 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 355da97..4b94de9 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 @@ -1,10 +1,16 @@ package com.zcloud.basic.info.command; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.tenant.facade.TenantFacade; +import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd; +import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.gateway.CorpInfoGateway; import com.zcloud.basic.info.domain.model.CorpInfoE; import com.zcloud.basic.info.dto.CorpInfoAddCmd; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -18,14 +24,36 @@ import org.springframework.transaction.annotation.Transactional; */ @Component @AllArgsConstructor +@Slf4j public class CorpInfoAddExe { private final CorpInfoGateway corpInfoGateway; + @DubboReference + private TenantFacade tenantFacade; @Transactional(rollbackFor = Exception.class) public Long execute(CorpInfoAddCmd cmd) { CorpInfoE examTypeE = new CorpInfoE(); BeanUtils.copyProperties(cmd, examTypeE); - return corpInfoGateway.add(examTypeE); + + Long corpInfoId ; + try { + corpInfoId = corpInfoGateway.add(examTypeE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (corpInfoId == null) { + throw new BizException("保存失败"); + } + OtaTenantAddCmd otaTenantAddCmd = new OtaTenantAddCmd(); + otaTenantAddCmd.setAccount(examTypeE.getCorpName()); + otaTenantAddCmd.setTenantId(corpInfoId); + otaTenantAddCmd.setTenantName(examTypeE.getCorpName()); + otaTenantAddCmd.setPassword("Aa@123456789"); + log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString()); + //TODO 企业推送gbs报错解密失败 + // Response response = tenantFacade.addOtaTenant(otaTenantAddCmd); + //log.info("CorpInfoXgfAddExe,新增企业调用GBS返回:{}",response.toString()); + return corpInfoId; } } 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 52aaa67..3b12b6c 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 @@ -2,6 +2,7 @@ package com.zcloud.basic.info.command; import com.alibaba.cola.dto.Response; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.system.client.dept.facade.DeptFacade; import com.jjb.saas.system.client.dept.request.FacadeAddDeptCmd; import com.jjb.saas.system.client.user.facade.UserFacade; @@ -36,12 +37,10 @@ public class DepartmentAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(DepartmentAddCmd cmd) { DepartmentE examTypeE = new DepartmentE(); + /* if(examTypeE.getParentId()==null){ + examTypeE.setParentId(AuthContext.getTenantId()); + }*/ BeanUtils.copyProperties(cmd, examTypeE); - - //a -// userFacade.addUser(new FacadeUserAddCmd()); -// C = examTypeE.add(a,b,c); - Long id = null; try { id = departmentGateway.add(examTypeE); @@ -56,10 +55,12 @@ public class DepartmentAddExe { FacadeAddDeptCmd deptCmd = new FacadeAddDeptCmd(); deptCmd.setLinkId(id); deptCmd.setLinkName(examTypeE.getName()); + deptCmd.setParentId(examTypeE.getParentId()); deptCmd.setDeptTypeEnum(DeptTypeEnum.DEPARTMENT.getValue()); - Response response = deptFacade.addDept(deptCmd); - log.info("DepartmentAddExe,新增部门调用GBS返回："+response.toString()); + //TODO gbs部门表 sys_dept tenant_id，parent_ids，add_type_enum，存储错误，导致gbs页面看不到，参数还没有，待定 +// Response response = deptFacade.addDept(deptCmd); +// log.info("DepartmentAddExe,新增部门调用GBS返回："+response.toString()); return true; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index fc659a0..37c203b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -45,8 +45,6 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listTree(Map parmas) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); -// SSOUser ssoUser = AuthContext.getCurrentUser(); -// queryWrapper.eq("tenant_id",ssoUser.getTenantId()); queryWrapper.orderByDesc("dep_order"); List departmentDOList = departmentMapper.selectList(queryWrapper); if (CollUtil.isEmpty(departmentDOList)) {