diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagFilterPageReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagFilterPageReq.java index ef89db282..952646185 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagFilterPageReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/TagFilterPageReq.java @@ -3,12 +3,9 @@ package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType; import lombok.Data; -import javax.validation.constraints.NotNull; - @Data public class TagFilterPageReq extends PageSchemaItemReq { - @NotNull private Long tagObjectId; private TagDefineType tagDefineType; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java index 86b0eb311..bca72eb98 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java @@ -144,6 +144,12 @@ public class TagMetaServiceImpl implements TagMetaService { if (CollectionUtils.isEmpty(modelRespList)) { return new PageInfo<>(); } + + if (Objects.nonNull(tagMarketPageReq.getTagObjectId())) { + modelRespList = modelRespList.stream() + .filter(modelResp -> tagMarketPageReq.getTagObjectId().equals(modelResp.getTagObjectId())) + .collect(Collectors.toList()); + } List modelIds = modelRespList.stream().map(model -> model.getId()).collect(Collectors.toList()); TagFilter tagFilter = new TagFilter(); @@ -247,19 +253,18 @@ public class TagMetaServiceImpl implements TagMetaService { if (Objects.isNull(modelResp)) { continue; } - if (tagMarketPageReq.getTagObjectId().equals(modelResp.getTagObjectId())) { - if (CollectionUtils.isNotEmpty(tagMarketPageReq.getDomainIds())) { - if (!tagMarketPageReq.getDomainIds().contains(modelResp.getDomainId())) { - continue; - } + if (CollectionUtils.isNotEmpty(tagMarketPageReq.getDomainIds())) { + if (!tagMarketPageReq.getDomainIds().contains(modelResp.getDomainId())) { + continue; } - if (CollectionUtils.isNotEmpty(tagMarketPageReq.getModelIds())) { - if (!tagMarketPageReq.getModelIds().contains(modelResp.getId())) { - continue; - } - } - modelRespList.add(modelResp); } + if (CollectionUtils.isNotEmpty(tagMarketPageReq.getModelIds())) { + if (!tagMarketPageReq.getModelIds().contains(modelResp.getId())) { + continue; + } + } + modelRespList.add(modelResp); + } return modelRespList; } @@ -340,7 +345,7 @@ public class TagMetaServiceImpl implements TagMetaService { ModelResp model = modelService.getModel(dimension.getModelId()); if (Objects.isNull(model.getTagObjectId())) { throw new RuntimeException(String.format("this dimension:%s is not supported to create tag," - + " no related tag object", tagReq.getItemId())); + + " no related tag object", tagReq.getItemId())); } } if (TagDefineType.METRIC.equals(tagReq.getTagDefineType())) { @@ -348,7 +353,7 @@ public class TagMetaServiceImpl implements TagMetaService { ModelResp model = modelService.getModel(metric.getModelId()); if (Objects.isNull(model.getTagObjectId())) { throw new RuntimeException(String.format("this metric:%s is not supported to create tag," - + " no related tag object", tagReq.getItemId())); + + " no related tag object", tagReq.getItemId())); } } }