diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java index a414313..803ee75 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.honeycombis.honeycom.common.core.util.R; import com.honeycombis.honeycom.spdm.dto.TenantPageQueryDto; import com.honeycombis.honeycom.spdm.feign.RemoteTenantServiceFeign; +import com.honeycombis.honeycom.spdm.feign.SpdmServiceFeignClient; import com.honeycombis.honeycom.spdm.util.PageResult; import com.honeycombis.honeycom.spdm.util.ResponseR; import com.honeycombis.honeycom.tenant.vo.tenant.SysTenantVO; @@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -42,11 +44,14 @@ import java.util.List; @AllArgsConstructor @RequestMapping("/spdm-tenant") @Tag(description = "spdm", name = "提供给SPDM的租户模块") +@Slf4j public class SpdmTenantController { @Resource private RemoteTenantServiceFeign remoteTenantServiceFeign; @Resource + private SpdmServiceFeignClient spdmServiceFeignClient; + @Resource private ObjectMapper objectMapper; @@ -68,7 +73,7 @@ public class SpdmTenantController { if (listTenantForPage.getData() != null && CollectionUtils.isNotEmpty(listTenantForPage.getData().getRecords())) { return ResponseR.ok(listTenantForPage.getData().getRecords().get(0)); } - return ResponseR.ok(); + return ResponseR.ok(); } @Operation(summary = "查询所有租户" , description = "查询所有租户" ) @@ -77,4 +82,10 @@ public class SpdmTenantController { return ResponseR.ok(remoteTenantServiceFeign.getAll().getData()); } + @PostMapping("/initNewTenant") + public void initNewTenant(@RequestParam Long tenantId) { + ResponseR responseR = spdmServiceFeignClient.initNewTenant(tenantId); + log.info("[initNewTenant] tenantId:{}, responseR:{}", tenantId, responseR); + } + } diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java index 57a74ba..fbbd350 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/SpdmServiceFeignClient.java @@ -3,6 +3,7 @@ package com.honeycombis.honeycom.spdm.feign; import com.honeycombis.honeycom.common.core.util.R; import com.honeycombis.honeycom.spdm.dto.ApproveResultDto; import com.honeycombis.honeycom.spdm.dto.SysLogDto; +import com.honeycombis.honeycom.spdm.util.ResponseR; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -18,4 +19,7 @@ public interface SpdmServiceFeignClient { @PostMapping("/systemLog/saveLog") R saveLog(@RequestBody SysLogDto sysLogDto); + @PostMapping("/tenant/initNewTenant") + ResponseR initNewTenant(@RequestParam Long tenantId); + } diff --git a/honeycom-tenant/honeycom-tenant-api/src/main/java/com/honeycombis/honeycom/tenant/feign/RemoteSpdmService.java b/honeycom-tenant/honeycom-tenant-api/src/main/java/com/honeycombis/honeycom/tenant/feign/RemoteSpdmService.java new file mode 100644 index 0000000..f81230e --- /dev/null +++ b/honeycom-tenant/honeycom-tenant-api/src/main/java/com/honeycombis/honeycom/tenant/feign/RemoteSpdmService.java @@ -0,0 +1,15 @@ +package com.honeycombis.honeycom.tenant.feign; + +import com.honeycombis.honeycom.common.core.constant.ServiceNameConstants; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + + + +@FeignClient(contextId = "remoteSpdmTenantService", value = ServiceNameConstants.SPDM_SERVICE) +public interface RemoteSpdmService { + + @PostMapping("/honeycom-spdm/spdm-tenant/initNewTenant") + void initNewTenant(@RequestParam Long tenantId); +} diff --git a/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysTenantServiceImpl.java b/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysTenantServiceImpl.java index adf371a..7405749 100644 --- a/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysTenantServiceImpl.java +++ b/honeycom-tenant/honeycom-tenant-biz/src/main/java/com/honeycombis/honeycom/tenant/service/impl/SysTenantServiceImpl.java @@ -25,6 +25,7 @@ import com.honeycombis.honeycom.tenant.dto.SysInviteSendDTO; import com.honeycombis.honeycom.tenant.dto.SysTenantAddDTO; import com.honeycombis.honeycom.tenant.dto.SysTenantUpdateDTO; import com.honeycombis.honeycom.tenant.entity.*; +import com.honeycombis.honeycom.tenant.feign.RemoteSpdmService; import com.honeycombis.honeycom.tenant.mapper.SysTenantMapper; import com.honeycombis.honeycom.tenant.service.*; import com.honeycombis.honeycom.tenant.utils.BeanUtils; @@ -74,6 +75,7 @@ public class SysTenantServiceImpl extends ServiceImpl