From 782b768950a8517b57666ab516d8ac0bb2976b75 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Tue, 16 Jul 2024 17:53:01 +0800 Subject: [PATCH] (improvement)(headless&chat)The Chat module only references facade service of the Headless module. --- .../service/impl/ChatQueryServiceImpl.java | 5 +- .../service/impl/ConfigServiceImpl.java | 15 ++--- .../headless/api}/pojo/MetaFilter.java | 2 +- .../server/aspect/DimValueAspect.java | 2 +- .../server/aspect/S2DataPermissionAspect.java | 2 +- .../facade/service/SemanticLayerService.java | 7 +++ .../service/impl/S2ChatLayerService.java | 2 +- .../service/impl/S2SemanticLayerService.java | 62 ++++++++++++------- .../headless/server/pojo/ClassFilter.java | 1 + .../headless/server/pojo/DimensionFilter.java | 1 + .../headless/server/pojo/MetricFilter.java | 1 + .../headless/server/pojo/MetricsFilter.java | 2 + .../headless/server/pojo/ModelFilter.java | 1 + .../headless/server/pojo/TagFilter.java | 1 + .../headless/server/pojo/TagObjectFilter.java | 1 + .../server/utils/QueryStructUtils.java | 2 +- .../server/web/rest/DataSetController.java | 2 +- .../server/web/rest/DimensionController.java | 2 +- .../server/web/rest/MetricController.java | 2 +- .../server/web/service/DataSetService.java | 2 +- .../server/web/service/DimensionService.java | 2 +- .../server/web/service/MetricService.java | 2 +- .../server/web/service/ModelService.java | 2 +- .../server/web/service/SchemaService.java | 2 +- .../web/service/impl/AppServiceImpl.java | 2 +- .../web/service/impl/CanvasServiceImpl.java | 2 +- .../web/service/impl/DataSetServiceImpl.java | 2 +- .../service/impl/DimensionServiceImpl.java | 2 +- .../web/service/impl/DownloadServiceImpl.java | 2 +- .../web/service/impl/MetricServiceImpl.java | 2 +- .../web/service/impl/ModelServiceImpl.java | 2 +- .../web/service/impl/SchemaServiceImpl.java | 2 +- .../tencent/supersonic/demo/S2BaseDemo.java | 2 +- 33 files changed, 83 insertions(+), 58 deletions(-) rename headless/{server/src/main/java/com/tencent/supersonic/headless/server => api/src/main/java/com/tencent/supersonic/headless/api}/pojo/MetaFilter.java (97%) diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java index 2910c1cd2..339c42720 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java @@ -48,7 +48,6 @@ import com.tencent.supersonic.headless.chat.query.SemanticQuery; import com.tencent.supersonic.headless.chat.query.llm.s2sql.LLMSqlQuery; import com.tencent.supersonic.headless.server.facade.service.ChatLayerService; -import com.tencent.supersonic.headless.server.web.service.RetrieveService; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; @@ -90,8 +89,6 @@ public class ChatQueryServiceImpl implements ChatQueryService { @Autowired private SemanticLayerService semanticLayerService; @Autowired - private RetrieveService retrieveService; - @Autowired private AgentService agentService; private List chatQueryParsers = ComponentFactory.getChatParsers(); @@ -107,7 +104,7 @@ public List search(ChatParseReq chatParseReq) { return Lists.newArrayList(); } QueryNLReq queryNLReq = QueryReqConverter.buildText2SqlQueryReq(parseContext); - return retrieveService.retrieve(queryNLReq); + return chatLayerService.retrieve(queryNLReq); } @Override diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java index 215beb881..46364aa4d 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java @@ -30,9 +30,7 @@ import com.tencent.supersonic.headless.api.pojo.SchemaItem; import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.DimensionService; -import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -53,18 +51,13 @@ public class ConfigServiceImpl implements ConfigService { private final ChatConfigRepository chatConfigRepository; private final ChatConfigHelper chatConfigHelper; - private final DimensionService dimensionService; - private final MetricService metricService; private final SemanticLayerService semanticLayerService; public ConfigServiceImpl(ChatConfigRepository chatConfigRepository, - ChatConfigHelper chatConfigHelper, DimensionService dimensionService, - MetricService metricService, SemanticLayerService semanticLayerService) { + ChatConfigHelper chatConfigHelper, SemanticLayerService semanticLayerService) { this.chatConfigRepository = chatConfigRepository; this.chatConfigHelper = chatConfigHelper; - this.dimensionService = dimensionService; - this.metricService = metricService; this.semanticLayerService = semanticLayerService; } @@ -136,14 +129,14 @@ public ItemNameVisibilityInfo getItemNameVisibility(ChatConfig chatConfig) { MetaFilter metaFilter = new MetaFilter(); metaFilter.setModelIds(Lists.newArrayList(modelId)); if (!CollectionUtils.isEmpty(blackDimIdList)) { - List dimensionRespList = dimensionService.getDimensions(metaFilter); + List dimensionRespList = semanticLayerService.getDimensions(metaFilter); List blackDimNameList = dimensionRespList.stream().filter(o -> filterDimIdList.contains(o.getId())) .map(SchemaItem::getName).collect(Collectors.toList()); itemNameVisibility.setBlackDimNameList(blackDimNameList); } if (!CollectionUtils.isEmpty(blackMetricIdList)) { - List metricRespList = metricService.getMetrics(metaFilter); + List metricRespList = semanticLayerService.getMetrics(metaFilter); List blackMetricList = metricRespList.stream().filter(o -> filterMetricIdList.contains(o.getId())) .map(SchemaItem::getName).collect(Collectors.toList()); itemNameVisibility.setBlackMetricNameList(blackMetricList); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetaFilter.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetaFilter.java index c5a778bde..e38121c40 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetaFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetaFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.google.common.base.Objects; import lombok.Data; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java index a07dd9bd4..480c77b82 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java @@ -16,7 +16,7 @@ import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.DimensionService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java index 82da75b1d..a35d4e035 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java @@ -22,7 +22,7 @@ import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.utils.QueryStructUtils; import com.tencent.supersonic.headless.server.web.service.ModelService; import com.tencent.supersonic.headless.server.web.service.SchemaService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/SemanticLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/SemanticLayerService.java index 574a6db0a..2a5281c76 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/SemanticLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/SemanticLayerService.java @@ -3,10 +3,13 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; import com.tencent.supersonic.headless.api.pojo.EntityInfo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.request.DimensionValueReq; import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.api.pojo.response.ItemResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticTranslateResp; @@ -29,4 +32,8 @@ public interface SemanticLayerService { List getDomainDataSetTree(); + List getDimensions(MetaFilter metaFilter); + + List getMetrics(MetaFilter metaFilter); + } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java index c4444d5d5..5bb953256 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java @@ -29,7 +29,7 @@ import com.tencent.supersonic.headless.chat.query.SemanticQuery; import com.tencent.supersonic.headless.server.facade.service.ChatLayerService; import com.tencent.supersonic.headless.server.web.service.RetrieveService; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.utils.ChatWorkflowEngine; import com.tencent.supersonic.headless.server.utils.ComponentFactory; import com.tencent.supersonic.headless.server.web.service.DataSetService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java index 921cc9e60..a0eaa545d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java @@ -14,6 +14,7 @@ import com.tencent.supersonic.headless.api.pojo.DataSetSchema; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.EntityInfo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.api.pojo.QueryParam; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SchemaElementType; @@ -30,6 +31,7 @@ import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.api.pojo.response.ItemResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp; @@ -55,6 +57,8 @@ import com.tencent.supersonic.headless.server.utils.QueryUtils; import com.tencent.supersonic.headless.server.utils.StatUtils; import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.MetricService; import com.tencent.supersonic.headless.server.web.service.SchemaService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -87,6 +91,8 @@ public class S2SemanticLayerService implements SemanticLayerService { private final SemanticTranslator semanticTranslator; private final MetricDrillDownChecker metricDrillDownChecker; private final KnowledgeBaseService knowledgeBaseService; + private final MetricService metricService; + private final DimensionService dimensionService; private QueryCache queryCache = ComponentFactory.getQueryCache(); private List queryExecutors = ComponentFactory.getQueryExecutors(); @@ -99,7 +105,9 @@ public S2SemanticLayerService( SchemaService schemaService, SemanticTranslator semanticTranslator, MetricDrillDownChecker metricDrillDownChecker, - KnowledgeBaseService knowledgeBaseService) { + KnowledgeBaseService knowledgeBaseService, + MetricService metricService, + DimensionService dimensionService) { this.statUtils = statUtils; this.queryUtils = queryUtils; this.queryReqConverter = queryReqConverter; @@ -109,6 +117,8 @@ public S2SemanticLayerService( this.semanticTranslator = semanticTranslator; this.metricDrillDownChecker = metricDrillDownChecker; this.knowledgeBaseService = knowledgeBaseService; + this.metricService = metricService; + this.dimensionService = dimensionService; } public DataSetSchema getDataSetSchema(Long id) { @@ -291,6 +301,36 @@ public List getDomainDataSetTree() { return schemaService.getDomainDataSetTree(); } + @Override + public List getDimensions(MetaFilter metaFilter) { + return dimensionService.getDimensions(metaFilter); + } + + private Set getDimensions(EntityInfo modelInfo) { + Set dimensions = new LinkedHashSet(); + for (DataInfo mainEntityDimension : modelInfo.getDimensions()) { + SchemaElement dimension = new SchemaElement(); + dimension.setBizName(mainEntityDimension.getBizName()); + dimensions.add(dimension); + } + return dimensions; + } + + @Override + public List getMetrics(MetaFilter metaFilter) { + return metricService.getMetrics(metaFilter); + } + + private Set getMetrics(EntityInfo modelInfo) { + Set metrics = new LinkedHashSet(); + for (DataInfo metricValue : modelInfo.getMetrics()) { + SchemaElement metric = new SchemaElement(); + BeanUtils.copyProperties(metricValue, metric); + metrics.add(metric); + } + return metrics; + } + private QueryStatement buildSqlQueryStatement(QuerySqlReq querySqlReq, User user) throws Exception { //If dataSetId or DataSetName is empty, parse dataSetId from the SQL if (querySqlReq.needGetDataSetId()) { @@ -501,16 +541,6 @@ private QueryFilter getQueryFilter(EntityInfo entityInfo) { return chatFilter; } - private Set getDimensions(EntityInfo modelInfo) { - Set dimensions = new LinkedHashSet(); - for (DataInfo mainEntityDimension : modelInfo.getDimensions()) { - SchemaElement dimension = new SchemaElement(); - dimension.setBizName(mainEntityDimension.getBizName()); - dimensions.add(dimension); - } - return dimensions; - } - private String getEntryKey(Map.Entry entry) { // metric parser special handle, TODO delete String entryKey = entry.getKey(); @@ -520,16 +550,6 @@ private String getEntryKey(Map.Entry entry) { return entryKey; } - private Set getMetrics(EntityInfo modelInfo) { - Set metrics = new LinkedHashSet(); - for (DataInfo metricValue : modelInfo.getMetrics()) { - SchemaElement metric = new SchemaElement(); - BeanUtils.copyProperties(metricValue, metric); - metrics.add(metric); - } - return metrics; - } - private String getEntityPrimaryName(EntityInfo entityInfo) { return entityInfo.getDataSetInfo().getPrimaryKey(); } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClassFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClassFilter.java index 90fb1d9d4..a64c3a2c4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClassFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClassFilter.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.headless.server.pojo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import lombok.Data; @Data diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DimensionFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DimensionFilter.java index 70da5b4a6..cd110b15d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DimensionFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DimensionFilter.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.headless.server.pojo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import lombok.Data; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricFilter.java index c5f95d3c3..b358b8d6f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricFilter.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.headless.server.pojo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import lombok.Data; @Data diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricsFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricsFilter.java index 10138d287..b8e34f64c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricsFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MetricsFilter.java @@ -1,6 +1,8 @@ package com.tencent.supersonic.headless.server.pojo; import java.util.List; + +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import lombok.Data; @Data diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ModelFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ModelFilter.java index 05c1235eb..941a97983 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ModelFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ModelFilter.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.headless.server.pojo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import lombok.Data; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagFilter.java index 17b7fe4f7..6a7f5260d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagFilter.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.headless.server.pojo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType; import lombok.Data; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagObjectFilter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagObjectFilter.java index 6e163ec9b..21da39ab1 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagObjectFilter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/TagObjectFilter.java @@ -1,6 +1,7 @@ package com.tencent.supersonic.headless.server.pojo; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import lombok.Data; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java index 39f1af6eb..893d561fb 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java @@ -18,7 +18,7 @@ import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.SchemaService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java index c20ce6bd2..9ba1a6ff2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java @@ -4,7 +4,7 @@ import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.DataSetReq; import com.tencent.supersonic.headless.api.pojo.response.DataSetResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.DataSetService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java index 66fbc3a64..a5f0ffd2b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java @@ -14,7 +14,7 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.DimensionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java index 79bac69a9..58b9db2a5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java @@ -13,7 +13,7 @@ import com.tencent.supersonic.headless.api.pojo.request.MetricReq; import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.MetricFilter; import com.tencent.supersonic.headless.server.web.service.MetricService; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java index 5afa9b808..3d700b3a0 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java @@ -5,7 +5,7 @@ import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import com.tencent.supersonic.headless.api.pojo.request.DataSetReq; import com.tencent.supersonic.headless.api.pojo.response.DataSetResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import java.util.List; import java.util.Map; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java index bb7702b0c..1dd3bb19a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java @@ -10,7 +10,7 @@ import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.server.pojo.DimensionsFilter; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java index 789974cc5..eefac448b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java @@ -14,7 +14,7 @@ import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.MetricsFilter; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java index 2ca92e094..1dbfd1333 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java @@ -10,7 +10,7 @@ import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java index 2809b0c34..e70de7569 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java @@ -17,7 +17,7 @@ import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java index 8af6a5a1f..44f6deed1 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java @@ -20,7 +20,7 @@ import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.server.persistence.dataobject.AppDO; import com.tencent.supersonic.headless.server.persistence.mapper.AppMapper; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.AppService; import com.tencent.supersonic.headless.server.web.service.DimensionService; import com.tencent.supersonic.headless.server.web.service.MetricService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java index 4e0d071a3..74cb372c6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java @@ -13,7 +13,7 @@ import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.CanvasDO; import com.tencent.supersonic.headless.server.persistence.mapper.CanvasDOMapper; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.CanvasService; import com.tencent.supersonic.headless.server.web.service.DimensionService; import com.tencent.supersonic.headless.server.web.service.MetricService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java index 812b86345..370e3c03b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java @@ -27,7 +27,7 @@ import com.tencent.supersonic.headless.api.pojo.response.TagItem; import com.tencent.supersonic.headless.server.persistence.dataobject.DataSetDO; import com.tencent.supersonic.headless.server.persistence.mapper.DataSetDOMapper; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.DataSetService; import com.tencent.supersonic.headless.server.web.service.DimensionService; import com.tencent.supersonic.headless.server.web.service.DomainService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java index 3aa64c784..e45ee74e8 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java @@ -34,7 +34,7 @@ import com.tencent.supersonic.headless.server.persistence.repository.DimensionRepository; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; import com.tencent.supersonic.headless.server.pojo.DimensionsFilter; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.pojo.TagFilter; import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java index e0c2f0bdc..1e783e9b6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java @@ -24,7 +24,7 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.utils.DataTransformUtils; import com.tencent.supersonic.headless.server.pojo.DataDownload; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.DimensionService; import com.tencent.supersonic.headless.server.web.service.DownloadService; import com.tencent.supersonic.headless.server.web.service.MetricService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java index 3d1f75fb5..1ad06d497 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java @@ -52,7 +52,7 @@ import com.tencent.supersonic.headless.server.persistence.mapper.MetricDOMapper; import com.tencent.supersonic.headless.server.persistence.repository.MetricRepository; import com.tencent.supersonic.headless.server.pojo.DimensionsFilter; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.MetricFilter; import com.tencent.supersonic.headless.server.pojo.MetricsFilter; import com.tencent.supersonic.headless.server.pojo.ModelCluster; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java index 4350c2361..2b1241761 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java @@ -30,7 +30,7 @@ import com.tencent.supersonic.headless.server.persistence.dataobject.ModelDO; import com.tencent.supersonic.headless.server.persistence.repository.DateInfoRepository; import com.tencent.supersonic.headless.server.persistence.repository.ModelRepository; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.web.service.DatabaseService; import com.tencent.supersonic.headless.server.web.service.DimensionService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java index 7645c1e2a..40f7dd88f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java @@ -35,7 +35,7 @@ import com.tencent.supersonic.headless.server.manager.DimensionYamlManager; import com.tencent.supersonic.headless.server.manager.MetricYamlManager; import com.tencent.supersonic.headless.server.manager.ModelYamlManager; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.pojo.TagFilter; import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java index df8dddb30..6423b495c 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java @@ -19,7 +19,7 @@ import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; -import com.tencent.supersonic.headless.server.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.web.service.CanvasService; import com.tencent.supersonic.headless.server.web.service.DataSetService; import com.tencent.supersonic.headless.server.web.service.DatabaseService;