From 01ebd01ab0efba942554782881b4f83e9c26d124 Mon Sep 17 00:00:00 2001 From: liuyang Date: Tue, 10 Dec 2024 16:47:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:[REQ-3282]=20=E7=BC=96=E5=86=99=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E4=BA=8C=E6=96=B9SDK=E7=9A=84demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApolloGroupTaskOrderClientImpl.java | 4 +- .../orgmanax/integration/core/RpcUtils.java | 44 ------------------- .../orgmanax/integration/core/RpcWrapper.java | 32 ++++++++++++++ 3 files changed, 34 insertions(+), 46 deletions(-) delete mode 100644 orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcUtils.java create mode 100644 orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcWrapper.java diff --git a/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/apollo/ApolloGroupTaskOrderClientImpl.java b/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/apollo/ApolloGroupTaskOrderClientImpl.java index 3c0ab8f..ad21e41 100644 --- a/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/apollo/ApolloGroupTaskOrderClientImpl.java +++ b/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/apollo/ApolloGroupTaskOrderClientImpl.java @@ -4,7 +4,7 @@ import cn.axzo.apollo.api.ApolloGroupTaskOrderApi; import cn.axzo.apollo.api.res.CheckWorkerIsFinishGroupRes; import cn.axzo.orgmanax.infra.client.apollo.ApolloGroupTaskOrderClient; import cn.axzo.orgmanax.infra.client.apollo.dto.CheckProjectTeamWorkerIsFinishGroupTaskResp; -import cn.axzo.orgmanax.integration.core.RpcUtils; +import cn.axzo.orgmanax.integration.core.RpcWrapper; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -22,7 +22,7 @@ public class ApolloGroupTaskOrderClientImpl implements ApolloGroupTaskOrderClien * @return 任务单详情 */ public List checkProjectTeamWorkerIsFinishGroupTask(Long projectTeamId, List workerIds) { - List result = RpcUtils.getResult(groupTaskOrderApi.checkProjectTeamWorkerIsFinishGroupTask(projectTeamId, workerIds)); + List result = RpcWrapper.wrapApolloResult(() -> groupTaskOrderApi.checkProjectTeamWorkerIsFinishGroupTask(projectTeamId, workerIds)); return BeanUtil.copyToList(result, CheckProjectTeamWorkerIsFinishGroupTaskResp.class); } } diff --git a/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcUtils.java b/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcUtils.java deleted file mode 100644 index 8b39d47..0000000 --- a/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcUtils.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.axzo.orgmanax.integration.core; - -import cn.axzo.foundation.exception.BusinessException; -import cn.axzo.framework.domain.web.BizException; -import cn.axzo.framework.domain.web.result.ApiListResult; -import cn.axzo.framework.domain.web.result.ApiResult; -import cn.axzo.orgmanax.common.config.BizResultCode; -import cn.azxo.framework.common.model.CommonResponse; -import cn.hutool.core.convert.Convert; - -import java.util.List; -import java.util.Objects; - -/** - * rpc调用结果封装 - */ -public class RpcUtils { - - - public static T getResult(CommonResponse result) { - return getResult(result, true); - } - - public static T getResult(CommonResponse result, Boolean throwException) { - if (result == null) { - throw new BusinessException(BizResultCode.RPC_ERROR); - } - if (!Objects.equals(Convert.toStr(result.getCode()), BizResultCode.SUCCESS.getErrorCode()) && Boolean.TRUE.equals(throwException)) { - throw new BusinessException(Convert.toStr(result.getCode(), null), result.getMsg(), null); - } - return result.getData(); - } - - - public static T getResult(cn.axzo.apollo.core.web.Result result) { - if (result == null) { - throw new BusinessException(BizResultCode.RPC_ERROR); - } - if (!Objects.equals(Convert.toStr(result.getCode()), BizResultCode.SUCCESS.getErrorCode())) { - throw new BusinessException(Convert.toStr(result.getCode()), result.getMsg(), null); - } - return result.getData(); - } -} diff --git a/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcWrapper.java b/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcWrapper.java new file mode 100644 index 0000000..055a39d --- /dev/null +++ b/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/core/RpcWrapper.java @@ -0,0 +1,32 @@ +package cn.axzo.orgmanax.integration.core; + +import cn.axzo.apollo.core.web.Result; +import cn.axzo.foundation.exception.BusinessException; +import cn.axzo.orgmanax.common.config.BizResultCode; +import cn.hutool.core.convert.Convert; +import cn.hutool.http.HttpStatus; +import lombok.extern.slf4j.Slf4j; + +import java.util.Objects; +import java.util.function.Supplier; + +@Slf4j +public class RpcWrapper { + + /** + * apollo 包使用 + * @param supplier + * @return + * @param + */ + public static T wrapApolloResult(Supplier> supplier) { + Result result = supplier.get(); + if (result == null) { + throw new BusinessException(BizResultCode.RPC_ERROR); + } + if (!Objects.equals(result.getCode(), HttpStatus.HTTP_OK)) { + throw new BusinessException(Convert.toStr(result.getCode()), result.getMsg(), null); + } + return result.getData(); + } +}