From 416542e6dc97aab6a41b3a90566fc451e58f7eba Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Wed, 20 Mar 2024 21:41:02 +0800 Subject: [PATCH] (improvement)(Headless) fix JSON error (#841) --- .../supersonic/headless/api/pojo/DataSetModelConfig.java | 2 +- .../headless/api/pojo/request/ItemValueReq.java | 8 ++------ .../headless/api/pojo/response/DataSetResp.java | 2 +- .../headless/server/service/impl/TagQueryServiceImpl.java | 5 +++-- .../tencent/supersonic/headless/QueryTagValueTest.java | 4 +--- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetModelConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetModelConfig.java index ceb4e4b06..2546e2120 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetModelConfig.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetModelConfig.java @@ -14,7 +14,7 @@ public class DataSetModelConfig { private Long id; - private boolean includesAll; + private Boolean includesAll = false; private List metrics = Lists.newArrayList(); diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java index 78818a4d4..3fe99a0aa 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemValueReq.java @@ -1,20 +1,16 @@ package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.headless.api.pojo.SchemaElementType; +import javax.validation.constraints.NotNull; import lombok.Data; import lombok.ToString; -import javax.validation.constraints.NotNull; - @Data @ToString public class ItemValueReq { - private SchemaElementType type; - @NotNull - private Long itemId; + private Long id; private DateConf dateConf; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java index 63289d473..c701b89de 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java @@ -49,7 +49,7 @@ public class DataSetResp extends SchemaItem { } public List getAllIncludeAllModels() { - return getDataSetModelConfigs().stream().filter(DataSetModelConfig::isIncludesAll) + return getDataSetModelConfigs().stream().filter(DataSetModelConfig::getIncludesAll) .map(DataSetModelConfig::getId) .collect(Collectors.toList()); } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java index cbaa4e4da..a10ea17ad 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java @@ -56,9 +56,9 @@ public class TagQueryServiceImpl implements TagQueryService { @Override public ItemValueResp queryTagValue(ItemValueReq itemValueReq, User user) throws Exception { ItemValueResp itemValueResp = new ItemValueResp(); - itemValueResp.setItemId(itemValueReq.getItemId()); + itemValueResp.setItemId(itemValueReq.getId()); itemValueResp.setType(SchemaElementType.TAG); - TagResp tag = tagMetaService.getTag(itemValueReq.getItemId(), user); + TagResp tag = tagMetaService.getTag(itemValueReq.getId(), user); if (Objects.isNull(tag)) { return null; } @@ -88,6 +88,7 @@ public class TagQueryServiceImpl implements TagQueryService { ModelResp model = modelService.getModel(tag.getModelId()); List timeDimension = model.getTimeDimension(); if (CollectionUtils.isEmpty(timeDimension)) { + itemValueReq.setDateConf(null); return; } diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryTagValueTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryTagValueTest.java index b720a67be..92abd3e78 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryTagValueTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryTagValueTest.java @@ -3,7 +3,6 @@ package com.tencent.supersonic.headless; import static org.junit.Assert.assertTrue; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.pojo.SchemaElementType; import com.tencent.supersonic.headless.api.pojo.request.ItemValueReq; import com.tencent.supersonic.headless.api.pojo.response.ItemValueResp; import com.tencent.supersonic.headless.server.service.TagQueryService; @@ -18,8 +17,7 @@ public class QueryTagValueTest extends BaseTest { @Test public void testQueryTagValue() throws Exception { ItemValueReq itemValueReq = new ItemValueReq(); - itemValueReq.setItemId(1L); - itemValueReq.setType(SchemaElementType.DIMENSION); + itemValueReq.setId(1L); ItemValueResp itemValueResp = tagQueryService.queryTagValue(itemValueReq, User.getFakeUser()); assertTrue(itemValueResp != null); }