diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java index 8e71c3371..d4db2cffc 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java @@ -7,7 +7,7 @@ import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.request.ExecuteQueryReq; import com.tencent.supersonic.headless.api.pojo.response.QueryResult; -import com.tencent.supersonic.headless.server.service.ChatQueryService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; import lombok.SneakyThrows; public class SqlExecutor implements ChatExecutor { diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/MultiTurnParser.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/MultiTurnParser.java index c79201821..392760289 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/MultiTurnParser.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/MultiTurnParser.java @@ -14,7 +14,7 @@ import com.tencent.supersonic.headless.api.pojo.SchemaElementType; import com.tencent.supersonic.headless.api.pojo.request.QueryReq; import com.tencent.supersonic.headless.api.pojo.response.MapResp; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; -import com.tencent.supersonic.headless.server.service.ChatQueryService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; import dev.langchain4j.data.message.AiMessage; import dev.langchain4j.model.chat.ChatLanguageModel; import dev.langchain4j.model.input.Prompt; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java index 902a1bf17..90d2c4583 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java @@ -9,7 +9,7 @@ import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.request.QueryFilter; import com.tencent.supersonic.headless.api.pojo.request.QueryReq; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; -import com.tencent.supersonic.headless.server.service.ChatQueryService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; import java.util.List; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java index 2ad316fc8..6affc11c5 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DimensionRecommendProcessor.java @@ -9,7 +9,7 @@ import com.tencent.supersonic.headless.api.pojo.RelatedSchemaElement; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.response.QueryResult; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import org.springframework.util.CollectionUtils; import java.util.Comparator; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java index f9bf61579..4d29084b0 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java @@ -30,7 +30,7 @@ import com.tencent.supersonic.headless.api.pojo.response.QueryResult; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.config.AggregatorConfig; import com.tencent.supersonic.headless.chat.utils.QueryReqBuilder; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import java.text.DecimalFormat; import java.time.DayOfWeek; import java.time.LocalDate; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/EntityInfoProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/EntityInfoProcessor.java index 0178397fc..3986e916e 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/EntityInfoProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/EntityInfoProcessor.java @@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.EntityInfo; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.chat.query.QueryManager; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import org.springframework.util.CollectionUtils; import java.util.List; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java index 727b44a5e..68690165e 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java @@ -9,7 +9,7 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatConfigResp; import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp; import com.tencent.supersonic.chat.server.service.ConfigService; import com.tencent.supersonic.headless.api.pojo.response.ItemResp; -import com.tencent.supersonic.headless.server.service.SchemaService; +import com.tencent.supersonic.headless.server.web.service.SchemaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java index a5e37677d..60edd1f1b 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatServiceImpl.java @@ -29,8 +29,8 @@ import com.tencent.supersonic.headless.api.pojo.response.MapResp; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.api.pojo.response.QueryResult; import com.tencent.supersonic.headless.api.pojo.response.SearchResult; -import com.tencent.supersonic.headless.server.service.ChatQueryService; -import com.tencent.supersonic.headless.server.service.RetrieveService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; +import com.tencent.supersonic.headless.server.facade.service.RetrieveService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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 34e6f4e01..a122edc29 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 @@ -31,9 +31,9 @@ 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.service.DimensionService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +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.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java index 65656eb37..1b72e04e9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java @@ -5,7 +5,7 @@ import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.SignatureUtils; import com.tencent.supersonic.headless.api.pojo.enums.AppStatus; import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; -import com.tencent.supersonic.headless.server.service.AppService; +import com.tencent.supersonic.headless.server.web.service.AppService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; 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 888654b94..ecf9514bd 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 @@ -17,7 +17,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.server.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -46,7 +46,7 @@ public class DimValueAspect { @Autowired private DimensionService dimensionService; - @Around("execution(* com.tencent.supersonic.headless.server.service.SemanticLayerService.queryByReq(..))") + @Around("execution(* com.tencent.supersonic.headless.server.web.service.SemanticLayerService.queryByReq(..))") public Object handleDimValue(ProceedingJoinPoint joinPoint) throws Throwable { if (!dimensionValueMapEnable) { log.debug("dimensionValueMapEnable is false, skip dimensionValueMap"); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java index 4dced9928..1337c053f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java @@ -11,7 +11,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.core.pojo.QueryStatement; -import com.tencent.supersonic.headless.server.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.MetricService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; 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 c870d28e5..ed626b8e6 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 @@ -33,10 +33,10 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp; import com.tencent.supersonic.headless.api.pojo.response.DataSetResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.SchemaService; -import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; import com.tencent.supersonic.headless.server.utils.QueryStructUtils; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/ChatQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/ChatQueryApiController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java index fdc3e6255..158130c93 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/ChatQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/ChatQueryApiController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.rest.api; +package com.tencent.supersonic.headless.server.facade.rest; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.ExecuteQueryReq; import com.tencent.supersonic.headless.api.pojo.request.QueryReq; import com.tencent.supersonic.headless.api.pojo.response.MapResp; -import com.tencent.supersonic.headless.server.service.ChatQueryService; -import com.tencent.supersonic.headless.server.service.RetrieveService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; +import com.tencent.supersonic.headless.server.facade.service.RetrieveService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/DataSetQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java similarity index 86% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/DataSetQueryApiController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java index 2df9703c7..a376db661 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/DataSetQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.rest.api; +package com.tencent.supersonic.headless.server.facade.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.QueryDataSetReq; import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/MetaDiscoveryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java similarity index 89% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/MetaDiscoveryApiController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java index 2fd1c7f80..f6c2b7015 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/MetaDiscoveryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetaDiscoveryApiController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.server.rest.api; +package com.tencent.supersonic.headless.server.facade.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq; -import com.tencent.supersonic.headless.server.service.RetrieveService; +import com.tencent.supersonic.headless.server.facade.service.RetrieveService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/MetricQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java similarity index 89% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/MetricQueryApiController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java index 26cf32c3b..8cd8b6c2e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/MetricQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest.api; +package com.tencent.supersonic.headless.server.facade.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; @@ -6,9 +6,9 @@ import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq; import com.tencent.supersonic.headless.api.pojo.request.DownloadMetricReq; import com.tencent.supersonic.headless.api.pojo.request.QueryMetricReq; import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; -import com.tencent.supersonic.headless.server.service.DownloadService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.DownloadService; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/SqlQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/SqlQueryApiController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java index a68f31cc2..0898860f9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/SqlQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest.api; +package com.tencent.supersonic.headless.server.facade.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; @@ -7,8 +7,8 @@ import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlsReq; import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; -import com.tencent.supersonic.headless.server.service.ChatQueryService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/TagQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java similarity index 89% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/TagQueryApiController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java index c7f685993..fedc8b3a4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/TagQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/TagQueryApiController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.server.rest.api; +package com.tencent.supersonic.headless.server.facade.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ChatQueryService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/ChatQueryService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ChatQueryService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/ChatQueryService.java index 78922784f..a3759389d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ChatQueryService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/ChatQueryService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.facade.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.EntityInfo; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/FlightService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/FlightService.java similarity index 83% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/FlightService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/FlightService.java index 572f9fdbf..57d5b0efe 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/FlightService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/FlightService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.facade.service; import java.util.concurrent.ExecutorService; import org.apache.arrow.flight.sql.FlightSqlProducer; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/RetrieveService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/RetrieveService.java similarity index 87% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/RetrieveService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/RetrieveService.java index ea78350ed..989d18cd8 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/RetrieveService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/RetrieveService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.facade.service; import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq; import com.tencent.supersonic.headless.api.pojo.request.QueryReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java index a7b2485f2..07825891a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.facade.service.impl; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.DateConf; @@ -53,11 +53,11 @@ import com.tencent.supersonic.headless.chat.query.llm.s2sql.LLMSqlQuery; import com.tencent.supersonic.headless.chat.ChatContext; import com.tencent.supersonic.headless.chat.QueryContext; import com.tencent.supersonic.headless.server.persistence.dataobject.StatisticsDO; -import com.tencent.supersonic.headless.server.service.ChatContextService; -import com.tencent.supersonic.headless.server.service.ChatQueryService; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; -import com.tencent.supersonic.headless.server.service.WorkflowService; +import com.tencent.supersonic.headless.server.web.service.ChatContextService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.WorkflowService; import com.tencent.supersonic.headless.server.utils.ComponentFactory; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/FlightServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/FlightServiceImpl.java index 86658839a..b510636b8 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/FlightServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.facade.service.impl; import static com.google.protobuf.Any.pack; import static com.google.protobuf.ByteString.copyFrom; @@ -20,8 +20,8 @@ import com.tencent.supersonic.headless.api.pojo.Param; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; -import com.tencent.supersonic.headless.server.service.FlightService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.facade.service.FlightService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import com.tencent.supersonic.headless.server.utils.FlightUtils; import java.nio.charset.StandardCharsets; import java.sql.ResultSet; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java index 0fa80f08e..5dedcf2f0 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.facade.service.impl; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -32,11 +32,11 @@ import com.tencent.supersonic.headless.chat.mapper.MatchText; import com.tencent.supersonic.headless.chat.mapper.ModelWithSemanticType; import com.tencent.supersonic.headless.chat.mapper.SearchMatchStrategy; import com.tencent.supersonic.headless.server.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.service.ChatContextService; -import com.tencent.supersonic.headless.server.service.ChatQueryService; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.RetrieveService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.ChatContextService; +import com.tencent.supersonic.headless.server.facade.service.ChatQueryService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.facade.service.RetrieveService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/DictWordLoadStartedListener.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/DictWordLoadStartedListener.java index 8e84b41ab..0d6db7a02 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/DictWordLoadStartedListener.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/DictWordLoadStartedListener.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.server.listener; -import com.tencent.supersonic.headless.server.service.impl.DictWordService; +import com.tencent.supersonic.headless.server.web.service.impl.DictWordService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/FlightSqlListener.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/FlightSqlListener.java index c61f87cf1..01e19e1bc 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/FlightSqlListener.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/FlightSqlListener.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.server.listener; -import com.tencent.supersonic.headless.server.service.FlightService; +import com.tencent.supersonic.headless.server.facade.service.FlightService; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java index 8ea3e868a..890090418 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java @@ -29,7 +29,7 @@ import com.tencent.supersonic.headless.server.pojo.yaml.MeasureYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricParamYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricTypeParamsYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl; -import com.tencent.supersonic.headless.server.service.CatalogService; +import com.tencent.supersonic.headless.server.web.service.CatalogService; import com.tencent.supersonic.headless.server.utils.DatabaseConverter; import java.util.ArrayList; import java.util.HashMap; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DictRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DictRepositoryImpl.java index 6229d2c36..f79a2903d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DictRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DictRepositoryImpl.java @@ -13,7 +13,7 @@ import com.tencent.supersonic.headless.server.persistence.dataobject.DictTaskDO; import com.tencent.supersonic.headless.server.persistence.mapper.DictConfMapper; import com.tencent.supersonic.headless.server.persistence.mapper.DictTaskMapper; import com.tencent.supersonic.headless.server.persistence.repository.DictRepository; -import com.tencent.supersonic.headless.server.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; import com.tencent.supersonic.headless.server.utils.DictUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; 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 256555a83..10138d287 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 @@ -4,7 +4,7 @@ import java.util.List; import lombok.Data; @Data -public class MetricsFilter { +public class MetricsFilter extends MetaFilter { private List modelIds; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java index ff2ee9cab..b2a317341 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java @@ -17,7 +17,7 @@ import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.chat.ChatContext; import com.tencent.supersonic.headless.chat.QueryContext; import com.tencent.supersonic.headless.chat.query.SemanticQuery; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/SqlInfoProcessor.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/SqlInfoProcessor.java index 0be3087e2..316f1633c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/SqlInfoProcessor.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/SqlInfoProcessor.java @@ -13,7 +13,7 @@ import com.tencent.supersonic.headless.chat.QueryContext; import com.tencent.supersonic.headless.chat.query.QueryManager; import com.tencent.supersonic.headless.chat.query.SemanticQuery; import com.tencent.supersonic.headless.chat.query.llm.s2sql.LLMSqlQuery; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java index 07c688297..ebfc44465 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.schedule; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.service.EmbeddingService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.MetricService; import dev.langchain4j.store.embedding.TextSegmentConvert; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ClassConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ClassConverter.java index bcaff7a15..78a06aeeb 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ClassConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ClassConverter.java @@ -7,8 +7,8 @@ import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import com.tencent.supersonic.headless.api.pojo.response.TagObjectResp; import com.tencent.supersonic.headless.server.persistence.dataobject.ClassDO; import com.tencent.supersonic.headless.server.persistence.repository.ClassRepository; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.TagObjectService; +import com.tencent.supersonic.headless.server.web.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.TagObjectService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java index c83b2905e..5ef9137fd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java @@ -35,11 +35,11 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.api.pojo.response.TagResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DictConfDO; import com.tencent.supersonic.headless.server.persistence.dataobject.DictTaskDO; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; -import com.tencent.supersonic.headless.server.service.TagMetaService; +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.ModelService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java index 161d34889..395bfcc43 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelClusterBuilder.java @@ -4,7 +4,7 @@ package com.tencent.supersonic.headless.server.utils; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.pojo.ModelCluster; -import com.tencent.supersonic.headless.server.service.SchemaService; +import com.tencent.supersonic.headless.server.web.service.SchemaService; import java.util.ArrayList; import java.util.HashSet; 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 142fa9eb5..07c980131 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 @@ -19,7 +19,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.server.service.CatalogService; +import com.tencent.supersonic.headless.server.web.service.CatalogService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Triple; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/AppController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/AppController.java index 340120884..4a69bfae7 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/AppController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.request.AppQueryReq; import com.tencent.supersonic.headless.api.pojo.request.AppReq; import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; import com.tencent.supersonic.headless.api.pojo.response.AppResp; -import com.tencent.supersonic.headless.server.service.AppService; +import com.tencent.supersonic.headless.server.web.service.AppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CanvasController.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CanvasController.java index 3b6befbf6..a51ccc4b9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CanvasController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -6,7 +6,7 @@ import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.CanvasReq; import com.tencent.supersonic.headless.api.pojo.response.CanvasSchemaResp; import com.tencent.supersonic.headless.server.persistence.dataobject.CanvasDO; -import com.tencent.supersonic.headless.server.service.CanvasService; +import com.tencent.supersonic.headless.server.web.service.CanvasService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ClassController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ClassController.java index 8b6a81345..7769bc62f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ClassController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.ClassReq; import com.tencent.supersonic.headless.api.pojo.response.ClassResp; import com.tencent.supersonic.headless.server.pojo.ClassFilter; -import com.tencent.supersonic.headless.server.service.ClassService; +import com.tencent.supersonic.headless.server.web.service.ClassService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CollectController.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CollectController.java index 401aa584b..807166a77 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CollectController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.server.persistence.dataobject.CollectDO; -import com.tencent.supersonic.headless.server.service.CollectService; +import com.tencent.supersonic.headless.server.web.service.CollectService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java index ffc004839..c20ce6bd2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; 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.server.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DatabaseController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DatabaseController.java index 5470e83d5..d1f69df2e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DatabaseController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; @@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.request.SqlExecuteReq; import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.pojo.DatabaseParameter; -import com.tencent.supersonic.headless.server.service.DatabaseService; +import com.tencent.supersonic.headless.server.web.service.DatabaseService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java index 46c35f755..f5ad687ff 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -14,8 +14,8 @@ 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.DimensionFilter; import com.tencent.supersonic.headless.server.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DomainController.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DomainController.java index 350c300cd..be55932b2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DomainController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.DomainReq; import com.tencent.supersonic.headless.api.pojo.request.DomainUpdateReq; import com.tencent.supersonic.headless.api.pojo.response.DomainResp; -import com.tencent.supersonic.headless.server.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.DomainService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/KnowledgeController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/KnowledgeController.java index 83a112b75..50f29d1ba 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/KnowledgeController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.github.pagehelper.PageInfo; @@ -12,8 +12,8 @@ import com.tencent.supersonic.headless.api.pojo.response.DictItemResp; import com.tencent.supersonic.headless.api.pojo.response.DictTaskResp; import com.tencent.supersonic.headless.api.pojo.response.DictValueResp; import com.tencent.supersonic.headless.server.schedule.EmbeddingTask; -import com.tencent.supersonic.headless.server.service.DictConfService; -import com.tencent.supersonic.headless.server.service.DictTaskService; +import com.tencent.supersonic.headless.server.web.service.DictConfService; +import com.tencent.supersonic.headless.server.web.service.DictTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java index 1c6cb0a05..79bac69a9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.github.pagehelper.PageInfo; @@ -15,7 +15,7 @@ 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.server.pojo.MetricFilter; -import com.tencent.supersonic.headless.server.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.MetricService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelController.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelController.java index 0173e6091..827927d5b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -11,7 +11,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.ModelFilter; -import com.tencent.supersonic.headless.server.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.ModelService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelRelaController.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelRelaController.java index 68578c894..54ee8cd2c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelRelaController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.headless.server.service.ModelRelaService; +import com.tencent.supersonic.headless.server.web.service.ModelRelaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/QueryRuleController.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/QueryRuleController.java index c8f629c3b..a24f42f0a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/QueryRuleController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.QueryRuleFilter; import com.tencent.supersonic.headless.api.pojo.request.QueryRuleReq; import com.tencent.supersonic.headless.api.pojo.response.QueryRuleResp; -import com.tencent.supersonic.headless.server.service.QueryRuleService; +import com.tencent.supersonic.headless.server.web.service.QueryRuleService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/SchemaController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/SchemaController.java index 7d437b260..3db63fa40 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/SchemaController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -13,7 +13,7 @@ import com.tencent.supersonic.headless.api.pojo.response.DomainResp; 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.DataSetSchemaResp; -import com.tencent.supersonic.headless.server.service.SchemaService; +import com.tencent.supersonic.headless.server.web.service.SchemaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagController.java index d5f3cfdf7..d954c8f2f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -11,8 +11,8 @@ import com.tencent.supersonic.headless.api.pojo.response.ItemValueResp; import com.tencent.supersonic.headless.api.pojo.response.TagResp; import com.tencent.supersonic.headless.server.persistence.dataobject.TagDO; import com.tencent.supersonic.headless.server.pojo.TagFilter; -import com.tencent.supersonic.headless.server.service.TagMetaService; -import com.tencent.supersonic.headless.server.service.TagQueryService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.TagQueryService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagObjectController.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagObjectController.java index 6c4065824..a66e61b8e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagObjectController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.TagObjectReq; import com.tencent.supersonic.headless.api.pojo.response.TagObjectResp; import com.tencent.supersonic.headless.server.pojo.TagObjectFilter; -import com.tencent.supersonic.headless.server.service.TagObjectService; +import com.tencent.supersonic.headless.server.web.service.TagObjectService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TermController.java similarity index 93% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TermController.java index 2bd80a5cd..2549e3914 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TermController.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.headless.server.rest; +package com.tencent.supersonic.headless.server.web.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.headless.api.pojo.request.TermReq; import com.tencent.supersonic.headless.api.pojo.response.TermResp; -import com.tencent.supersonic.headless.server.service.TermService; +import com.tencent.supersonic.headless.server.web.service.TermService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/AppService.java similarity index 92% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/AppService.java index 4d576a7c2..27a2f1a2d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/AppService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.github.pagehelper.PageInfo; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CanvasService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CanvasService.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CanvasService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CanvasService.java index 12347616e..a35d54934 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CanvasService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CanvasService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.CanvasReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CatalogService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CatalogService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CatalogService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CatalogService.java index 0dccbe1a6..39bafd8c5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CatalogService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CatalogService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ChatContextService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java similarity index 84% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ChatContextService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java index aff83cc81..20261a05c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ChatContextService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.headless.chat.ChatContext; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ClassService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ClassService.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ClassService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ClassService.java index 996549a50..7fc28a1ac 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ClassService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ClassService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.ClassReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CollectService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CollectService.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CollectService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CollectService.java index 42325d08b..cf21bae09 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CollectService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CollectService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.TypeEnums; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java index bf5785ac6..9cd64f24a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.QueryDataSetReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DatabaseService.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DatabaseService.java index af0fe3a9d..8324274dc 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DatabaseService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictConfService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictConfService.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictConfService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictConfService.java index 21347f87c..fd6824780 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictConfService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictConfService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.DictItemFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictTaskService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictTaskService.java similarity index 93% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictTaskService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictTaskService.java index f62f740c2..7a0d1c44b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictTaskService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictTaskService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java index 4c23dfbf5..f24c7c955 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DomainService.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DomainService.java index a87686df9..e8f3a4c8b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DomainService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DownloadService.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DownloadService.java index 403c3dbb1..8dc123b1f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DownloadService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java index d8033c0a2..789974cc5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelRelaService.java similarity index 87% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelRelaService.java index 6783fed08..b92658d57 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelRelaService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ModelRela; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java index ea809efad..2ca92e094 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ItemDateResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryRuleService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/QueryRuleService.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryRuleService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/QueryRuleService.java index 2e9a35aef..3df568e47 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryRuleService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/QueryRuleService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.QueryRuleFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java index 56463f10c..886025afa 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SemanticLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SemanticLayerService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SemanticLayerService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SemanticLayerService.java index 64e896fef..c121d9534 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SemanticLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SemanticLayerService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagMetaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagMetaService.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagMetaService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagMetaService.java index 55917d1b8..524a19fa4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagMetaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagMetaService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagObjectService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagObjectService.java similarity index 92% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagObjectService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagObjectService.java index a56208ba8..1e9ff04ce 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagObjectService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagObjectService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.TagObjectReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagQueryService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagQueryService.java similarity index 84% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagQueryService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagQueryService.java index dd930cd66..cdd0d6214 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagQueryService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagQueryService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.ItemValueReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TermService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TermService.java similarity index 89% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TermService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TermService.java index 5e97c219b..6ec89e040 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TermService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TermService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/WorkflowService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/WorkflowService.java similarity index 83% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/WorkflowService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/WorkflowService.java index 8dc164f79..950cf4667 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/WorkflowService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/WorkflowService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service; +package com.tencent.supersonic.headless.server.web.service; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.chat.ChatContext; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java index b17830202..8af6a5a1f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,9 +21,9 @@ 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.server.service.AppService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.MetricService; +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; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CanvasServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CanvasServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java index 31f45ed9b..4e0d071a3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CanvasServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,10 +14,10 @@ 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.server.service.CanvasService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelService; +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; +import com.tencent.supersonic.headless.server.web.service.ModelService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CatalogImpl.java similarity index 89% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CatalogImpl.java index 6a6149ffc..5830faaed 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CatalogImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; @@ -18,14 +18,14 @@ import com.tencent.supersonic.headless.server.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; -import com.tencent.supersonic.headless.server.service.CatalogService; -import com.tencent.supersonic.headless.server.service.DatabaseService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelRelaService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.SchemaService; -import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.CatalogService; +import com.tencent.supersonic.headless.server.web.service.DatabaseService; +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.ModelRelaService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Component; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatContextServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatContextServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java index 5323e82cf..e076c48d8 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatContextServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.chat.ChatContext; import com.tencent.supersonic.headless.server.persistence.repository.ChatContextRepository; -import com.tencent.supersonic.headless.server.service.ChatContextService; +import com.tencent.supersonic.headless.server.web.service.ChatContextService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ClassServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ClassServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ClassServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ClassServiceImpl.java index 44957760c..3cd79e9aa 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ClassServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ClassServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -9,7 +9,7 @@ import com.tencent.supersonic.headless.api.pojo.response.ClassResp; import com.tencent.supersonic.headless.server.persistence.dataobject.ClassDO; import com.tencent.supersonic.headless.server.persistence.repository.ClassRepository; import com.tencent.supersonic.headless.server.pojo.ClassFilter; -import com.tencent.supersonic.headless.server.service.ClassService; +import com.tencent.supersonic.headless.server.web.service.ClassService; import com.tencent.supersonic.headless.server.utils.ClassConverter; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CollectServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CollectServiceImpl.java index 95b32e648..ba446eb30 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CollectServiceImpl.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.headless.server.persistence.dataobject.CollectDO; import com.tencent.supersonic.headless.server.persistence.mapper.CollectMapper; -import com.tencent.supersonic.headless.server.service.CollectService; +import com.tencent.supersonic.headless.server.web.service.CollectService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java index 6127067c2..910dc4048 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -28,11 +28,11 @@ 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.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.TagMetaService; +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; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DatabaseServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DatabaseServiceImpl.java index d3ce5bbe5..a2b648849 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DatabaseServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; @@ -23,8 +23,8 @@ import com.tencent.supersonic.headless.server.persistence.mapper.DatabaseDOMappe import com.tencent.supersonic.headless.server.pojo.DatabaseParameter; import com.tencent.supersonic.headless.server.pojo.DbParameterFactory; import com.tencent.supersonic.headless.server.pojo.ModelFilter; -import com.tencent.supersonic.headless.server.service.DatabaseService; -import com.tencent.supersonic.headless.server.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.DatabaseService; +import com.tencent.supersonic.headless.server.web.service.ModelService; import com.tencent.supersonic.headless.server.utils.DatabaseConverter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictConfServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictConfServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictConfServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictConfServiceImpl.java index 8f583508b..a88f427e5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictConfServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictConfServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.request.DictItemReq; import com.tencent.supersonic.headless.api.pojo.response.DictItemResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DictConfDO; import com.tencent.supersonic.headless.server.persistence.repository.DictRepository; -import com.tencent.supersonic.headless.server.service.DictConfService; +import com.tencent.supersonic.headless.server.web.service.DictConfService; import com.tencent.supersonic.headless.server.utils.DictUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictTaskServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictTaskServiceImpl.java index 6d9237a55..c69a4e6a7 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictTaskServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -16,7 +16,7 @@ import com.tencent.supersonic.headless.chat.knowledge.file.FileHandler; import com.tencent.supersonic.headless.chat.knowledge.helper.HanlpHelper; import com.tencent.supersonic.headless.server.persistence.dataobject.DictTaskDO; import com.tencent.supersonic.headless.server.persistence.repository.DictRepository; -import com.tencent.supersonic.headless.server.service.DictTaskService; +import com.tencent.supersonic.headless.server.web.service.DictTaskService; import com.tencent.supersonic.headless.server.utils.DictUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictWordService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictWordService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java index a6e569c00..647958215 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictWordService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.common.pojo.enums.DictWordType; import com.tencent.supersonic.headless.api.pojo.SchemaElement; @@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.SemanticSchema; import com.tencent.supersonic.headless.chat.knowledge.DictWord; import com.tencent.supersonic.headless.chat.knowledge.KnowledgeBaseService; import com.tencent.supersonic.headless.chat.knowledge.builder.WordBuilderFactory; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java index 151e6ced9..d7b342b3e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -36,12 +36,12 @@ import com.tencent.supersonic.headless.server.pojo.DimensionsFilter; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.pojo.TagFilter; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.DatabaseService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.ModelRelaService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DatabaseService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.ModelRelaService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; import com.tencent.supersonic.headless.server.utils.DimensionConverter; import com.tencent.supersonic.headless.server.utils.NameCheckUtils; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DomainServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DomainServiceImpl.java index 4bfb5d08a..c292c44c5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DomainServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -12,8 +12,8 @@ import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DomainDO; import com.tencent.supersonic.headless.server.persistence.repository.DomainRepository; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.ModelService; import com.tencent.supersonic.headless.server.utils.DomainConvert; import lombok.extern.slf4j.Slf4j; import org.assertj.core.util.Sets; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java index a8c297c5a..ea30c4cdc 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -25,10 +25,10 @@ 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.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.DownloadService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +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; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java index 467bfc670..72eb6fe20 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -58,13 +58,13 @@ import com.tencent.supersonic.headless.server.pojo.MetricsFilter; import com.tencent.supersonic.headless.server.pojo.ModelCluster; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.pojo.TagFilter; -import com.tencent.supersonic.headless.server.service.CollectService; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.RetrieveService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.CollectService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.facade.service.RetrieveService; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; import com.tencent.supersonic.headless.server.utils.MetricCheckUtils; import com.tencent.supersonic.headless.server.utils.MetricConverter; import com.tencent.supersonic.headless.server.utils.ModelClusterBuilder; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelRelaServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelRelaServiceImpl.java index 0df24e10d..08ece63e2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelRelaServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,7 +10,7 @@ import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.headless.server.persistence.dataobject.ModelRelaDO; import com.tencent.supersonic.headless.server.persistence.mapper.ModelRelaDOMapper; -import com.tencent.supersonic.headless.server.service.ModelRelaService; +import com.tencent.supersonic.headless.server.web.service.ModelRelaService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java index ed3225225..c6ec89863 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -32,12 +32,12 @@ import com.tencent.supersonic.headless.server.persistence.repository.DateInfoRep import com.tencent.supersonic.headless.server.persistence.repository.ModelRepository; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; -import com.tencent.supersonic.headless.server.service.DatabaseService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DatabaseService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; import com.tencent.supersonic.headless.server.utils.ModelConverter; import com.tencent.supersonic.headless.server.utils.NameCheckUtils; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryRuleServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/QueryRuleServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryRuleServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/QueryRuleServiceImpl.java index c6a633980..a58635bf5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryRuleServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/QueryRuleServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.StatusEnum; @@ -9,8 +9,8 @@ import com.tencent.supersonic.headless.api.pojo.response.DataSetResp; import com.tencent.supersonic.headless.api.pojo.response.QueryRuleResp; import com.tencent.supersonic.headless.server.persistence.dataobject.QueryRuleDO; import com.tencent.supersonic.headless.server.persistence.repository.QueryRuleRepository; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.QueryRuleService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.QueryRuleService; import com.tencent.supersonic.headless.server.utils.QueryRuleConverter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/S2SemanticLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/S2SemanticLayerService.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/S2SemanticLayerService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/S2SemanticLayerService.java index 8b1a9e285..c1d5f6796 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/S2SemanticLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/S2SemanticLayerService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -44,10 +44,10 @@ import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.ComponentFactory; import com.tencent.supersonic.headless.server.annotation.S2DataPermission; import com.tencent.supersonic.headless.server.manager.SemanticSchemaManager; -import com.tencent.supersonic.headless.server.service.CatalogService; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.SchemaService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.CatalogService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import com.tencent.supersonic.headless.server.utils.QueryReqConverter; import com.tencent.supersonic.headless.server.utils.QueryUtils; import com.tencent.supersonic.headless.server.utils.StatUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java index 80e6cb471..14580ce0d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.github.pagehelper.PageInfo; import com.google.common.cache.Cache; @@ -37,15 +37,15 @@ import com.tencent.supersonic.headless.api.pojo.response.TermResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.pojo.TagFilter; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelRelaService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.SchemaService; -import com.tencent.supersonic.headless.server.service.TagMetaService; -import com.tencent.supersonic.headless.server.service.TermService; +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; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.ModelRelaService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.TermService; import com.tencent.supersonic.headless.server.utils.DataSetSchemaBuilder; import com.tencent.supersonic.headless.server.utils.DimensionConverter; import com.tencent.supersonic.headless.server.utils.MetricConverter; 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/web/service/impl/TagMetaServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagMetaServiceImpl.java index 6550e2a0a..8ca2dff7f 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/web/service/impl/TagMetaServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -24,13 +24,13 @@ import com.tencent.supersonic.headless.server.persistence.repository.TagReposito import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.pojo.TagFilter; import com.tencent.supersonic.headless.server.pojo.TagObjectFilter; -import com.tencent.supersonic.headless.server.service.CollectService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.TagMetaService; -import com.tencent.supersonic.headless.server.service.TagObjectService; +import com.tencent.supersonic.headless.server.web.service.CollectService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.TagObjectService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagObjectServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagObjectServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagObjectServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagObjectServiceImpl.java index 40d09ed53..be38f951e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagObjectServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagObjectServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.StatusEnum; @@ -8,7 +8,7 @@ import com.tencent.supersonic.headless.api.pojo.response.TagObjectResp; import com.tencent.supersonic.headless.server.persistence.dataobject.TagObjectDO; import com.tencent.supersonic.headless.server.persistence.repository.TagObjectRepository; import com.tencent.supersonic.headless.server.pojo.TagObjectFilter; -import com.tencent.supersonic.headless.server.service.TagObjectService; +import com.tencent.supersonic.headless.server.web.service.TagObjectService; import com.tencent.supersonic.headless.server.utils.TagObjectConverter; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; 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/web/service/impl/TagQueryServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java index 2bf653ff7..8b33e626b 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/web/service/impl/TagQueryServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.DateConf; @@ -14,10 +14,10 @@ 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.TagResp; import com.tencent.supersonic.headless.core.utils.SqlGenerateUtils; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; -import com.tencent.supersonic.headless.server.service.TagMetaService; -import com.tencent.supersonic.headless.server.service.TagQueryService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.TagQueryService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TermServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TermServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TermServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TermServiceImpl.java index 8076bb382..224ff65b9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TermServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TermServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -9,7 +9,7 @@ import com.tencent.supersonic.headless.api.pojo.request.TermReq; import com.tencent.supersonic.headless.api.pojo.response.TermResp; import com.tencent.supersonic.headless.server.persistence.dataobject.TermDO; import com.tencent.supersonic.headless.server.persistence.mapper.TermMapper; -import com.tencent.supersonic.headless.server.service.TermService; +import com.tencent.supersonic.headless.server.web.service.TermService; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/WorkflowServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/WorkflowServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/WorkflowServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/WorkflowServiceImpl.java index 3ee22ac7a..fda24661c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/WorkflowServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/WorkflowServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.service.impl; +package com.tencent.supersonic.headless.server.web.service.impl; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.headless.api.pojo.enums.WorkflowState; @@ -11,7 +11,7 @@ import com.tencent.supersonic.headless.chat.parser.SemanticParser; import com.tencent.supersonic.headless.chat.query.SemanticQuery; import com.tencent.supersonic.headless.chat.query.rule.RuleSemanticQuery; import com.tencent.supersonic.headless.server.processor.ResultProcessor; -import com.tencent.supersonic.headless.server.service.WorkflowService; +import com.tencent.supersonic.headless.server.web.service.WorkflowService; import com.tencent.supersonic.headless.server.utils.ComponentFactory; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java index 19585b139..e08a7962f 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java @@ -16,10 +16,17 @@ import com.tencent.supersonic.headless.api.pojo.enums.MetricType; import com.tencent.supersonic.headless.api.pojo.request.MetricReq; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.server.facade.service.RetrieveService; import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO; import com.tencent.supersonic.headless.server.persistence.repository.MetricRepository; -import com.tencent.supersonic.headless.server.service.impl.DataSetServiceImpl; -import com.tencent.supersonic.headless.server.service.impl.MetricServiceImpl; +import com.tencent.supersonic.headless.server.web.service.CollectService; +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.ModelService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.impl.DataSetServiceImpl; +import com.tencent.supersonic.headless.server.web.service.impl.MetricServiceImpl; import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper; import com.tencent.supersonic.headless.server.utils.MetricConverter; import org.junit.jupiter.api.Assertions; diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java index b9e76b9bd..e28f64fd3 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java @@ -17,7 +17,13 @@ import com.tencent.supersonic.headless.api.pojo.response.ModelResp; 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.service.impl.ModelServiceImpl; +import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DatabaseService; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.impl.ModelServiceImpl; import com.tencent.supersonic.headless.server.utils.ModelConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; 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 af0d7a773..be59115a1 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 @@ -23,18 +23,18 @@ 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.ParseResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.service.CanvasService; -import com.tencent.supersonic.headless.server.service.DataSetService; -import com.tencent.supersonic.headless.server.service.DatabaseService; -import com.tencent.supersonic.headless.server.service.DimensionService; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.MetricService; -import com.tencent.supersonic.headless.server.service.ModelRelaService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.TagMetaService; -import com.tencent.supersonic.headless.server.service.TagObjectService; -import com.tencent.supersonic.headless.server.service.TermService; -import com.tencent.supersonic.headless.server.service.impl.DictWordService; +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; +import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.web.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.ModelRelaService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.TagObjectService; +import com.tencent.supersonic.headless.server.web.service.TermService; +import com.tencent.supersonic.headless.server.web.service.impl.DictWordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java index 0cab26cfb..b856312b3 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java @@ -14,7 +14,7 @@ import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DomainDO; import com.tencent.supersonic.headless.server.persistence.repository.DomainRepository; -import com.tencent.supersonic.headless.server.service.SemanticLayerService; +import com.tencent.supersonic.headless.server.web.service.SemanticLayerService; import com.tencent.supersonic.util.DataUtils; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/DictTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/DictTest.java index 9eeaf0ba8..77ccd68f0 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/DictTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/DictTest.java @@ -9,7 +9,7 @@ import com.tencent.supersonic.headless.api.pojo.ItemValueConfig; import com.tencent.supersonic.headless.api.pojo.request.DictSingleTaskReq; import com.tencent.supersonic.headless.server.persistence.dataobject.DictConfDO; import com.tencent.supersonic.headless.server.persistence.mapper.DictConfMapper; -import com.tencent.supersonic.headless.server.service.DictTaskService; +import com.tencent.supersonic.headless.server.web.service.DictTaskService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/MetaDiscoveryTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/MetaDiscoveryTest.java index f239880b2..981d6b094 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/MetaDiscoveryTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/MetaDiscoveryTest.java @@ -4,7 +4,7 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.QueryDataType; import com.tencent.supersonic.headless.api.pojo.request.QueryMapReq; import com.tencent.supersonic.headless.api.pojo.response.MapInfoResp; -import com.tencent.supersonic.headless.server.service.RetrieveService; +import com.tencent.supersonic.headless.server.facade.service.RetrieveService; import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/ModelSchemaTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/ModelSchemaTest.java index f688c7909..b45e35cca 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/ModelSchemaTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/ModelSchemaTest.java @@ -4,7 +4,7 @@ import com.google.common.collect.Lists; import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp; -import com.tencent.supersonic.headless.server.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.ModelService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java index 4a8a55836..98bb78eae 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java @@ -4,7 +4,7 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.QueryMetricReq; import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; -import com.tencent.supersonic.headless.server.service.MetricService; +import com.tencent.supersonic.headless.server.web.service.MetricService; import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryRuleTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryRuleTest.java index 4e34f873d..5b9e79efe 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryRuleTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryRuleTest.java @@ -7,7 +7,7 @@ import com.tencent.supersonic.headless.api.pojo.enums.QueryRuleType; import com.tencent.supersonic.headless.api.pojo.request.QueryRuleFilter; import com.tencent.supersonic.headless.api.pojo.request.QueryRuleReq; import com.tencent.supersonic.headless.api.pojo.response.QueryRuleResp; -import com.tencent.supersonic.headless.server.service.QueryRuleService; +import com.tencent.supersonic.headless.server.web.service.QueryRuleService; import org.junit.Assert; import org.junit.jupiter.api.Test; import org.springframework.beans.BeanUtils; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java index f7b3ee4af..182daae92 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java @@ -6,9 +6,9 @@ import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.api.pojo.response.DataSetResp; -import com.tencent.supersonic.headless.server.service.DomainService; -import com.tencent.supersonic.headless.server.service.ModelService; -import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.web.service.DomainService; +import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.web.service.DataSetService; import com.tencent.supersonic.util.DataUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagObjectTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagObjectTest.java index c194302d1..9e1ea65c0 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagObjectTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagObjectTest.java @@ -4,7 +4,7 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.headless.api.pojo.request.TagObjectReq; import com.tencent.supersonic.headless.api.pojo.response.TagObjectResp; import com.tencent.supersonic.headless.server.pojo.TagObjectFilter; -import com.tencent.supersonic.headless.server.service.TagObjectService; +import com.tencent.supersonic.headless.server.web.service.TagObjectService; import org.junit.jupiter.api.Test; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java index 85f52f9e7..1e4e42a43 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java @@ -10,8 +10,8 @@ import com.tencent.supersonic.headless.api.pojo.request.TagReq; import com.tencent.supersonic.headless.api.pojo.response.ItemValueResp; import com.tencent.supersonic.headless.api.pojo.response.TagResp; import com.tencent.supersonic.headless.server.pojo.TagFilter; -import com.tencent.supersonic.headless.server.service.TagMetaService; -import com.tencent.supersonic.headless.server.service.TagQueryService; +import com.tencent.supersonic.headless.server.web.service.TagMetaService; +import com.tencent.supersonic.headless.server.web.service.TagQueryService; import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer;