From ff38a6d25064f09581086f40dc993188660110e0 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Tue, 16 Jul 2024 17:59:26 +0800 Subject: [PATCH] (improvement)(headless)Restructure to remove `web` parent package. --- .../server/aspect/ApiHeaderCheckAspect.java | 2 +- .../server/aspect/DimValueAspect.java | 2 +- .../server/aspect/S2DataPermissionAspect.java | 4 ++-- .../rest/DataSetQueryApiController.java | 2 +- .../facade/rest/MetricQueryApiController.java | 4 ++-- .../service/impl/S2ChatLayerService.java | 6 ++--- .../service/impl/S2SemanticLayerService.java | 8 +++---- .../server/manager/SemanticSchemaManager.java | 2 +- .../repository/impl/DictRepositoryImpl.java | 2 +- .../server/processor/ParseInfoProcessor.java | 2 +- .../server/{web => }/rest/AppController.java | 4 ++-- .../{web => }/rest/CanvasController.java | 4 ++-- .../{web => }/rest/ClassController.java | 4 ++-- .../{web => }/rest/CollectController.java | 4 ++-- .../{web => }/rest/DataSetController.java | 4 ++-- .../{web => }/rest/DatabaseController.java | 4 ++-- .../{web => }/rest/DimensionController.java | 4 ++-- .../{web => }/rest/DomainController.java | 4 ++-- .../{web => }/rest/KnowledgeController.java | 6 ++--- .../{web => }/rest/MetricController.java | 4 ++-- .../{web => }/rest/ModelController.java | 4 ++-- .../{web => }/rest/ModelRelaController.java | 4 ++-- .../{web => }/rest/QueryRuleController.java | 4 ++-- .../{web => }/rest/SchemaController.java | 4 ++-- .../server/{web => }/rest/TagController.java | 6 ++--- .../{web => }/rest/TagObjectController.java | 4 ++-- .../server/{web => }/rest/TermController.java | 4 ++-- .../server/{web => }/service/AppService.java | 2 +- .../{web => }/service/CanvasService.java | 2 +- .../{web => }/service/ClassService.java | 2 +- .../{web => }/service/CollectService.java | 2 +- .../{web => }/service/DataSetService.java | 2 +- .../{web => }/service/DatabaseService.java | 2 +- .../{web => }/service/DictConfService.java | 2 +- .../{web => }/service/DictTaskService.java | 2 +- .../{web => }/service/DimensionService.java | 2 +- .../{web => }/service/DomainService.java | 2 +- .../{web => }/service/DownloadService.java | 2 +- .../{web => }/service/FlightService.java | 2 +- .../{web => }/service/MetricService.java | 2 +- .../{web => }/service/ModelRelaService.java | 2 +- .../{web => }/service/ModelService.java | 2 +- .../{web => }/service/QueryRuleService.java | 2 +- .../{web => }/service/RetrieveService.java | 2 +- .../{web => }/service/SchemaService.java | 2 +- .../{web => }/service/TagMetaService.java | 2 +- .../{web => }/service/TagObjectService.java | 2 +- .../{web => }/service/TagQueryService.java | 2 +- .../server/{web => }/service/TermService.java | 2 +- .../service/impl/AppServiceImpl.java | 8 +++---- .../service/impl/CanvasServiceImpl.java | 10 ++++---- .../service/impl/ClassServiceImpl.java | 4 ++-- .../service/impl/CollectServiceImpl.java | 4 ++-- .../service/impl/DataSetServiceImpl.java | 12 +++++----- .../service/impl/DatabaseServiceImpl.java | 6 ++--- .../service/impl/DictConfServiceImpl.java | 4 ++-- .../service/impl/DictTaskServiceImpl.java | 4 ++-- .../service/impl/DictWordService.java | 4 ++-- .../service/impl/DimensionServiceImpl.java | 14 +++++------ .../service/impl/DomainServiceImpl.java | 6 ++--- .../service/impl/DownloadServiceImpl.java | 8 +++---- .../service/impl/FlightServiceImpl.java | 4 ++-- .../service/impl/MetricServiceImpl.java | 14 +++++------ .../service/impl/ModelRelaServiceImpl.java | 4 ++-- .../service/impl/ModelServiceImpl.java | 14 +++++------ .../service/impl/QueryRuleServiceImpl.java | 6 ++--- .../service/impl/RetrieveServiceImpl.java | 8 +++---- .../service/impl/SchemaServiceImpl.java | 22 ++++++++--------- .../service/impl/TagMetaServiceImpl.java | 16 ++++++------- .../service/impl/TagObjectServiceImpl.java | 8 +++---- .../service/impl/TagQueryServiceImpl.java | 8 +++---- .../service/impl/TermServiceImpl.java | 4 ++-- .../server/task/DictionaryReloadTask.java | 2 +- .../server/task/FlightServerInitTask.java | 2 +- .../server/task/MetaEmbeddingTask.java | 4 ++-- .../headless/server/utils/ClassConverter.java | 4 ++-- .../headless/server/utils/DictUtils.java | 8 +++---- .../server/utils/MetricDrillDownChecker.java | 2 +- .../server/utils/ModelClusterBuilder.java | 2 +- .../server/utils/QueryStructUtils.java | 2 +- .../server/service/MetricServiceImplTest.java | 10 ++------ .../server/service/ModelServiceImplTest.java | 8 +------ .../tencent/supersonic/demo/S2BaseDemo.java | 24 +++++++++---------- .../tencent/supersonic/headless/DictTest.java | 2 +- .../supersonic/headless/ModelSchemaTest.java | 2 +- .../headless/QueryByMetricTest.java | 2 +- .../supersonic/headless/QueryRuleTest.java | 2 +- .../supersonic/headless/SchemaAuthTest.java | 6 ++--- .../supersonic/headless/TagObjectTest.java | 2 +- .../tencent/supersonic/headless/TagTest.java | 4 ++-- 90 files changed, 209 insertions(+), 221 deletions(-) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/AppController.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/CanvasController.java (94%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/ClassController.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/CollectController.java (94%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/DataSetController.java (94%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/DatabaseController.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/DimensionController.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/DomainController.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/KnowledgeController.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/MetricController.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/ModelController.java (97%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/ModelRelaController.java (91%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/QueryRuleController.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/SchemaController.java (92%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/TagController.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/TagObjectController.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/rest/TermController.java (93%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/AppService.java (92%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/CanvasService.java (90%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/ClassService.java (90%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/CollectService.java (90%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/DataSetService.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/DatabaseService.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/DictConfService.java (91%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/DictTaskService.java (93%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/DimensionService.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/DomainService.java (94%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/DownloadService.java (90%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/FlightService.java (83%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/MetricService.java (97%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/ModelRelaService.java (87%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/ModelService.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/QueryRuleService.java (91%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/RetrieveService.java (81%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/SchemaService.java (97%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/TagMetaService.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/TagObjectService.java (93%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/TagQueryService.java (84%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/TermService.java (89%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/AppServiceImpl.java (97%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/CanvasServiceImpl.java (90%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/ClassServiceImpl.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/CollectServiceImpl.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DataSetServiceImpl.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DatabaseServiceImpl.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DictConfServiceImpl.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DictTaskServiceImpl.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DictWordService.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DimensionServiceImpl.java (97%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DomainServiceImpl.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/DownloadServiceImpl.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/FlightServiceImpl.java (99%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/MetricServiceImpl.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/ModelRelaServiceImpl.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/ModelServiceImpl.java (97%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/QueryRuleServiceImpl.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/RetrieveServiceImpl.java (98%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/SchemaServiceImpl.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/TagMetaServiceImpl.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/TagObjectServiceImpl.java (96%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/TagQueryServiceImpl.java (97%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{web => }/service/impl/TermServiceImpl.java (95%) 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 1b72e04e9..65656eb37 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.web.service.AppService; +import com.tencent.supersonic.headless.server.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 480c77b82..74bb936eb 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.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.service.DimensionService; 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 a35d4e035..d847b132e 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 @@ -24,8 +24,8 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp; import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.utils.QueryStructUtils; -import com.tencent.supersonic.headless.server.web.service.ModelService; -import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.ModelService; +import com.tencent.supersonic.headless.server.service.SchemaService; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java index 25d1fbb0a..b35d62653 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/DataSetQueryApiController.java @@ -4,7 +4,7 @@ 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.web.service.DataSetService; +import com.tencent.supersonic.headless.server.service.DataSetService; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; 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/facade/rest/MetricQueryApiController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java index 7ad412774..03146c68b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/MetricQueryApiController.java @@ -6,8 +6,8 @@ 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.web.service.DownloadService; -import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.service.DownloadService; +import com.tencent.supersonic.headless.server.service.MetricService; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; 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/facade/service/impl/S2ChatLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java index 5bb953256..3f76c43c9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java @@ -28,12 +28,12 @@ import com.tencent.supersonic.headless.chat.corrector.SchemaCorrector; import com.tencent.supersonic.headless.chat.knowledge.builder.BaseWordBuilder; import com.tencent.supersonic.headless.chat.query.SemanticQuery; import com.tencent.supersonic.headless.server.facade.service.ChatLayerService; -import com.tencent.supersonic.headless.server.web.service.RetrieveService; +import com.tencent.supersonic.headless.server.service.RetrieveService; import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.utils.ChatWorkflowEngine; import com.tencent.supersonic.headless.server.utils.ComponentFactory; -import com.tencent.supersonic.headless.server.web.service.DataSetService; -import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.service.SchemaService; 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/facade/service/impl/S2SemanticLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java index a0eaa545d..8753f81ae 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java @@ -56,10 +56,10 @@ import com.tencent.supersonic.headless.server.utils.MetricDrillDownChecker; import com.tencent.supersonic.headless.server.utils.QueryReqConverter; import com.tencent.supersonic.headless.server.utils.QueryUtils; import com.tencent.supersonic.headless.server.utils.StatUtils; -import com.tencent.supersonic.headless.server.web.service.DataSetService; -import com.tencent.supersonic.headless.server.web.service.DimensionService; -import com.tencent.supersonic.headless.server.web.service.MetricService; -import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.service.DimensionService; +import com.tencent.supersonic.headless.server.service.MetricService; +import com.tencent.supersonic.headless.server.service.SchemaService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; 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 914962540..b42296567 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 @@ -30,7 +30,7 @@ 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.utils.DatabaseConverter; -import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.SchemaService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.tuple.Triple; import org.springframework.stereotype.Service; 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 cb31f5b1d..6a877165c 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.web.service.DimensionService; +import com.tencent.supersonic.headless.server.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/processor/ParseInfoProcessor.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java index ec0191dc9..493c5075c 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 @@ -16,7 +16,7 @@ import com.tencent.supersonic.headless.api.pojo.request.QueryFilter; import com.tencent.supersonic.headless.api.pojo.response.ParseResp; import com.tencent.supersonic.headless.chat.ChatQueryContext; import com.tencent.supersonic.headless.chat.query.SemanticQuery; -import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.SchemaService; 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/web/rest/AppController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/AppController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java index 4a69bfae7..340120884 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/AppController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.AppService; +import com.tencent.supersonic.headless.server.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/web/rest/CanvasController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CanvasController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java index a51ccc4b9..3b6befbf6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CanvasController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CanvasController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.CanvasService; +import com.tencent.supersonic.headless.server.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/web/rest/ClassController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ClassController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java index 7769bc62f..8b6a81345 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ClassController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ClassController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.ClassService; +import com.tencent.supersonic.headless.server.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/web/rest/CollectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CollectController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java index 82f522da6..632595168 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/CollectController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/CollectController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.CollectService; +import com.tencent.supersonic.headless.server.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/web/rest/DataSetController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java index 9ba1a6ff2..ed4de2a14 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DataSetController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.DataSetService; +import com.tencent.supersonic.headless.server.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/web/rest/DatabaseController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DatabaseController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java index d1f69df2e..5470e83d5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DatabaseController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.DatabaseService; +import com.tencent.supersonic.headless.server.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/web/rest/DimensionController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java index a5f0ffd2b..ae5793f72 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DimensionController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.rest; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -15,7 +15,7 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; import com.tencent.supersonic.headless.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.DimensionService; +import com.tencent.supersonic.headless.server.service.DimensionService; 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/web/rest/DomainController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DomainController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java index be55932b2..350c300cd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/DomainController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.DomainService; +import com.tencent.supersonic.headless.server.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/web/rest/KnowledgeController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/KnowledgeController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java index b4e4c2218..5159c730d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/KnowledgeController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/KnowledgeController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.task.MetaEmbeddingTask; -import com.tencent.supersonic.headless.server.web.service.DictConfService; -import com.tencent.supersonic.headless.server.web.service.DictTaskService; +import com.tencent.supersonic.headless.server.service.DictConfService; +import com.tencent.supersonic.headless.server.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/web/rest/MetricController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java index 58b9db2a5..65b872a5c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/MetricController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.MetricFilter; -import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.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/web/rest/ModelController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java index 827927d5b..0173e6091 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.ModelService; +import com.tencent.supersonic.headless.server.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/web/rest/ModelRelaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelRelaController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java index 54ee8cd2c..68578c894 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/ModelRelaController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelRelaController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.headless.server.web.service.ModelRelaService; +import com.tencent.supersonic.headless.server.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/web/rest/QueryRuleController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/QueryRuleController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java index a24f42f0a..c8f629c3b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/QueryRuleController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryRuleController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.QueryRuleService; +import com.tencent.supersonic.headless.server.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/web/rest/SchemaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java similarity index 92% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/SchemaController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java index 3dda2cd5d..6a9af62a9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/SchemaController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; 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.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.SchemaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java index d954c8f2f..d5f3cfdf7 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.TagMetaService; -import com.tencent.supersonic.headless.server.web.service.TagQueryService; +import com.tencent.supersonic.headless.server.service.TagMetaService; +import com.tencent.supersonic.headless.server.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/web/rest/TagObjectController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagObjectController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java index 5bac7dad4..5f1b17fd3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TagObjectController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TagObjectController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.TagObjectService; +import com.tencent.supersonic.headless.server.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/web/rest/TermController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java similarity index 93% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TermController.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java index 2549e3914..2bd80a5cd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/rest/TermController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/TermController.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.headless.server.web.rest; +package com.tencent.supersonic.headless.server.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.web.service.TermService; +import com.tencent.supersonic.headless.server.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/web/service/AppService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java similarity index 92% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/AppService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java index 27a2f1a2d..4d576a7c2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/AppService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.service; import com.github.pagehelper.PageInfo; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CanvasService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CanvasService.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CanvasService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CanvasService.java index a35d54934..12347616e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CanvasService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CanvasService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/ClassService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ClassService.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ClassService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ClassService.java index 7fc28a1ac..996549a50 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ClassService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ClassService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/CollectService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CollectService.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CollectService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CollectService.java index 6b8059295..7c6323148 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/CollectService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/CollectService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/DataSetService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java index 3d700b3a0..556f4b417 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DataSetService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DataSetService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/DatabaseService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DatabaseService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java index 8324274dc..af0fe3a9d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DatabaseService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/DictConfService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictConfService.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictConfService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictConfService.java index fd6824780..21347f87c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictConfService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictConfService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/DictTaskService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictTaskService.java similarity index 93% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictTaskService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictTaskService.java index 7a0d1c44b..f62f740c2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DictTaskService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DictTaskService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/DimensionService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java index 1dd3bb19a..c310866a5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DimensionService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/DomainService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java similarity index 94% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DomainService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java index e8f3a4c8b..a87686df9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DomainService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/DownloadService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DownloadService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java index cd54f4337..443bea0cf 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/DownloadService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/FlightService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/FlightService.java similarity index 83% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/FlightService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/FlightService.java index ecaeeb336..572f9fdbf 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/FlightService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/FlightService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/MetricService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java index eefac448b..fd5d55e67 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/MetricService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/ModelRelaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java similarity index 87% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelRelaService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java index b92658d57..6783fed08 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelRelaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelRelaService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/ModelService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java index 1dbfd1333..0a0fc8d84 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ModelService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/QueryRuleService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryRuleService.java similarity index 91% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/QueryRuleService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryRuleService.java index 3df568e47..2e9a35aef 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/QueryRuleService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryRuleService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/RetrieveService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/RetrieveService.java similarity index 81% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/RetrieveService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/RetrieveService.java index 46cfe1ddb..ce7fe0b6a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/RetrieveService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/RetrieveService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.service; import com.tencent.supersonic.headless.api.pojo.request.QueryNLReq; import com.tencent.supersonic.headless.api.pojo.response.SearchResult; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java index e70de7569..e0811c0e0 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/SchemaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/TagMetaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagMetaService.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagMetaService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagMetaService.java index 524a19fa4..55917d1b8 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagMetaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagMetaService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/TagObjectService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagObjectService.java similarity index 93% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagObjectService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagObjectService.java index f66ce50fb..1f3e65036 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagObjectService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagObjectService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/TagQueryService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagQueryService.java similarity index 84% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagQueryService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagQueryService.java index cdd0d6214..dd930cd66 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TagQueryService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TagQueryService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.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/web/service/TermService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TermService.java similarity index 89% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TermService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TermService.java index 6ec89e040..5e97c219b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/TermService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/TermService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service; +package com.tencent.supersonic.headless.server.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java index 44f6deed1..9a4611477 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/AppServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.AppService; -import com.tencent.supersonic.headless.server.web.service.DimensionService; -import com.tencent.supersonic.headless.server.web.service.MetricService; +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 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/web/service/impl/CanvasServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CanvasServiceImpl.java similarity index 90% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CanvasServiceImpl.java index 74cb372c6..554af812e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CanvasServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CanvasServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.CanvasService; -import com.tencent.supersonic.headless.server.web.service.DimensionService; -import com.tencent.supersonic.headless.server.web.service.MetricService; -import com.tencent.supersonic.headless.server.web.service.ModelService; +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.CanvasService; 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/web/service/impl/ClassServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ClassServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ClassServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ClassServiceImpl.java index 3cd79e9aa..44957760c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ClassServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ClassServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.ClassService; +import com.tencent.supersonic.headless.server.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/web/service/impl/CollectServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CollectServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java index c70dabb98..dd0b6c272 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/CollectServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CollectServiceImpl.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.CollectService; +import com.tencent.supersonic.headless.server.service.CollectService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java index 370e3c03b..370069ccb 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DataSetServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.DataSetService; -import com.tencent.supersonic.headless.server.web.service.DimensionService; -import com.tencent.supersonic.headless.server.web.service.DomainService; -import com.tencent.supersonic.headless.server.web.service.MetricService; -import com.tencent.supersonic.headless.server.web.service.TagMetaService; +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 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/web/service/impl/DatabaseServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DatabaseServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java index a2b648849..d3ce5bbe5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DatabaseServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.DatabaseService; -import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.service.DatabaseService; +import com.tencent.supersonic.headless.server.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/web/service/impl/DictConfServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictConfServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictConfServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictConfServiceImpl.java index a88f427e5..8f583508b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictConfServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictConfServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.DictConfService; +import com.tencent.supersonic.headless.server.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/web/service/impl/DictTaskServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictTaskServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java index c69a4e6a7..6d9237a55 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictTaskServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictTaskServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.DictTaskService; +import com.tencent.supersonic.headless.server.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/web/service/impl/DictWordService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictWordService.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictWordService.java index 2f4bd195d..792f6d6e1 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DictWordService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.SchemaService; 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/web/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java index e45ee74e8..bf34b1408 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -37,15 +37,15 @@ import com.tencent.supersonic.headless.server.pojo.DimensionsFilter; import com.tencent.supersonic.headless.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.pojo.TagFilter; +import com.tencent.supersonic.headless.server.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.utils.AliasGenerateHelper; import com.tencent.supersonic.headless.server.utils.DimensionConverter; import com.tencent.supersonic.headless.server.utils.NameCheckUtils; -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.service.DataSetService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DomainServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DomainServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java index c292c44c5..4bfb5d08a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DomainServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.DomainService; -import com.tencent.supersonic.headless.server.web.service.ModelService; +import com.tencent.supersonic.headless.server.service.DomainService; +import com.tencent.supersonic.headless.server.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/web/service/impl/DownloadServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java index 1e783e9b6..2d8608c5a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DownloadServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.service.impl; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -25,9 +25,9 @@ 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.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.DimensionService; -import com.tencent.supersonic.headless.server.web.service.DownloadService; -import com.tencent.supersonic.headless.server.web.service.MetricService; +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.facade.service.SemanticLayerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/FlightServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java similarity index 99% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/FlightServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java index 901a2faf6..54509e759 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/FlightServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.service.impl; import static com.google.protobuf.Any.pack; import static com.google.protobuf.ByteString.copyFrom; @@ -20,7 +20,7 @@ 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.web.service.FlightService; +import com.tencent.supersonic.headless.server.service.FlightService; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; import com.tencent.supersonic.headless.server.utils.FlightUtils; import java.nio.charset.StandardCharsets; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java index 1ad06d497..dfae76ce6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.service.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -58,16 +58,16 @@ 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.DimensionService; +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.utils.AliasGenerateHelper; import com.tencent.supersonic.headless.server.utils.MetricCheckUtils; import com.tencent.supersonic.headless.server.utils.MetricConverter; import com.tencent.supersonic.headless.server.utils.ModelClusterBuilder; -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.service.CollectService; +import com.tencent.supersonic.headless.server.service.DataSetService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelRelaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelRelaServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java index 08ece63e2..0df24e10d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelRelaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.ModelRelaService; +import com.tencent.supersonic.headless.server.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/web/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java index 2b1241761..53c19f47c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.api.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; -import com.tencent.supersonic.headless.server.web.service.DatabaseService; -import com.tencent.supersonic.headless.server.web.service.DimensionService; -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.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.DatabaseService; +import com.tencent.supersonic.headless.server.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/web/service/impl/QueryRuleServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryRuleServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/QueryRuleServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryRuleServiceImpl.java index a58635bf5..c6a633980 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/QueryRuleServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryRuleServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.DataSetService; -import com.tencent.supersonic.headless.server.web.service.QueryRuleService; +import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.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/web/service/impl/RetrieveServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java similarity index 98% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/RetrieveServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java index 334040d4f..27c6f5951 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/RetrieveServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.service.impl; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -21,9 +21,9 @@ import com.tencent.supersonic.headless.chat.knowledge.helper.NatureHelper; 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.web.service.RetrieveService; -import com.tencent.supersonic.headless.server.web.service.DataSetService; -import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.RetrieveService; +import com.tencent.supersonic.headless.server.service.DataSetService; +import com.tencent.supersonic.headless.server.service.SchemaService; 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/web/service/impl/SchemaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java index 40f7dd88f..5bd73e1aa 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/SchemaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.service.impl; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -41,20 +41,20 @@ import com.tencent.supersonic.headless.server.pojo.TagFilter; 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.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.SchemaService; +import com.tencent.supersonic.headless.server.service.TagMetaService; +import com.tencent.supersonic.headless.server.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; import com.tencent.supersonic.headless.server.utils.StatUtils; -import com.tencent.supersonic.headless.server.web.service.DataSetService; -import com.tencent.supersonic.headless.server.web.service.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.SchemaService; -import com.tencent.supersonic.headless.server.web.service.TagMetaService; -import com.tencent.supersonic.headless.server.web.service.TermService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagMetaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagMetaServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java index f25e28bc3..a2e7b5c0f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagMetaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.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 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.service.CollectService; 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/web/service/impl/TagObjectServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagObjectServiceImpl.java similarity index 96% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagObjectServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagObjectServiceImpl.java index 736104460..787bcf187 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagObjectServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagObjectServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.service.impl; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -12,9 +12,9 @@ import com.tencent.supersonic.headless.api.pojo.response.TagResp; 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.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.service.ModelService; +import com.tencent.supersonic.headless.server.service.TagMetaService; +import com.tencent.supersonic.headless.server.service.TagObjectService; import com.tencent.supersonic.headless.server.utils.TagObjectConverter; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java similarity index 97% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java index 671fc1703..98ba8cda4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TagQueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagQueryServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.ModelService; +import com.tencent.supersonic.headless.server.service.ModelService; +import com.tencent.supersonic.headless.server.service.TagMetaService; +import com.tencent.supersonic.headless.server.service.TagQueryService; import com.tencent.supersonic.headless.server.facade.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/web/service/impl/TermServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TermServiceImpl.java similarity index 95% rename from headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TermServiceImpl.java rename to headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TermServiceImpl.java index 224ff65b9..8076bb382 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/TermServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TermServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.server.web.service.impl; +package com.tencent.supersonic.headless.server.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.web.service.TermService; +import com.tencent.supersonic.headless.server.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/task/DictionaryReloadTask.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/DictionaryReloadTask.java index 1df9b2694..6eb564792 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/DictionaryReloadTask.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/DictionaryReloadTask.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.server.task; -import com.tencent.supersonic.headless.server.web.service.impl.DictWordService; +import com.tencent.supersonic.headless.server.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/task/FlightServerInitTask.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/FlightServerInitTask.java index a08a48650..33cabf3b2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/FlightServerInitTask.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/FlightServerInitTask.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.server.task; -import com.tencent.supersonic.headless.server.web.service.FlightService; +import com.tencent.supersonic.headless.server.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/task/MetaEmbeddingTask.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/MetaEmbeddingTask.java index db41671ec..5f063612a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/MetaEmbeddingTask.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/MetaEmbeddingTask.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.task; 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.web.service.DimensionService; -import com.tencent.supersonic.headless.server.web.service.MetricService; +import com.tencent.supersonic.headless.server.service.DimensionService; +import com.tencent.supersonic.headless.server.service.MetricService; import dev.langchain4j.inmemory.spring.InMemoryEmbeddingStoreFactory; import dev.langchain4j.store.embedding.EmbeddingStoreFactory; import dev.langchain4j.store.embedding.EmbeddingStoreFactoryProvider; 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 78a06aeeb..bcaff7a15 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.web.service.DomainService; -import com.tencent.supersonic.headless.server.web.service.TagObjectService; +import com.tencent.supersonic.headless.server.service.DomainService; +import com.tencent.supersonic.headless.server.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 d83c32407..98e3d30a6 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 @@ -30,10 +30,10 @@ import com.tencent.supersonic.headless.api.pojo.response.TagResp; import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService; import com.tencent.supersonic.headless.server.persistence.dataobject.DictConfDO; import com.tencent.supersonic.headless.server.persistence.dataobject.DictTaskDO; -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.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.TagMetaService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricDrillDownChecker.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricDrillDownChecker.java index e3b122189..b5a4b4fe8 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricDrillDownChecker.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/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.web.service.MetricService; +import com.tencent.supersonic.headless.server.service.MetricService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; 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 395bfcc43..161d34889 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.web.service.SchemaService; +import com.tencent.supersonic.headless.server.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 893d561fb..08e6035a7 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.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.SchemaService; +import com.tencent.supersonic.headless.server.service.SchemaService; 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/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 05ccaf2fa..a684cc996 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 @@ -21,14 +21,8 @@ import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO; import com.tencent.supersonic.headless.server.persistence.repository.MetricRepository; import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper; import com.tencent.supersonic.headless.server.utils.MetricConverter; -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.service.impl.DataSetServiceImpl; +import com.tencent.supersonic.headless.server.service.impl.MetricServiceImpl; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; 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 e28f64fd3..b9e76b9bd 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,13 +17,7 @@ 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.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.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 6423b495c..0eec6415d 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 @@ -20,18 +20,18 @@ import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.api.pojo.MetaFilter; -import com.tencent.supersonic.headless.server.web.service.CanvasService; -import com.tencent.supersonic.headless.server.web.service.DataSetService; -import com.tencent.supersonic.headless.server.web.service.DatabaseService; -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 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 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/DictTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/DictTest.java index 77ccd68f0..9eeaf0ba8 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.web.service.DictTaskService; +import com.tencent.supersonic.headless.server.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/ModelSchemaTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/headless/ModelSchemaTest.java index b45e35cca..f688c7909 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.web.service.ModelService; +import com.tencent.supersonic.headless.server.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 696b901a1..d44d271cd 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.web.service.MetricService; +import com.tencent.supersonic.headless.server.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 5b9e79efe..4e34f873d 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.web.service.QueryRuleService; +import com.tencent.supersonic.headless.server.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 06ab40c35..eadb4731f 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.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.headless.server.service.DomainService; +import com.tencent.supersonic.headless.server.service.ModelService; +import com.tencent.supersonic.headless.server.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 20892fc3a..8d091a679 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.web.service.TagObjectService; +import com.tencent.supersonic.headless.server.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 1e4e42a43..85f52f9e7 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.web.service.TagMetaService; -import com.tencent.supersonic.headless.server.web.service.TagQueryService; +import com.tencent.supersonic.headless.server.service.TagMetaService; +import com.tencent.supersonic.headless.server.service.TagQueryService; import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer;