From 730288aba8acd39f00a4fa42df9310a392aa3d37 Mon Sep 17 00:00:00 2001 From: jsonwan Date: Mon, 6 Sep 2021 20:30:47 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=8F=90=E4=BE=9BJOB=E7=9A=84=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8B=93=E6=89=91=5Fbk=5Fiam=5Fpath=5F=20=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E6=9D=83=E9=99=90=E4=B8=AD=E5=BF=83=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E7=B2=BE=E5=87=86=E5=BA=A6=20#181?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/common-iam/libs/iam-sdk-1.0.0.jar | Bin 113589 -> 115097 bytes .../iam/service/BaseIamCallbackService.java | 70 ++++++++++ .../IamDashBoardViewCallbackResourceImpl.java | 106 ++++++-------- .../iam/impl/IamCallbackControllerImpl.java | 111 ++++++++------- .../bk/job/crontab/dao/CronJobDAO.java | 8 ++ .../job/crontab/dao/impl/CronJobDAOImpl.java | 21 ++- .../job/crontab/service/CronJobService.java | 16 +++ .../service/impl/CronJobServiceImpl.java | 36 ++++- .../execute/dao/impl/TaskInstanceDAOImpl.java | 15 +- .../IamFileSourceCallbackResourceImpl.java | 119 ++++++++-------- .../impl/IamAccountCallbackResourceImpl.java | 114 +++++++--------- .../IamPublicScriptCallbackResourceImpl.java | 14 +- .../impl/IamScriptCallbackResourceImpl.java | 14 +- .../iam/impl/IamTagCallbackResourceImpl.java | 68 ++++----- .../impl/IamTaskPlanCallbackResourceImpl.java | 100 +++++++------- .../IamTaskTemplateCallbackResourceImpl.java | 103 +++++++------- .../api/iam/impl/ScriptCallbackHelper.java | 129 +++++++++--------- 17 files changed, 582 insertions(+), 462 deletions(-) create mode 100644 src/backend/commons/common-iam/src/main/java/com/tencent/bk/job/common/iam/service/BaseIamCallbackService.java diff --git a/src/backend/commons/common-iam/libs/iam-sdk-1.0.0.jar b/src/backend/commons/common-iam/libs/iam-sdk-1.0.0.jar index c2c69f1a4a6ef492ed3189e78160ff302a65f5f0..e216caafc5b7906ae7c24ca2d6af9e7ba925a825 100644 GIT binary patch delta 7344 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 F;eR{$j-3Di delta 5895 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 diff --git a/src/backend/commons/common-iam/src/main/java/com/tencent/bk/job/common/iam/service/BaseIamCallbackService.java b/src/backend/commons/common-iam/src/main/java/com/tencent/bk/job/common/iam/service/BaseIamCallbackService.java new file mode 100644 index 0000000000..f74385a571 --- /dev/null +++ b/src/backend/commons/common-iam/src/main/java/com/tencent/bk/job/common/iam/service/BaseIamCallbackService.java @@ -0,0 +1,70 @@ +package com.tencent.bk.job.common.iam.service; + +import com.tencent.bk.sdk.iam.constants.CommonResponseCode; +import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; +import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; +import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeResponseDTO; +import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeValueResponseDTO; +import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceByPolicyResponseDTO; +import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO; +import com.tencent.bk.sdk.iam.dto.callback.response.SearchInstanceResponseDTO; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public abstract class BaseIamCallbackService { + + public CallbackBaseResponseDTO getFailResp(Long code, String message) { + CallbackBaseResponseDTO respDTO = new CallbackBaseResponseDTO(); + respDTO.setCode(code); + respDTO.setMessage(message); + return respDTO; + } + + public CallbackBaseResponseDTO getNotFoundResp(String message) { + return getFailResp(CommonResponseCode.NOT_FOUND, message); + } + + public CallbackBaseResponseDTO getNotFoundRespById(String id) { + String msg = String.format("cannot find resource by id %d, may be deleted", id); + log.warn(msg); + return getNotFoundResp(msg); + } + + protected abstract ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest); + + protected abstract SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest); + + protected abstract CallbackBaseResponseDTO fetchInstanceResp(CallbackRequestDTO callbackRequest); + + public CallbackBaseResponseDTO baseCallback(CallbackRequestDTO callbackRequest) { + CallbackBaseResponseDTO response; + switch (callbackRequest.getMethod()) { + case LIST_INSTANCE: + response = listInstanceResp(callbackRequest); + break; + case FETCH_INSTANCE_INFO: + response = fetchInstanceResp(callbackRequest); + break; + case LIST_ATTRIBUTE: + response = new ListAttributeResponseDTO(); + response.setCode(0L); + break; + case LIST_ATTRIBUTE_VALUE: + response = new ListAttributeValueResponseDTO(); + response.setCode(0L); + break; + case LIST_INSTANCE_BY_POLICY: + response = new ListInstanceByPolicyResponseDTO(); + response.setCode(0L); + break; + case SEARCH_INSTANCE: + response = searchInstanceResp(callbackRequest); + break; + default: + log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), + callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); + response = new CallbackBaseResponseDTO(); + } + return response; + } +} diff --git a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/iam/impl/IamDashBoardViewCallbackResourceImpl.java b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/iam/impl/IamDashBoardViewCallbackResourceImpl.java index a8fde51385..7b793aa217 100644 --- a/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/iam/impl/IamDashBoardViewCallbackResourceImpl.java +++ b/src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/api/iam/impl/IamDashBoardViewCallbackResourceImpl.java @@ -26,15 +26,15 @@ import com.tencent.bk.job.analysis.api.iam.IamDashBoardViewCallbackResource; import com.tencent.bk.job.analysis.consts.AnalysisConsts; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.BaseDataResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.FetchInstanceInfoResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.InstanceInfoDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeValueResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceByPolicyResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.SearchInstanceResponseDTO; import lombok.extern.slf4j.Slf4j; @@ -46,13 +46,15 @@ @RestController @Slf4j -public class IamDashBoardViewCallbackResourceImpl implements IamDashBoardViewCallbackResource { +public class IamDashBoardViewCallbackResourceImpl extends BaseIamCallbackService + implements IamDashBoardViewCallbackResource { @Autowired public IamDashBoardViewCallbackResourceImpl() { } - private ListInstanceResponseDTO listInstanceResp() { + @Override + protected ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { List instanceInfoList = new ArrayList<>(); // TODO:当前只有全局视图，待后续视图功能开发后更新这里 InstanceInfoDTO tmpInstanceInfo = new InstanceInfoDTO(); @@ -69,10 +71,11 @@ private ListInstanceResponseDTO listInstanceResp() { return instanceResponse; } - private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { SearchInstanceResponseDTO instanceResponse = new SearchInstanceResponseDTO(); String keyword = callbackRequest.getFilter().getKeyword(); - if (AnalysisConsts.GLOBAL_DASHBOARD_VIEW_NAME.contains(keyword)) { + if (keyword == null || AnalysisConsts.GLOBAL_DASHBOARD_VIEW_NAME.contains(keyword)) { List instanceInfoList = new ArrayList<>(); InstanceInfoDTO tmpInstanceInfo = new InstanceInfoDTO(); tmpInstanceInfo.setId(AnalysisConsts.GLOBAL_DASHBOARD_VIEW_ID); @@ -95,66 +98,41 @@ private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callback } @Override - public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { - CallbackBaseResponseDTO response; + protected CallbackBaseResponseDTO fetchInstanceResp( + CallbackRequestDTO callbackRequest + ) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(); - break; - case FETCH_INSTANCE_INFO: - log.debug("Fetch instance info request!|{}|{}|{}", callbackRequest.getType(), - callbackRequest.getFilter(), callbackRequest.getPage()); - - List instanceAttributeInfoList = new ArrayList<>(); - for (String instanceId : searchCondition.getIdList()) { - try { - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); - if (AnalysisConsts.GLOBAL_DASHBOARD_VIEW_ID.equals(instanceId)) { - instanceInfo.setDisplayName(AnalysisConsts.GLOBAL_DASHBOARD_VIEW_NAME); - } else { - instanceInfo.setDisplayName("Unknown(may be deleted)"); - log.warn("Unexpected dashBoardViewId:{} passed by iam", instanceId); - } - instanceAttributeInfoList.add(instanceInfo); - } catch (NumberFormatException e) { - log.error("Parse object id failed!|{}", instanceId, e); - } + List instanceAttributeInfoList = new ArrayList<>(); + for (String instanceId : searchCondition.getIdList()) { + try { + if (!AnalysisConsts.GLOBAL_DASHBOARD_VIEW_ID.equals(instanceId)) { + return getNotFoundRespById(instanceId); } + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + rootNode.setType(ResourceId.DASHBOARD_VIEW); + rootNode.setId(AnalysisConsts.GLOBAL_DASHBOARD_VIEW_ID); + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(instanceId); + instanceInfo.setDisplayName(AnalysisConsts.GLOBAL_DASHBOARD_VIEW_NAME); + instanceInfo.setPath(path); + instanceAttributeInfoList.add(instanceInfo); + } catch (NumberFormatException e) { + log.error("Parse object id failed!|{}", instanceId, e); + } + } - FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); - fetchInstanceInfoResponse.setCode(0L); - fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); + fetchInstanceInfoResponse.setCode(0L); + fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + return fetchInstanceInfoResponse; + } - response = fetchInstanceInfoResponse; - break; - case LIST_ATTRIBUTE: - log.debug("List attribute request!|{}|{}|{}", callbackRequest.getType(), callbackRequest.getFilter(), - callbackRequest.getPage()); - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - log.debug("List attribute value request!|{}|{}|{}", callbackRequest.getType(), - callbackRequest.getFilter(), callbackRequest.getPage()); - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - log.debug("List instance by policy request!|{}|{}|{}", callbackRequest.getType(), - callbackRequest.getFilter(), callbackRequest.getPage()); - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); - } - return response; + @Override + public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { + return baseCallback(callbackRequest); } } diff --git a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/iam/impl/IamCallbackControllerImpl.java b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/iam/impl/IamCallbackControllerImpl.java index 70ba83918e..516d559082 100644 --- a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/iam/impl/IamCallbackControllerImpl.java +++ b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/api/iam/impl/IamCallbackControllerImpl.java @@ -24,20 +24,20 @@ package com.tencent.bk.job.crontab.api.iam.impl; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; import com.tencent.bk.job.common.iam.util.IamRespUtil; import com.tencent.bk.job.common.model.BaseSearchCondition; import com.tencent.bk.job.common.model.PageData; import com.tencent.bk.job.crontab.api.iam.IamCallbackController; import com.tencent.bk.job.crontab.model.dto.CronJobInfoDTO; import com.tencent.bk.job.crontab.service.CronJobService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.FetchInstanceInfoResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.InstanceInfoDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeValueResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceByPolicyResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.SearchInstanceResponseDTO; import lombok.extern.slf4j.Slf4j; @@ -47,13 +47,11 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; -/** - * @since 23/3/2020 11:20 - */ @Slf4j @RestController -public class IamCallbackControllerImpl implements IamCallbackController { +public class IamCallbackControllerImpl extends BaseIamCallbackService implements IamCallbackController { private final CronJobService cronJobService; @@ -80,7 +78,8 @@ private InstanceInfoDTO convert(CronJobInfoDTO cronJobInfo) { return instanceInfo; } - private SearchInstanceResponseDTO searchInstanceResp( + @Override + protected SearchInstanceResponseDTO searchInstanceResp( CallbackRequestDTO callbackRequest ) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); @@ -94,7 +93,8 @@ private SearchInstanceResponseDTO searchInstanceResp( return IamRespUtil.getSearchInstanceRespFromPageData(cronJobInfoPageData, this::convert); } - private ListInstanceResponseDTO listInstanceResp( + @Override + protected ListInstanceResponseDTO listInstanceResp( CallbackRequestDTO callbackRequest ) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); @@ -108,53 +108,52 @@ private ListInstanceResponseDTO listInstanceResp( } @Override - public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { - CallbackBaseResponseDTO response; - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(callbackRequest); - break; - case FETCH_INSTANCE_INFO: - IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); - List instanceAttributeInfoList = new ArrayList<>(); - for (String instanceId : searchCondition.getIdList()) { - try { - long id = Long.parseLong(instanceId); - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); - instanceInfo.setDisplayName(cronJobService.getCronJobNameById(id)); - instanceAttributeInfoList.add(instanceInfo); - } catch (NumberFormatException e) { - log.error("Parse object id failed!|{}", instanceId, e); - } - } - - FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); - fetchInstanceInfoResponse.setCode(0L); - fetchInstanceInfoResponse.setData(instanceAttributeInfoList); - - response = fetchInstanceInfoResponse; - break; - case LIST_ATTRIBUTE: - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); + protected CallbackBaseResponseDTO fetchInstanceResp( + CallbackRequestDTO callbackRequest + ) { + IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); + List instanceAttributeInfoList = new ArrayList<>(); + List cronJobIdList = new ArrayList<>(); + for (String instanceId : searchCondition.getIdList()) { + try { + long id = Long.parseLong(instanceId); + cronJobIdList.add(id); + } catch (NumberFormatException e) { + log.error("Parse object id failed!|{}", instanceId, e); + } } - return response; + Map cronJobInfoMap = cronJobService.getCronJobInfoMapByIds(cronJobIdList); + for (Long id : cronJobIdList) { + CronJobInfoDTO cronJobInfoDTO = cronJobInfoMap.get(id); + if (cronJobInfoDTO == null) { + return getNotFoundRespById(id.toString()); + } + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + rootNode.setType(ResourceId.APP); + rootNode.setId(cronJobInfoDTO.getAppId().toString()); + PathInfoDTO cronJobNode = new PathInfoDTO(); + cronJobNode.setType(ResourceId.CRON); + cronJobNode.setId(cronJobInfoDTO.getId().toString()); + rootNode.setChild(cronJobNode); + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(id.toString()); + instanceInfo.setDisplayName(cronJobInfoDTO.getName()); + instanceInfo.setPath(path); + instanceAttributeInfoList.add(instanceInfo); + } + + FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); + fetchInstanceInfoResponse.setCode(0L); + fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + return fetchInstanceInfoResponse; + } + + @Override + public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { + return baseCallback(callbackRequest); } } diff --git a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/CronJobDAO.java b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/CronJobDAO.java index 842d4bf42f..218936c7e6 100644 --- a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/CronJobDAO.java +++ b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/CronJobDAO.java @@ -53,6 +53,14 @@ PageData listPageCronJobsByCondition(CronJobInfoDTO cronJobCondi */ CronJobInfoDTO getCronJobById(long cronJobId); + /** + * 根据定时任务 IDs 查询定时任务信息 + * + * @param cronJobIdList 定时任务 IDs + * @return 定时任务信息 + */ + List getCronJobByIds(List cronJobIdList); + /** * 根据定时任务 ID 查询定时任务信息 * diff --git a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/impl/CronJobDAOImpl.java b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/impl/CronJobDAOImpl.java index a87679e204..cb501a1ede 100644 --- a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/impl/CronJobDAOImpl.java +++ b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/impl/CronJobDAOImpl.java @@ -37,7 +37,14 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.OrderField; +import org.jooq.Record1; +import org.jooq.Record21; +import org.jooq.Result; +import org.jooq.TableField; +import org.jooq.UpdateSetMoreStep; import org.jooq.generated.tables.CronJob; import org.jooq.generated.tables.records.CronJobRecord; import org.jooq.types.UByte; @@ -172,6 +179,14 @@ public CronJobInfoDTO getCronJobById(long cronJobId) { return getCronJobByConditions(conditions); } + @Override + public List getCronJobByIds(List cronJobIdList) { + List conditions = new ArrayList<>(); + conditions.add(TABLE.ID.in(cronJobIdList.parallelStream().map(ULong::valueOf).collect(Collectors.toList()))); + conditions.add(TABLE.IS_DELETED.equal(UByte.valueOf(0))); + return fetchData(conditions); + } + @Override public CronJobInfoDTO getCronJobById(long appId, long cronJobId) { List conditions = new ArrayList<>(); @@ -389,7 +404,7 @@ public boolean isExistAnyAppCronJob(Long appId) { return context.fetchExists(TABLE, conditions); } - private List fetchData(List conditions) { + private List fetchData(Collection conditions) { Result> records = context @@ -401,7 +416,7 @@ private List fetchData(List conditions) { .from(TABLE).where(conditions).fetch(); List cronJobInfoList = new ArrayList<>(); - if (records != null && records.size() >= 1) { + if (records.size() >= 1) { records.map(record -> cronJobInfoList.add(convertToCronJobDTO(record))); } return cronJobInfoList; diff --git a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/CronJobService.java b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/CronJobService.java index ed92058fba..341433178f 100644 --- a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/CronJobService.java +++ b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/CronJobService.java @@ -57,6 +57,22 @@ PageData listPageCronJobInfos(CronJobInfoDTO cronJobCondition, */ CronJobInfoDTO getCronJobInfoById(Long cronJobId); + /** + * 根据 IDs 查询定时任务信息，按照传入的id顺序返回结果 + * + * @param cronJobIdList 定时任务 IDs + * @return 定时任务信息 + */ + List getOrderedCronJobInfoByIds(List cronJobIdList); + + /** + * 根据 IDs 查询定时任务信息，返回Map + * + * @param cronJobIdList 定时任务 IDs + * @return 定时任务信息 + */ + Map getCronJobInfoMapByIds(List cronJobIdList); + /** * 根据 ID 查询定时任务信息 * diff --git a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java index d42b1bfdb6..2204d0a537 100644 --- a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java +++ b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java @@ -47,7 +47,11 @@ import com.tencent.bk.job.crontab.service.ExecuteTaskService; import com.tencent.bk.job.crontab.service.TaskExecuteResultService; import com.tencent.bk.job.crontab.service.TaskPlanService; -import com.tencent.bk.job.crontab.timer.*; +import com.tencent.bk.job.crontab.timer.AbstractQuartzTaskHandler; +import com.tencent.bk.job.crontab.timer.QuartzJob; +import com.tencent.bk.job.crontab.timer.QuartzJobBuilder; +import com.tencent.bk.job.crontab.timer.QuartzTrigger; +import com.tencent.bk.job.crontab.timer.QuartzTriggerBuilder; import com.tencent.bk.job.crontab.timer.executor.InnerJobExecutor; import com.tencent.bk.job.crontab.timer.executor.NotifyJobExecutor; import com.tencent.bk.job.crontab.timer.executor.SimpleJobExecutor; @@ -67,7 +71,12 @@ import java.sql.Date; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -122,6 +131,29 @@ public CronJobInfoDTO getCronJobInfoById(Long cronJobId) { return cronJobDAO.getCronJobById(cronJobId); } + @Override + public List getOrderedCronJobInfoByIds(List cronJobIdList) { + Map map = getCronJobInfoMapByIds(cronJobIdList); + List cronJobInfoDTOList = new ArrayList<>(); + for (Long id : cronJobIdList) { + CronJobInfoDTO cronJobInfoDTO = map.get(id); + if (cronJobInfoDTO != null) { + cronJobInfoDTOList.add(cronJobInfoDTO); + } + } + return cronJobInfoDTOList; + } + + @Override + public Map getCronJobInfoMapByIds(List cronJobIdList) { + List cronJobInfoDTOList = cronJobDAO.getCronJobByIds(cronJobIdList); + Map map = new HashMap<>(); + for (CronJobInfoDTO cronJobInfoDTO : cronJobInfoDTOList) { + map.put(cronJobInfoDTO.getId(), cronJobInfoDTO); + } + return map; + } + @Override public CronJobInfoDTO getCronJobInfoById(Long appId, Long cronJobId) { return cronJobDAO.getCronJobById(appId, cronJobId); diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/dao/impl/TaskInstanceDAOImpl.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/dao/impl/TaskInstanceDAOImpl.java index 063d932d90..b8760d50ff 100644 --- a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/dao/impl/TaskInstanceDAOImpl.java +++ b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/dao/impl/TaskInstanceDAOImpl.java @@ -33,9 +33,18 @@ import com.tencent.bk.job.execute.dao.TaskInstanceDAO; import com.tencent.bk.job.execute.model.TaskInstanceDTO; import com.tencent.bk.job.execute.model.TaskInstanceQuery; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.jooq.*; +import org.jooq.Condition; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Record1; +import org.jooq.Result; +import org.jooq.SelectSeekStep1; +import org.jooq.SortField; +import org.jooq.UpdateSetMoreStep; +import org.jooq.conf.ParamType; import org.jooq.generated.tables.GseTaskIpLog; import org.jooq.generated.tables.StepInstance; import org.jooq.generated.tables.TaskInstance; @@ -52,6 +61,7 @@ /** * 作业执行实例DAO */ +@Slf4j @Repository public class TaskInstanceDAOImpl implements TaskInstanceDAO { private static final TaskInstance TABLE = TaskInstance.TASK_INSTANCE; @@ -363,6 +373,9 @@ public List listLatestCronTaskInstance(long appId, Long cronTas .from(TABLE.useIndex("idx_app_cron")) .where(conditions) .orderBy(TABLE.CREATE_TIME.desc()); + if(log.isDebugEnabled()) { + log.debug("SQL=", select.getSQL(ParamType.INLINED)); + } Result result; if (limit != null && limit > 0) { result = select.limit(0, limit.intValue()).fetch(); diff --git a/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/iam/IamFileSourceCallbackResourceImpl.java b/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/iam/IamFileSourceCallbackResourceImpl.java index b9daa5364c..304eaaa45a 100644 --- a/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/iam/IamFileSourceCallbackResourceImpl.java +++ b/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/api/iam/IamFileSourceCallbackResourceImpl.java @@ -24,18 +24,18 @@ package com.tencent.bk.job.file_gateway.api.iam; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; import com.tencent.bk.job.common.iam.util.IamRespUtil; import com.tencent.bk.job.common.model.PageData; import com.tencent.bk.job.file_gateway.model.dto.FileSourceDTO; import com.tencent.bk.job.file_gateway.service.FileSourceService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.FetchInstanceInfoResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.InstanceInfoDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeValueResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceByPolicyResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.SearchInstanceResponseDTO; import lombok.Data; @@ -49,7 +49,8 @@ @RestController @Slf4j -public class IamFileSourceCallbackResourceImpl implements IamFileSourceCallbackResource { +public class IamFileSourceCallbackResourceImpl extends BaseIamCallbackService + implements IamFileSourceCallbackResource { private final FileSourceService fileSourceService; @@ -103,7 +104,15 @@ private FileSourceSearchCondition getSearchCondition(CallbackRequestDTO callback ); } - private ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { + private InstanceInfoDTO convert(FileSourceDTO fileSourceDTO) { + InstanceInfoDTO tmpInstanceInfo = new InstanceInfoDTO(); + tmpInstanceInfo.setId(fileSourceDTO.getId().toString()); + tmpInstanceInfo.setDisplayName(fileSourceDTO.getAlias()); + return tmpInstanceInfo; + } + + @Override + protected ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { FileSourceSearchCondition searchCondition = getSearchCondition(callbackRequest); List fileSourceDTOList = fileSourceService.listWorkTableFileSource( @@ -124,14 +133,8 @@ private ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequ return IamRespUtil.getListInstanceRespFromPageData(fileSourceDTOPageData, this::convert); } - private InstanceInfoDTO convert(FileSourceDTO fileSourceDTO) { - InstanceInfoDTO tmpInstanceInfo = new InstanceInfoDTO(); - tmpInstanceInfo.setId(fileSourceDTO.getId().toString()); - tmpInstanceInfo.setDisplayName(fileSourceDTO.getAlias()); - return tmpInstanceInfo; - } - - private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { FileSourceSearchCondition searchCondition = getSearchCondition(callbackRequest); List fileSourceDTOList = fileSourceService.listWorkTableFileSource( @@ -155,59 +158,47 @@ private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callback } @Override - public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { - CallbackBaseResponseDTO response; + protected CallbackBaseResponseDTO fetchInstanceResp( + CallbackRequestDTO callbackRequest + ) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(callbackRequest); - break; - case FETCH_INSTANCE_INFO: - List instanceAttributeInfoList = new ArrayList<>(); - for (String instanceId : searchCondition.getIdList()) { - try { - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); - // 文件源详情查询实现 - FileSourceDTO fileSourceDTO = fileSourceService.getFileSourceById(Integer.parseInt(instanceId)); - if (fileSourceDTO == null) { - instanceInfo.setDisplayName("Unknown(may be deleted)"); - log.warn("Unexpected fileSourceId:{} passed by iam", instanceId); - } else { - instanceInfo.setDisplayName(fileSourceDTO.getAlias()); - } - instanceAttributeInfoList.add(instanceInfo); - } catch (NumberFormatException e) { - log.error("Parse object id failed!|{}", instanceId, e); - } + List instanceAttributeInfoList = new ArrayList<>(); + for (String instanceId : searchCondition.getIdList()) { + try { + // 文件源详情查询实现 + FileSourceDTO fileSourceDTO = fileSourceService.getFileSourceById(Integer.parseInt(instanceId)); + if (fileSourceDTO == null) { + return getNotFoundRespById(instanceId); } - - FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); - fetchInstanceInfoResponse.setCode(0L); - fetchInstanceInfoResponse.setData(instanceAttributeInfoList); - - response = fetchInstanceInfoResponse; - break; - case LIST_ATTRIBUTE: - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + rootNode.setType(ResourceId.APP); + rootNode.setId(fileSourceDTO.getAppId().toString()); + PathInfoDTO fileSourceNode = new PathInfoDTO(); + fileSourceNode.setType(ResourceId.FILE_SOURCE); + fileSourceNode.setId(fileSourceDTO.getId().toString()); + rootNode.setChild(fileSourceNode); + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(instanceId); + instanceInfo.setDisplayName(fileSourceDTO.getAlias()); + instanceInfo.setPath(path); + instanceAttributeInfoList.add(instanceInfo); + } catch (NumberFormatException e) { + log.error("Parse object id failed!|{}", instanceId, e); + } } - return response; + + FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); + fetchInstanceInfoResponse.setCode(0L); + fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + return fetchInstanceInfoResponse; + } + + @Override + public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { + return baseCallback(callbackRequest); } } diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamAccountCallbackResourceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamAccountCallbackResourceImpl.java index 020a251dc1..9c7ebcc51e 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamAccountCallbackResourceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamAccountCallbackResourceImpl.java @@ -24,20 +24,20 @@ package com.tencent.bk.job.manage.api.iam.impl; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; import com.tencent.bk.job.common.iam.util.IamRespUtil; import com.tencent.bk.job.common.model.BaseSearchCondition; import com.tencent.bk.job.common.model.PageData; import com.tencent.bk.job.manage.api.iam.IamAccountCallbackResource; import com.tencent.bk.job.manage.model.dto.AccountDTO; import com.tencent.bk.job.manage.service.AccountService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.FetchInstanceInfoResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.InstanceInfoDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListAttributeValueResponseDTO; -import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceByPolicyResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.ListInstanceResponseDTO; import com.tencent.bk.sdk.iam.dto.callback.response.SearchInstanceResponseDTO; import lombok.extern.slf4j.Slf4j; @@ -50,9 +50,14 @@ @RestController @Slf4j -public class IamAccountCallbackResourceImpl implements IamAccountCallbackResource { +public class IamAccountCallbackResourceImpl extends BaseIamCallbackService implements IamAccountCallbackResource { private final AccountService accountService; + @Autowired + public IamAccountCallbackResourceImpl(AccountService accountService) { + this.accountService = accountService; + } + private Pair getBasicQueryCondition(CallbackRequestDTO callbackRequest) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); BaseSearchCondition baseSearchCondition = new BaseSearchCondition(); @@ -71,7 +76,8 @@ private InstanceInfoDTO convert(AccountDTO accountDTO) { return instanceInfo; } - private ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); AccountDTO accountQuery = basicQueryCond.getLeft(); @@ -82,7 +88,8 @@ private ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequ return IamRespUtil.getListInstanceRespFromPageData(accountDTOPageData, this::convert); } - private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); AccountDTO accountQuery = basicQueryCond.getLeft(); @@ -95,65 +102,48 @@ private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callback return IamRespUtil.getSearchInstanceRespFromPageData(accountDTOPageData, this::convert); } - @Autowired - public IamAccountCallbackResourceImpl(AccountService accountService) { - this.accountService = accountService; + @Override + protected CallbackBaseResponseDTO fetchInstanceResp( + CallbackRequestDTO callbackRequest + ) { + IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); + List instanceAttributeInfoList = new ArrayList<>(); + for (String instanceId : searchCondition.getIdList()) { + try { + long id = Long.parseLong(instanceId); + AccountDTO accountDTO = accountService.getAccountById(id); + if (accountDTO == null) { + return getNotFoundRespById(instanceId); + } + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + rootNode.setType(ResourceId.APP); + rootNode.setId(accountDTO.getAppId().toString()); + PathInfoDTO accountNode = new PathInfoDTO(); + accountNode.setType(ResourceId.ACCOUNT); + accountNode.setId(accountDTO.getId().toString()); + rootNode.setChild(accountNode); + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(instanceId); + instanceInfo.setDisplayName(accountDTO.getAlias()); + instanceInfo.setPath(path); + instanceAttributeInfoList.add(instanceInfo); + } catch (NumberFormatException e) { + log.error("Parse object id failed!|{}", instanceId, e); + } + } + + FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); + fetchInstanceInfoResponse.setCode(0L); + fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + return fetchInstanceInfoResponse; } @Override public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { - CallbackBaseResponseDTO response; - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(callbackRequest); - break; - case FETCH_INSTANCE_INFO: - IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); - List instanceAttributeInfoList = new ArrayList<>(); - for (String instanceId : searchCondition.getIdList()) { - try { - long id = Long.parseLong(instanceId); - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); - AccountDTO accountDTO = accountService.getAccountById(id); - if (accountDTO != null) { - instanceInfo.setDisplayName(accountDTO.getAlias()); - } else { - instanceInfo.setDisplayName("Unknown(may be deleted)"); - log.warn("Unexpected accountId:{} passed by iam", id); - } - instanceAttributeInfoList.add(instanceInfo); - } catch (NumberFormatException e) { - log.error("Parse object id failed!|{}", instanceId, e); - } - } - - FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); - fetchInstanceInfoResponse.setCode(0L); - fetchInstanceInfoResponse.setData(instanceAttributeInfoList); - - response = fetchInstanceInfoResponse; - break; - case LIST_ATTRIBUTE: - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); - } - return response; + return baseCallback(callbackRequest); } } diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamPublicScriptCallbackResourceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamPublicScriptCallbackResourceImpl.java index d717edebad..7b3a9612bc 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamPublicScriptCallbackResourceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamPublicScriptCallbackResourceImpl.java @@ -43,10 +43,20 @@ public class IamPublicScriptCallbackResourceImpl implements IamPublicScriptCallb @Autowired public IamPublicScriptCallbackResourceImpl(ScriptService scriptService) { - this.scriptCallbackHelper = new ScriptCallbackHelper(scriptService, this::getBasicQueryCondition); + this.scriptCallbackHelper = new ScriptCallbackHelper(scriptService, new ScriptCallbackHelper.IGetBasicInfo() { + @Override + public Pair getBasicQueryCondition(CallbackRequestDTO callbackRequest) { + return getBasicQueryConditionImpl(callbackRequest); + } + + @Override + public boolean isPublicScript() { + return true; + } + }); } - private Pair getBasicQueryCondition(CallbackRequestDTO callbackRequest) { + private Pair getBasicQueryConditionImpl(CallbackRequestDTO callbackRequest) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); BaseSearchCondition baseSearchCondition = new BaseSearchCondition(); baseSearchCondition.setStart(searchCondition.getStart().intValue()); diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamScriptCallbackResourceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamScriptCallbackResourceImpl.java index 1a599a5a59..e5c4dd645d 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamScriptCallbackResourceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamScriptCallbackResourceImpl.java @@ -43,10 +43,20 @@ public class IamScriptCallbackResourceImpl implements IamScriptCallbackResource @Autowired public IamScriptCallbackResourceImpl(ScriptService scriptService) { - this.scriptCallbackHelper = new ScriptCallbackHelper(scriptService, this::getBasicQueryCondition); + this.scriptCallbackHelper = new ScriptCallbackHelper(scriptService, new ScriptCallbackHelper.IGetBasicInfo() { + @Override + public Pair getBasicQueryCondition(CallbackRequestDTO callbackRequest) { + return getBasicQueryConditionImpl(callbackRequest); + } + + @Override + public boolean isPublicScript() { + return false; + } + }); } - private Pair getBasicQueryCondition(CallbackRequestDTO callbackRequest) { + private Pair getBasicQueryConditionImpl(CallbackRequestDTO callbackRequest) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); BaseSearchCondition baseSearchCondition = new BaseSearchCondition(); baseSearchCondition.setStart(searchCondition.getStart().intValue()); diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTagCallbackResourceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTagCallbackResourceImpl.java index b481823e8d..0f5ec5beec 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTagCallbackResourceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTagCallbackResourceImpl.java @@ -24,12 +24,15 @@ package com.tencent.bk.job.manage.api.iam.impl; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; import com.tencent.bk.job.common.iam.util.IamRespUtil; import com.tencent.bk.job.common.model.BaseSearchCondition; import com.tencent.bk.job.common.model.PageData; import com.tencent.bk.job.manage.api.iam.IamTagCallbackResource; import com.tencent.bk.job.manage.model.dto.TagDTO; import com.tencent.bk.job.manage.service.TagService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; @@ -50,7 +53,7 @@ @RestController @Slf4j -public class IamTagCallbackResourceImpl implements IamTagCallbackResource { +public class IamTagCallbackResourceImpl extends BaseIamCallbackService implements IamTagCallbackResource { private final TagService tagService; @Autowired @@ -76,7 +79,8 @@ private InstanceInfoDTO convert(TagDTO tagDTO) { return instanceInfo; } - private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); TagDTO tagQuery = basicQueryCond.getLeft(); @@ -88,7 +92,8 @@ private SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callback return IamRespUtil.getSearchInstanceRespFromPageData(tagDTOPageData, this::convert); } - private ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); TagDTO tagQuery = basicQueryCond.getLeft(); @@ -98,21 +103,32 @@ private ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequ return IamRespUtil.getListInstanceRespFromPageData(tagDTOPageData, this::convert); } - private FetchInstanceInfoResponseDTO fetchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected CallbackBaseResponseDTO fetchInstanceResp(CallbackRequestDTO callbackRequest) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); List instanceAttributeInfoList = new ArrayList<>(); for (String instanceId : searchCondition.getIdList()) { try { Long tagId = Long.parseLong(instanceId); - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); TagDTO tagDTO = tagService.getTagInfoById(tagId); - if (tagDTO != null) { - instanceInfo.setDisplayName(tagDTO.getName()); - } else { - instanceInfo.setDisplayName("Unknown(may be deleted)"); - log.warn("Unexpected tagId:{} passed by iam", instanceId); + if (tagDTO == null) { + return getNotFoundRespById(instanceId); } + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + rootNode.setType(ResourceId.APP); + rootNode.setId(tagDTO.getAppId().toString()); + PathInfoDTO tagNode = new PathInfoDTO(); + tagNode.setType(ResourceId.TAG); + tagNode.setId(tagDTO.getId().toString()); + rootNode.setChild(tagNode); + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(instanceId); + instanceInfo.setDisplayName(tagDTO.getName()); + instanceInfo.setPath(path); instanceAttributeInfoList.add(instanceInfo); } catch (NumberFormatException e) { log.error("Parse object id failed!|{}", instanceId, e); @@ -127,34 +143,6 @@ private FetchInstanceInfoResponseDTO fetchInstanceResp(CallbackRequestDTO callba @Override public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { - CallbackBaseResponseDTO response; - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(callbackRequest); - break; - case FETCH_INSTANCE_INFO: - response = fetchInstanceResp(callbackRequest); - break; - case LIST_ATTRIBUTE: - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); - } - return response; + return baseCallback(callbackRequest); } } diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskPlanCallbackResourceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskPlanCallbackResourceImpl.java index a435fa0733..c04a771486 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskPlanCallbackResourceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskPlanCallbackResourceImpl.java @@ -24,6 +24,8 @@ package com.tencent.bk.job.manage.api.iam.impl; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; import com.tencent.bk.job.common.iam.util.IamRespUtil; import com.tencent.bk.job.common.model.BaseSearchCondition; import com.tencent.bk.job.common.model.PageData; @@ -31,6 +33,7 @@ import com.tencent.bk.job.manage.model.dto.TaskPlanQueryDTO; import com.tencent.bk.job.manage.model.dto.task.TaskPlanInfoDTO; import com.tencent.bk.job.manage.service.plan.TaskPlanService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; @@ -51,7 +54,8 @@ @Slf4j @RestController -public class IamTaskPlanCallbackResourceImpl implements IamTaskPlanCallbackResource { +public class IamTaskPlanCallbackResourceImpl extends BaseIamCallbackService + implements IamTaskPlanCallbackResource { private final TaskPlanService planService; @@ -78,7 +82,8 @@ private Pair getBasicQueryCondition(Callb return Pair.of(planQuery, baseSearchCondition); } - public ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); @@ -90,7 +95,8 @@ public ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackReque return IamRespUtil.getListInstanceRespFromPageData(planDTOPageData, this::convert); } - public SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); @@ -105,53 +111,51 @@ public SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackR } @Override - public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { - CallbackBaseResponseDTO response; + protected CallbackBaseResponseDTO fetchInstanceResp( + CallbackRequestDTO callbackRequest + ) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(callbackRequest); - break; - case FETCH_INSTANCE_INFO: - List instanceAttributeInfoList = new ArrayList<>(); - for (String instanceId : searchCondition.getIdList()) { - try { - long id = Long.parseLong(instanceId); - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); - instanceInfo.setDisplayName(planService.getPlanName(id)); - instanceAttributeInfoList.add(instanceInfo); - } catch (NumberFormatException e) { - log.error("Parse object id failed!|{}", instanceId, e); - } + List instanceAttributeInfoList = new ArrayList<>(); + for (String instanceId : searchCondition.getIdList()) { + try { + long id = Long.parseLong(instanceId); + TaskPlanInfoDTO planInfoDTO = planService.getTaskPlanById(id); + if (planInfoDTO == null) { + return getNotFoundRespById(instanceId); } - - FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); - fetchInstanceInfoResponse.setCode(0L); - fetchInstanceInfoResponse.setData(instanceAttributeInfoList); - - response = fetchInstanceInfoResponse; - break; - case LIST_ATTRIBUTE: - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + rootNode.setType(ResourceId.APP); + rootNode.setId(planInfoDTO.getAppId().toString()); + PathInfoDTO templateNode = new PathInfoDTO(); + templateNode.setType(ResourceId.TEMPLATE); + templateNode.setId(planInfoDTO.getTemplateId().toString()); + rootNode.setChild(templateNode); + PathInfoDTO planNode = new PathInfoDTO(); + planNode.setType(ResourceId.PLAN); + planNode.setId(planInfoDTO.getId().toString()); + templateNode.setChild(planNode); + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(instanceId); + instanceInfo.setDisplayName(planInfoDTO.getName()); + instanceInfo.setPath(path); + instanceAttributeInfoList.add(instanceInfo); + } catch (NumberFormatException e) { + log.error("Parse object id failed!|{}", instanceId, e); + } } - return response; + FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); + fetchInstanceInfoResponse.setCode(0L); + fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + + return fetchInstanceInfoResponse; + } + + @Override + public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { + return baseCallback(callbackRequest); } } diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskTemplateCallbackResourceImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskTemplateCallbackResourceImpl.java index 3cbf3eaca0..b46db57849 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskTemplateCallbackResourceImpl.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/IamTaskTemplateCallbackResourceImpl.java @@ -24,12 +24,15 @@ package com.tencent.bk.job.manage.api.iam.impl; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; import com.tencent.bk.job.common.iam.util.IamRespUtil; import com.tencent.bk.job.common.model.BaseSearchCondition; import com.tencent.bk.job.common.model.PageData; import com.tencent.bk.job.manage.api.iam.IamTaskTemplateCallbackResource; import com.tencent.bk.job.manage.model.dto.task.TaskTemplateInfoDTO; import com.tencent.bk.job.manage.service.template.TaskTemplateService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; @@ -50,7 +53,8 @@ @Slf4j @RestController -public class IamTaskTemplateCallbackResourceImpl implements IamTaskTemplateCallbackResource { +public class IamTaskTemplateCallbackResourceImpl extends BaseIamCallbackService + implements IamTaskTemplateCallbackResource { private final TaskTemplateService templateService; @@ -77,19 +81,24 @@ private Pair getBasicQueryCondition(Ca return Pair.of(templateQuery, baseSearchCondition); } - public ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); TaskTemplateInfoDTO templateQuery = basicQueryCond.getLeft(); BaseSearchCondition baseSearchCondition = basicQueryCond.getRight(); - PageData templateDTOPageData = templateService.listPageTaskTemplatesBasicInfo(templateQuery, - baseSearchCondition, null); + PageData templateDTOPageData = templateService.listPageTaskTemplatesBasicInfo( + templateQuery, + baseSearchCondition, + null + ); return IamRespUtil.getListInstanceRespFromPageData(templateDTOPageData, this::convert); } - public SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = getBasicQueryCondition(callbackRequest); @@ -104,53 +113,47 @@ public SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackR } @Override - public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { - CallbackBaseResponseDTO response; + protected CallbackBaseResponseDTO fetchInstanceResp( + CallbackRequestDTO callbackRequest + ) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(callbackRequest); - break; - case FETCH_INSTANCE_INFO: - List instanceAttributeInfoList = new ArrayList<>(); - for (String instanceId : searchCondition.getIdList()) { - try { - long id = Long.parseLong(instanceId); - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); - instanceInfo.setDisplayName(templateService.getTemplateName(id)); - instanceAttributeInfoList.add(instanceInfo); - } catch (NumberFormatException e) { - log.error("Parse object id failed!|{}", instanceId, e); - } + List instanceAttributeInfoList = new ArrayList<>(); + for (String instanceId : searchCondition.getIdList()) { + try { + long id = Long.parseLong(instanceId); + TaskTemplateInfoDTO templateInfoDTO = templateService.getTaskTemplateBasicInfoById(id); + if (templateInfoDTO == null) { + return getNotFoundRespById(instanceId); } - - FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); - fetchInstanceInfoResponse.setCode(0L); - fetchInstanceInfoResponse.setData(instanceAttributeInfoList); - - response = fetchInstanceInfoResponse; - break; - case LIST_ATTRIBUTE: - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + rootNode.setType(ResourceId.APP); + rootNode.setId(templateInfoDTO.getAppId().toString()); + PathInfoDTO templateNode = new PathInfoDTO(); + templateNode.setType(ResourceId.TEMPLATE); + templateNode.setId(templateInfoDTO.getId().toString()); + rootNode.setChild(templateNode); + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(instanceId); + instanceInfo.setDisplayName(templateInfoDTO.getName()); + instanceInfo.setPath(path); + instanceAttributeInfoList.add(instanceInfo); + } catch (NumberFormatException e) { + log.error("Parse object id failed!|{}", instanceId, e); + } } - return response; + + FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); + fetchInstanceInfoResponse.setCode(0L); + fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + return fetchInstanceInfoResponse; + } + + @Override + public CallbackBaseResponseDTO callback(CallbackRequestDTO callbackRequest) { + return baseCallback(callbackRequest); } } diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/ScriptCallbackHelper.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/ScriptCallbackHelper.java index 13c552cfe7..3377fe0bcd 100644 --- a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/ScriptCallbackHelper.java +++ b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/api/iam/impl/ScriptCallbackHelper.java @@ -1,11 +1,14 @@ package com.tencent.bk.job.manage.api.iam.impl; +import com.tencent.bk.job.common.iam.constant.ResourceId; +import com.tencent.bk.job.common.iam.service.BaseIamCallbackService; import com.tencent.bk.job.common.iam.util.IamRespUtil; import com.tencent.bk.job.common.model.BaseSearchCondition; import com.tencent.bk.job.common.model.PageData; import com.tencent.bk.job.manage.model.dto.ScriptDTO; import com.tencent.bk.job.manage.model.dto.ScriptQueryDTO; import com.tencent.bk.job.manage.service.ScriptService; +import com.tencent.bk.sdk.iam.dto.PathInfoDTO; import com.tencent.bk.sdk.iam.dto.callback.request.CallbackRequestDTO; import com.tencent.bk.sdk.iam.dto.callback.request.IamSearchCondition; import com.tencent.bk.sdk.iam.dto.callback.response.CallbackBaseResponseDTO; @@ -23,20 +26,22 @@ import java.util.List; @Slf4j -public class ScriptCallbackHelper { +public class ScriptCallbackHelper extends BaseIamCallbackService { private ScriptService scriptService; - private IGetBasicQueryCondition basicQueryInterface; + private IGetBasicInfo basicInfoInterface; public ScriptCallbackHelper( ScriptService scriptService, - IGetBasicQueryCondition basicQueryInterface + IGetBasicInfo basicInfoInterface ) { this.scriptService = scriptService; - this.basicQueryInterface = basicQueryInterface; + this.basicInfoInterface = basicInfoInterface; } - public interface IGetBasicQueryCondition { + public interface IGetBasicInfo { Pair getBasicQueryCondition(CallbackRequestDTO callbackRequest); + + boolean isPublicScript(); } @@ -47,9 +52,10 @@ private InstanceInfoDTO convert(ScriptDTO script) { return instanceInfo; } - public ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = - basicQueryInterface.getBasicQueryCondition(callbackRequest); + basicInfoInterface.getBasicQueryCondition(callbackRequest); ScriptQueryDTO scriptQuery = basicQueryCond.getLeft(); BaseSearchCondition baseSearchCondition = basicQueryCond.getRight(); @@ -59,10 +65,11 @@ public ListInstanceResponseDTO listInstanceResp(CallbackRequestDTO callbackReque return IamRespUtil.getListInstanceRespFromPageData(accountDTOPageData, this::convert); } - public SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { + @Override + protected SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackRequest) { Pair basicQueryCond = - basicQueryInterface.getBasicQueryCondition(callbackRequest); + basicInfoInterface.getBasicQueryCondition(callbackRequest); ScriptQueryDTO scriptQuery = basicQueryCond.getLeft(); BaseSearchCondition baseSearchCondition = basicQueryCond.getRight(); @@ -73,67 +80,53 @@ public SearchInstanceResponseDTO searchInstanceResp(CallbackRequestDTO callbackR return IamRespUtil.getSearchInstanceRespFromPageData(accountDTOPageData, this::convert); } - public CallbackBaseResponseDTO doCallback(CallbackRequestDTO callbackRequest){ - CallbackBaseResponseDTO response; + @Override + protected CallbackBaseResponseDTO fetchInstanceResp( + CallbackRequestDTO callbackRequest + ) { IamSearchCondition searchCondition = IamSearchCondition.fromReq(callbackRequest); - switch (callbackRequest.getMethod()) { - case LIST_INSTANCE: - response = listInstanceResp(callbackRequest); - break; - case FETCH_INSTANCE_INFO: - log.debug("Fetch instance info request!|{}|{}|{}", callbackRequest.getType(), - callbackRequest.getFilter(), callbackRequest.getPage()); - - List instanceAttributeInfoList = new ArrayList<>(); - for (String instanceId : searchCondition.getIdList()) { - try { - InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); - instanceInfo.setId(instanceId); - ScriptDTO scriptDTO = scriptService.getScriptByScriptId(instanceId); - if (scriptDTO != null) { - instanceInfo.setDisplayName(scriptDTO.getName()); - } else { - instanceInfo.setDisplayName("Unknown(may be deleted)"); - log.warn("Unexpected scriptId:{} passed by iam", instanceId); - } - instanceAttributeInfoList.add(instanceInfo); - } catch (NumberFormatException e) { - log.error("Parse object id failed!|{}", instanceId, e); - } + List instanceAttributeInfoList = new ArrayList<>(); + for (String instanceId : searchCondition.getIdList()) { + try { + ScriptDTO scriptDTO = scriptService.getScriptByScriptId(instanceId); + if (scriptDTO == null) { + return getNotFoundRespById(instanceId); } - - FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); - fetchInstanceInfoResponse.setCode(0L); - fetchInstanceInfoResponse.setData(instanceAttributeInfoList); - - response = fetchInstanceInfoResponse; - break; - case LIST_ATTRIBUTE: - log.debug("List attribute request!|{}|{}|{}", callbackRequest.getType(), callbackRequest.getFilter(), - callbackRequest.getPage()); - response = new ListAttributeResponseDTO(); - response.setCode(0L); - break; - case LIST_ATTRIBUTE_VALUE: - log.debug("List attribute value request!|{}|{}|{}", callbackRequest.getType(), - callbackRequest.getFilter(), callbackRequest.getPage()); - response = new ListAttributeValueResponseDTO(); - response.setCode(0L); - break; - case LIST_INSTANCE_BY_POLICY: - log.debug("List instance by policy request!|{}|{}|{}", callbackRequest.getType(), - callbackRequest.getFilter(), callbackRequest.getPage()); - response = new ListInstanceByPolicyResponseDTO(); - response.setCode(0L); - break; - case SEARCH_INSTANCE: - response = searchInstanceResp(callbackRequest); - break; - default: - log.error("Unknown callback method!|{}|{}|{}|{}", callbackRequest.getMethod(), - callbackRequest.getType(), callbackRequest.getFilter(), callbackRequest.getPage()); - response = new CallbackBaseResponseDTO(); + // 拓扑路径构建 + List path = new ArrayList<>(); + PathInfoDTO rootNode = new PathInfoDTO(); + if (basicInfoInterface.isPublicScript()) { + // 公共脚本 + rootNode.setType(ResourceId.PUBLIC_SCRIPT); + rootNode.setId(scriptDTO.getId()); + } else { + // 业务脚本 + rootNode.setType(ResourceId.APP); + rootNode.setId(scriptDTO.getAppId().toString()); + PathInfoDTO scriptNode = new PathInfoDTO(); + scriptNode.setType(ResourceId.SCRIPT); + scriptNode.setId(scriptDTO.getId()); + rootNode.setChild(scriptNode); + } + path.add(rootNode); + // 实例组装 + InstanceInfoDTO instanceInfo = new InstanceInfoDTO(); + instanceInfo.setId(instanceId); + instanceInfo.setDisplayName(scriptDTO.getName()); + instanceInfo.setPath(path); + instanceAttributeInfoList.add(instanceInfo); + } catch (NumberFormatException e) { + log.error("Parse object id failed!|{}", instanceId, e); + } } - return response; + + FetchInstanceInfoResponseDTO fetchInstanceInfoResponse = new FetchInstanceInfoResponseDTO(); + fetchInstanceInfoResponse.setCode(0L); + fetchInstanceInfoResponse.setData(instanceAttributeInfoList); + return fetchInstanceInfoResponse; + } + + public CallbackBaseResponseDTO doCallback(CallbackRequestDTO callbackRequest) { + return baseCallback(callbackRequest); } }