From af6c8cdbdadf1768183d0cf8b51d7c8b4d37537f Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Thu, 28 Dec 2023 22:14:57 +0800 Subject: [PATCH] (feature)(headless) Add a new headless-api module and Change old headless-api module to headless-common (#582) * (improvement)(headless) Add headless-api module * (improvement)(headless) Change old headless-api module to headless-common --------- Co-authored-by: jolunoluo --- chat/api/pom.xml | 2 +- .../api/component/SemanticInterpreter.java | 28 +-- .../chat/api/pojo/response/QueryResp.java | 2 + chat/core/pom.xml | 2 +- .../chat/config/EntityInternalDetail.java | 4 +- .../parser/sql/llm/LLMRequestService.java | 4 +- .../chat/query/BaseSemanticQuery.java | 10 +- .../llm/analytics/MetricAnalyzeQuery.java | 4 +- .../chat/query/llm/s2sql/LLMSqlQuery.java | 4 +- .../chat/query/rule/RuleSemanticQuery.java | 6 +- .../query/rule/metric/MetricFilterQuery.java | 4 +- .../rule/metric/MetricSemanticQuery.java | 2 +- .../query/rule/metric/MetricTagQuery.java | 4 +- .../chat/rest/ChatConfigController.java | 12 +- .../chat/service/SemanticService.java | 4 +- .../chat/service/impl/ConfigServiceImpl.java | 6 +- .../chat/service/impl/PluginServiceImpl.java | 2 +- .../chat/service/impl/QueryServiceImpl.java | 4 +- .../supersonic/chat/utils/DictMetaHelper.java | 4 +- .../chat/utils/DictQueryHelper.java | 4 +- .../chat/utils/QueryReqBuilder.java | 6 +- .../test/context/MockBeansConfiguration.java | 10 +- .../chat/utils/QueryReqBuilderTest.java | 4 +- .../semantic/BaseSemanticInterpreter.java | 2 +- .../semantic/LocalSemanticInterpreter.java | 30 +-- .../semantic/ModelSchemaBuilder.java | 12 +- .../semantic/RemoteSemanticInterpreter.java | 30 +-- headless/api/pom.xml | 67 ++----- .../api/annotation/ApiHeaderCheck.java} | 4 +- .../api/aspect/ApiHeaderCheckAspect.java} | 13 +- .../enums/UpdateCycleEnum.java | 8 - .../api/model/enums/MetricTypeEnum.java | 9 - .../headless/api/model/pojo/AppConfig.java | 13 -- .../api/persistence}/dataobject/AppDO.java | 4 +- .../api/persistence}/mapper/AppMapper.java | 4 +- .../api/query/pojo/ApiQuerySingleResult.java | 15 -- .../headless/api/rest/ApiQueryController.java | 43 +++++ .../headless/api}/rest/AppController.java | 12 +- .../headless/api/service/ApiQueryService.java | 47 +++++ .../headless/api/service}/AppService.java | 10 +- .../api/service/impl/ApiQueryServiceImpl.java | 177 ++++++++++++++++++ .../api/service/impl}/AppServiceImpl.java | 24 +-- headless/common/pom.xml | 69 +++++++ .../enums/ElementFrequencyEnum.java | 2 +- .../enums/ElementTypeEnum.java | 2 +- .../enums/UpdateCycleEnum.java | 8 + .../pojo/MaterializationConfFilter.java | 2 +- .../pojo/MaterializationDateFilter.java | 2 +- .../pojo/MaterializationFilter.java | 6 +- .../pojo/MaterializationRecordFilter.java | 2 +- .../request/MaterializationElementReq.java | 6 +- .../request/MaterializationRecordReq.java | 2 +- .../request/MaterializationReq.java | 6 +- .../request/MaterializationSourceReq.java | 2 +- .../response/MaterializationDateResp.java | 2 +- .../MaterializationElementModelResp.java | 4 +- .../response/MaterializationElementResp.java | 6 +- .../response/MaterializationRecordResp.java | 2 +- .../response/MaterializationResp.java | 6 +- .../response/MaterializationSourceResp.java | 8 +- .../common}/model/enums/AppStatusEnum.java | 2 +- .../common}/model/enums/DataTypeEnum.java | 2 +- .../model/enums/DimensionTypeEnum.java | 2 +- .../common}/model/enums/IdentifyTypeEnum.java | 2 +- .../common/model/enums/MetricTypeEnum.java | 9 + .../model/enums/ModelSourceTypeEnum.java | 2 +- .../common}/model/enums/OperatorEnum.java | 2 +- .../common}/model/enums/QueryOptMode.java | 2 +- .../model/enums/QueryTypeBackEnum.java | 2 +- .../common}/model/enums/QueryTypeEnum.java | 2 +- .../common}/model/enums/SemanticTypeEnum.java | 2 +- .../headless/common/model/pojo/AppConfig.java | 24 +++ .../common}/model/pojo/DatasourceType.java | 2 +- .../headless/common}/model/pojo/Dim.java | 6 +- .../common}/model/pojo/DimValueMap.java | 2 +- .../model/pojo/DimensionTimeTypeParams.java | 2 +- .../model/pojo/DrillDownDimension.java | 2 +- .../headless/common}/model/pojo/Entity.java | 2 +- .../headless/common}/model/pojo/Identify.java | 7 +- .../headless/common}/model/pojo/Item.java | 2 +- .../common}/model/pojo/ItemDateFilter.java | 2 +- .../headless/common}/model/pojo/Measure.java | 11 +- .../model/pojo/MetricQueryDefaultConfig.java | 2 +- .../common}/model/pojo/MetricTypeParams.java | 2 +- .../common}/model/pojo/ModelDetail.java | 4 +- .../common}/model/pojo/QueryResult.java | 2 +- .../common}/model/pojo/QueryStat.java | 2 +- .../common}/model/pojo/RelateDimension.java | 2 +- .../common}/model/pojo/SchemaItem.java | 2 +- .../common}/model/request/AppQueryReq.java | 4 +- .../common}/model/request/AppReq.java | 4 +- .../common}/model/request/DatabaseReq.java | 4 +- .../common}/model/request/DateInfoReq.java | 2 +- .../common}/model/request/DimensionReq.java | 6 +- .../common}/model/request/DomainReq.java | 4 +- .../model/request/DomainUpdateReq.java | 2 +- .../common}/model/request/MetaBatchReq.java | 2 +- .../common}/model/request/MetricBaseReq.java | 6 +- .../common}/model/request/MetricReq.java | 8 +- .../common}/model/request/ModelReq.java | 10 +- .../model/request/ModelSchemaFilterReq.java | 2 +- .../model/request/PageDimensionReq.java | 2 +- .../common}/model/request/PageMetricReq.java | 2 +- .../model/request/PageSchemaItemReq.java | 2 +- .../common}/model/request/SqlExecuteReq.java | 2 +- .../common}/model/request/ViewInfoReq.java | 2 +- .../common}/model/response/AppDetailResp.java | 2 +- .../common}/model/response/AppResp.java | 8 +- .../common}/model/response/DatabaseResp.java | 2 +- .../common}/model/response/DimSchemaResp.java | 2 +- .../common}/model/response/DimensionResp.java | 6 +- .../common}/model/response/DomainResp.java | 6 +- .../common}/model/response/ExplainResp.java | 2 +- .../common}/model/response/MeasureResp.java | 2 +- .../common}/model/response/MetricResp.java | 12 +- .../model/response/MetricSchemaResp.java | 2 +- .../common}/model/response/ModelResp.java | 12 +- .../model/response/ModelSchemaRelaResp.java | 2 +- .../model/response/ModelSchemaResp.java | 4 +- .../response/QueryResultWithSchemaResp.java | 6 +- .../common}/model/response/SqlParserResp.java | 2 +- .../common}/model/yaml/DataModelYamlTpl.java | 4 +- .../yaml/DimensionTimeTypeParamsTpl.java | 2 +- .../common}/model/yaml/DimensionYamlTpl.java | 2 +- .../common}/model/yaml/IdentifyYamlTpl.java | 2 +- .../common}/model/yaml/MeasureYamlTpl.java | 2 +- .../model/yaml/MetricTypeParamsYamlTpl.java | 2 +- .../common}/model/yaml/MetricYamlTpl.java | 2 +- .../common}/query/enums/AggOption.java | 2 +- .../query/pojo/ApiQuerySingleResult.java | 15 ++ .../headless/common}/query/pojo/Cache.java | 2 +- .../common}/query/pojo/DataDownload.java | 2 +- .../common}/query/pojo/Materialization.java | 2 +- .../common}/query/pojo/MetricTable.java | 4 +- .../headless/common}/query/pojo/Param.java | 2 +- .../query/request/BatchDownloadReq.java | 2 +- .../query/request/DownloadStructReq.java | 2 +- .../common}/query/request/ExplainSqlReq.java | 4 +- .../common}/query/request/ItemUseReq.java | 2 +- .../common/query/request/MetaQueryApiReq.java | 17 ++ .../common}/query/request/MetricReq.java | 2 +- .../common}/query/request/ParseSqlReq.java | 4 +- .../query/request/QueryApiPreviewReq.java | 4 +- .../common}/query/request/QueryApiReq.java | 5 +- .../query/request/QueryDimValueReq.java | 2 +- .../query/request/QueryMultiStructReq.java | 2 +- .../common}/query/request/QueryS2SQLReq.java | 2 +- .../common}/query/request/QueryStructReq.java | 6 +- .../query/response/ApiQueryResultResp.java | 4 +- .../common}/query/response/ItemUseResp.java | 2 +- headless/materialization/pom.xml | 2 +- .../MaterializationConfServiceImpl.java | 36 ++-- .../MaterializationRecordServiceImpl.java | 10 +- .../domain/MaterializationConfService.java | 16 +- .../domain/MaterializationRecordService.java | 10 +- .../domain/pojo/Materialization.java | 4 +- .../domain/pojo/MaterializationElement.java | 4 +- .../MaterializationElementRepository.java | 4 +- .../MaterializationRecordRepository.java | 4 +- .../repository/MaterializationRepository.java | 4 +- .../utils/MaterializationConverter.java | 16 +- .../utils/MaterializationPartitionHelper.java | 6 +- .../utils/MaterializationRecordConverter.java | 4 +- .../domain/utils/MaterializationUtils.java | 2 +- .../utils/MaterializationZipperUtils.java | 10 +- .../mapper/MaterializationDOCustomMapper.java | 2 +- .../MaterializationElementRepositoryImpl.java | 4 +- .../MaterializationRecordRepositoryImpl.java | 4 +- .../MaterializationRepositoryImpl.java | 4 +- .../rest/MaterializationConfController.java | 12 +- .../rest/MaterializationRecordController.java | 10 +- .../mapper/MaterializationDOCustomMapper.xml | 2 +- headless/model/pom.xml | 2 +- .../model/application/CatalogImpl.java | 16 +- .../application/DatabaseServiceImpl.java | 8 +- .../application/DimensionServiceImpl.java | 18 +- .../model/application/DomainServiceImpl.java | 8 +- .../model/application/MetricServiceImpl.java | 20 +- .../model/application/ModelServiceImpl.java | 56 +++--- .../application/ViewInfoServiceImpl.java | 10 +- .../headless/model/domain/Catalog.java | 16 +- .../model/domain/DatabaseService.java | 6 +- .../model/domain/DimensionService.java | 10 +- .../headless/model/domain/DomainService.java | 6 +- .../headless/model/domain/MetricService.java | 12 +- .../headless/model/domain/ModelService.java | 22 +-- .../domain/manager/DatasourceYamlManager.java | 22 +-- .../domain/manager/DimensionYamlManager.java | 2 +- .../domain/manager/MetricYamlManager.java | 2 +- .../model/domain/pojo/Datasource.java | 4 +- .../headless/model/domain/pojo/Dimension.java | 4 +- .../headless/model/domain/pojo/Domain.java | 6 +- .../model/domain/pojo/JdbcDataSource.java | 4 +- .../headless/model/domain/pojo/Metric.java | 6 +- .../headless/model/domain/pojo/Model.java | 6 +- .../domain/repository/DateInfoRepository.java | 4 +- .../model/domain/utils/DatabaseConverter.java | 4 +- .../domain/utils/DimensionConverter.java | 10 +- .../model/domain/utils/DomainConvert.java | 8 +- .../domain/utils/JdbcDataSourceUtils.java | 4 +- .../model/domain/utils/MetricConverter.java | 18 +- .../model/domain/utils/ModelConverter.java | 59 +++--- .../headless/model/domain/utils/SqlUtils.java | 6 +- .../domain/utils/SysTimeDimensionBuilder.java | 6 +- .../infrastructure/mapper/DateInfoMapper.java | 4 +- .../repository/DateInfoRepositoryImpl.java | 13 +- .../model/rest/DatabaseController.java | 8 +- .../model/rest/DimensionController.java | 10 +- .../headless/model/rest/DomainController.java | 6 +- .../headless/model/rest/MetricController.java | 12 +- .../headless/model/rest/ModelController.java | 8 +- .../model/rest/ViewInfoController.java | 4 +- .../application/ModelServiceImplTest.java | 18 +- headless/pom.xml | 3 +- headless/query/pom.xml | 2 +- .../query/aspect/S2SQLDataAspect.java | 8 +- .../query/aspect/StructDataAspect.java | 8 +- .../headless/query/executor/JdbcExecutor.java | 4 +- .../query/executor/QueryExecutor.java | 2 +- .../headless/query/optimizer/DetailQuery.java | 2 +- .../query/optimizer/QueryOptimizer.java | 2 +- .../headless/query/parser/QueryParser.java | 10 +- .../headless/query/parser/SqlParser.java | 2 +- .../parser/calcite/CalciteSqlParser.java | 4 +- .../parser/calcite/HeadlessSchemaManager.java | 14 +- .../parser/calcite/planner/AggPlanner.java | 4 +- .../planner/MaterializationPlanner.java | 4 +- .../query/parser/calcite/planner/Planner.java | 2 +- .../query/parser/calcite/sql/Renderer.java | 2 +- .../calcite/sql/node/DataSourceNode.java | 2 +- .../calcite/sql/render/FilterRender.java | 2 +- .../parser/calcite/sql/render/JoinRender.java | 2 +- .../calcite/sql/render/OutputRender.java | 2 +- .../calcite/sql/render/SourceRender.java | 2 +- .../parser/convert/CalculateAggConverter.java | 10 +- .../convert/DefaultDimValueConverter.java | 4 +- .../parser/convert/MetricCheckConverter.java | 6 +- .../convert/ParserDefaultConverter.java | 6 +- .../parser/convert/QueryReqConverter.java | 18 +- .../parser/convert/ZipperModelConverter.java | 10 +- .../query/persistence/mapper/StatMapper.java | 4 +- .../persistence/pojo/QueryStatement.java | 6 +- .../repository/StatRepository.java | 6 +- .../repository/StatRepositoryImpl.java | 6 +- .../query/rest/ApiQueryController.java | 34 ---- .../headless/query/rest/QueryController.java | 28 +-- .../headless/query/rest/SchemaController.java | 16 +- .../query/service/ApiQueryService.java | 16 -- .../query/service/ApiQueryServiceImpl.java | 135 ------------- .../query/service/AuthCommonService.java | 8 +- .../query/service/DownloadService.java | 4 +- .../query/service/DownloadServiceImpl.java | 22 +-- .../query/service/HeadlessQueryEngine.java | 8 +- .../service/HeadlessQueryEngineImpl.java | 8 +- .../headless/query/service/QueryService.java | 20 +- .../query/service/QueryServiceImpl.java | 34 ++-- .../headless/query/service/SchemaService.java | 16 +- .../query/service/SchemaServiceImpl.java | 24 +-- .../headless/query/utils/DimValueAspect.java | 10 +- .../query/utils/QueryStructUtils.java | 22 +-- .../headless/query/utils/QueryUtils.java | 10 +- .../query/utils/SqlGenerateUtils.java | 2 +- .../headless/query/utils/StatUtils.java | 20 +- .../src/main/resources/mapper/StatMapper.xml | 4 +- .../calcite/HeadlessParserServiceTest.java | 20 +- .../calcite/MaterializationQueryTest.java | 2 +- .../service/DownloadServiceImplTest.java | 14 +- .../supersonic/BenchMarkDemoDataLoader.java | 18 +- .../supersonic/ModelDemoDataLoader.java | 30 +-- .../model/MetricServiceImplTest.java | 4 +- 270 files changed, 1310 insertions(+), 1155 deletions(-) rename headless/{query/src/main/java/com/tencent/supersonic/headless/query/annotation/ApiDataPermission.java => api/src/main/java/com/tencent/supersonic/headless/api/annotation/ApiHeaderCheck.java} (72%) rename headless/{query/src/main/java/com/tencent/supersonic/headless/query/aspect/ApiDataAspect.java => api/src/main/java/com/tencent/supersonic/headless/api/aspect/ApiHeaderCheckAspect.java} (86%) delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/UpdateCycleEnum.java delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/MetricTypeEnum.java delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/AppConfig.java rename headless/{model/src/main/java/com/tencent/supersonic/headless/model/domain => api/src/main/java/com/tencent/supersonic/headless/api/persistence}/dataobject/AppDO.java (87%) rename headless/{model/src/main/java/com/tencent/supersonic/headless/model/infrastructure => api/src/main/java/com/tencent/supersonic/headless/api/persistence}/mapper/AppMapper.java (54%) delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/ApiQuerySingleResult.java create mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/rest/ApiQueryController.java rename headless/{model/src/main/java/com/tencent/supersonic/headless/model => api/src/main/java/com/tencent/supersonic/headless/api}/rest/AppController.java (88%) create mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/service/ApiQueryService.java rename headless/{model/src/main/java/com/tencent/supersonic/headless/model/domain => api/src/main/java/com/tencent/supersonic/headless/api/service}/AppService.java (60%) create mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/service/impl/ApiQueryServiceImpl.java rename headless/{model/src/main/java/com/tencent/supersonic/headless/model/application => api/src/main/java/com/tencent/supersonic/headless/api/service/impl}/AppServiceImpl.java (91%) create mode 100644 headless/common/pom.xml rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/enums/ElementFrequencyEnum.java (50%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/enums/ElementTypeEnum.java (58%) create mode 100644 headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/UpdateCycleEnum.java rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/pojo/MaterializationConfFilter.java (84%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/pojo/MaterializationDateFilter.java (77%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/pojo/MaterializationFilter.java (68%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/pojo/MaterializationRecordFilter.java (90%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/request/MaterializationElementReq.java (71%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/request/MaterializationRecordReq.java (89%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/request/MaterializationReq.java (72%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/request/MaterializationSourceReq.java (71%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/response/MaterializationDateResp.java (86%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/response/MaterializationElementModelResp.java (73%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/response/MaterializationElementResp.java (67%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/response/MaterializationRecordResp.java (89%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/response/MaterializationResp.java (72%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/materialization/response/MaterializationSourceResp.java (71%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/AppStatusEnum.java (90%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/DataTypeEnum.java (98%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/DimensionTypeEnum.java (52%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/IdentifyTypeEnum.java (50%) create mode 100644 headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/MetricTypeEnum.java rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/ModelSourceTypeEnum.java (93%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/OperatorEnum.java (86%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/QueryOptMode.java (50%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/QueryTypeBackEnum.java (91%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/QueryTypeEnum.java (89%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/enums/SemanticTypeEnum.java (56%) create mode 100644 headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/AppConfig.java rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/DatasourceType.java (87%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/Dim.java (93%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/DimValueMap.java (86%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/DimensionTimeTypeParams.java (81%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/DrillDownDimension.java (84%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/Entity.java (86%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/Identify.java (79%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/Item.java (88%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/ItemDateFilter.java (81%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/Measure.java (82%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/MetricQueryDefaultConfig.java (82%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/MetricTypeParams.java (78%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/ModelDetail.java (88%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/QueryResult.java (85%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/QueryStat.java (98%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/RelateDimension.java (85%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/pojo/SchemaItem.java (96%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/AppQueryReq.java (82%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/AppReq.java (81%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/DatabaseReq.java (90%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/DateInfoReq.java (94%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/DimensionReq.java (74%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/DomainReq.java (85%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/DomainUpdateReq.java (62%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/MetaBatchReq.java (69%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/MetricBaseReq.java (77%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/MetricReq.java (71%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/ModelReq.java (79%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/ModelSchemaFilterReq.java (75%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/PageDimensionReq.java (65%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/PageMetricReq.java (64%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/PageSchemaItemReq.java (89%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/SqlExecuteReq.java (91%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/request/ViewInfoReq.java (83%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/AppDetailResp.java (62%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/AppResp.java (76%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/DatabaseResp.java (95%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/DimSchemaResp.java (78%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/DimensionResp.java (76%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/DomainResp.java (84%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/ExplainResp.java (83%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/MeasureResp.java (86%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/MetricResp.java (84%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/MetricSchemaResp.java (72%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/ModelResp.java (78%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/ModelSchemaRelaResp.java (78%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/ModelSchemaResp.java (86%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/QueryResultWithSchemaResp.java (82%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/response/SqlParserResp.java (89%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/yaml/DataModelYamlTpl.java (74%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/yaml/DimensionTimeTypeParamsTpl.java (70%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/yaml/DimensionYamlTpl.java (84%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/yaml/IdentifyYamlTpl.java (82%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/yaml/MeasureYamlTpl.java (85%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/yaml/MetricTypeParamsYamlTpl.java (73%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/model/yaml/MetricYamlTpl.java (78%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/enums/AggOption.java (84%) create mode 100644 headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/ApiQuerySingleResult.java rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/pojo/Cache.java (84%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/pojo/DataDownload.java (75%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/pojo/Materialization.java (82%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/pojo/MetricTable.java (66%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/pojo/Param.java (92%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/BatchDownloadReq.java (79%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/DownloadStructReq.java (78%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/ExplainSqlReq.java (69%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/ItemUseReq.java (90%) create mode 100644 headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/MetaQueryApiReq.java rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/MetricReq.java (87%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/ParseSqlReq.java (79%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/QueryApiPreviewReq.java (60%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/QueryApiReq.java (63%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/QueryDimValueReq.java (81%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/QueryMultiStructReq.java (88%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/QueryS2SQLReq.java (89%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/request/QueryStructReq.java (98%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/response/ApiQueryResultResp.java (54%) rename headless/{api/src/main/java/com/tencent/supersonic/headless/api => common/src/main/java/com/tencent/supersonic/headless/common}/query/response/ItemUseResp.java (88%) delete mode 100644 headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/ApiQueryController.java delete mode 100644 headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryService.java delete mode 100644 headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryServiceImpl.java diff --git a/chat/api/pom.xml b/chat/api/pom.xml index 90a96f0bb..99e66fef1 100644 --- a/chat/api/pom.xml +++ b/chat/api/pom.xml @@ -23,7 +23,7 @@ com.tencent.supersonic - headless-api + headless-common ${project.version} compile diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java index f48cc3024..e5a3c956a 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java @@ -4,20 +4,20 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.chat.api.pojo.ModelSchema; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.ExplainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.ExplainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.util.List; diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java index fa75042cb..2d88aaffd 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java @@ -17,4 +17,6 @@ public class QueryResp { private QueryResult queryResult; private List parseInfos; private List similarQueries; + + } \ No newline at end of file diff --git a/chat/core/pom.xml b/chat/core/pom.xml index dd50ad2b0..3e746a058 100644 --- a/chat/core/pom.xml +++ b/chat/core/pom.xml @@ -77,7 +77,7 @@ com.tencent.supersonic - headless-api + headless-common ${project.version} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java b/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java index f657d69c0..e181374a2 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.chat.config; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; import java.util.List; import lombok.Data; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java index 8fe74b4bb..7521ce98b 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java @@ -23,8 +23,8 @@ import com.tencent.supersonic.common.pojo.enums.DataFormatTypeEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateUtils; import com.tencent.supersonic.knowledge.service.SchemaService; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; import java.util.ArrayList; import java.util.Comparator; import java.util.HashSet; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java index 4289de603..cd61070aa 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java @@ -15,11 +15,11 @@ import com.tencent.supersonic.common.pojo.Order; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.knowledge.service.SchemaService; -import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.headless.api.model.response.ExplainResp; -import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.common.model.response.ExplainResp; +import com.tencent.supersonic.headless.common.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java index 14a42d09d..c584d83d0 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java @@ -18,8 +18,8 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java index 9fbd5384a..ece102ee0 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java @@ -10,8 +10,8 @@ import com.tencent.supersonic.chat.query.llm.LLMSemanticQuery; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.chat.utils.QueryReqBuilder; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java index 71bc11652..67839be5c 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java @@ -23,9 +23,9 @@ import com.tencent.supersonic.common.pojo.ModelCluster; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricFilterQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricFilterQuery.java index 00ad5da24..b79c98d86 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricFilterQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricFilterQuery.java @@ -9,8 +9,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.common.pojo.enums.FilterType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.Filter; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java index 53dc5eda4..4c262c0e0 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java @@ -18,7 +18,7 @@ import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.chat.service.SemanticService; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import java.time.LocalDate; import java.util.List; import java.util.Objects; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java index 9b27eaa56..e55a6cf1d 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java @@ -10,8 +10,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterType; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java index 8492050a1..73e49f86c 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java @@ -12,12 +12,12 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp; import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java index 977d1c642..2f5630933 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java @@ -41,8 +41,8 @@ import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.RatioOverType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateUtils; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.knowledge.service.SchemaService; import java.text.DecimalFormat; import java.time.DayOfWeek; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java index a3bae8e64..6e239e7d7 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java @@ -31,9 +31,9 @@ import com.tencent.supersonic.chat.utils.ChatConfigHelper; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.chat.utils.VisibilityEvent; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.MetricService; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java index 4ffd0cb85..6dbcaaf00 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java @@ -16,7 +16,7 @@ import com.tencent.supersonic.chat.service.PluginService; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java index 41914add3..3aea43859 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java @@ -59,8 +59,8 @@ import com.tencent.supersonic.knowledge.dictionary.MultiCustomDictionary; import com.tencent.supersonic.knowledge.service.SearchService; import com.tencent.supersonic.knowledge.utils.HanlpHelper; import com.tencent.supersonic.knowledge.utils.NatureHelper; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java index d33773214..3718744e4 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java @@ -14,8 +14,8 @@ import com.tencent.supersonic.chat.persistence.dataobject.DimValueDO; import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.knowledge.dictionary.DictUpdateMode; import com.tencent.supersonic.knowledge.dictionary.DimValue2DictCommand; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java index ea7af203a..0e6110893 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java @@ -18,8 +18,8 @@ import com.tencent.supersonic.common.pojo.Order; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java index dae4e6d0d..556eb48b3 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java @@ -13,9 +13,9 @@ import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java index ecc263b7b..d77780e47 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java @@ -15,11 +15,11 @@ import com.tencent.supersonic.chat.service.ChatService; import com.tencent.supersonic.chat.service.QueryService; import com.tencent.supersonic.chat.service.impl.ConfigServiceImpl; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.MetricService; import com.tencent.supersonic.headless.model.domain.ModelService; diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java b/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java index 33bad357b..ffd630301 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java @@ -10,8 +10,8 @@ import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; import com.tencent.supersonic.common.util.SqlFilterUtils; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java index aa8a05b13..cb7c4a7c7 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java @@ -4,7 +4,7 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.tencent.supersonic.chat.api.component.SemanticInterpreter; import com.tencent.supersonic.chat.api.pojo.ModelSchema; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java index 9ac0ae9e7..b392d6d48 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java @@ -5,21 +5,21 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.ExplainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.ExplainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.MetricService; import com.tencent.supersonic.headless.query.service.QueryService; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java index 5316dbfc3..7584b7344 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java @@ -6,12 +6,12 @@ import com.tencent.supersonic.chat.api.pojo.RelatedSchemaElement; import com.tencent.supersonic.chat.api.pojo.SchemaElement; import com.tencent.supersonic.chat.api.pojo.SchemaElementType; import com.tencent.supersonic.chat.api.pojo.SchemaValueMap; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java index ec6336264..b2e53050d 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java @@ -19,21 +19,21 @@ import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.S2ThreadContext; import com.tencent.supersonic.common.util.ThreadContext; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.ExplainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.ExplainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.net.URI; import java.net.URL; import java.util.HashMap; diff --git a/headless/api/pom.xml b/headless/api/pom.xml index 386ec4067..f464881a5 100644 --- a/headless/api/pom.xml +++ b/headless/api/pom.xml @@ -1,69 +1,28 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 com.tencent.supersonic headless - ${revision} + 0.8.2-SNAPSHOT - 4.0.0 headless-api + + 8 + 8 + UTF-8 + + - - - - - - - com.clickhouse - clickhouse-jdbc - ${clickhouse.jdbc.version} - - all - - com.tencent.supersonic - common - ${project.version} - - - - org.projectlombok - lombok - ${lombok.version} - - - jakarta.validation - jakarta.validation-api - - - org.springframework - spring-core - ${spring.version} - - - com.alibaba - fastjson - ${fastjson.version} - compile - - - commons-codec - commons-codec - - - org.springframework.boot - spring-boot-starter-web - ${spring.version} - - - com.tencent.supersonic - auth-api + headless-query ${project.version} - + + \ No newline at end of file diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/annotation/ApiDataPermission.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/annotation/ApiHeaderCheck.java similarity index 72% rename from headless/query/src/main/java/com/tencent/supersonic/headless/query/annotation/ApiDataPermission.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/annotation/ApiHeaderCheck.java index 23a2b04b2..dfa7d36c2 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/annotation/ApiDataPermission.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/annotation/ApiHeaderCheck.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.query.annotation; +package com.tencent.supersonic.headless.api.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,6 +7,6 @@ import java.lang.annotation.Target; @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) -public @interface ApiDataPermission { +public @interface ApiHeaderCheck { } diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/ApiDataAspect.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/aspect/ApiHeaderCheckAspect.java similarity index 86% rename from headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/ApiDataAspect.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/aspect/ApiHeaderCheckAspect.java index 98f444be6..df6993bb5 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/ApiDataAspect.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/aspect/ApiHeaderCheckAspect.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.query.aspect; +package com.tencent.supersonic.headless.api.aspect; import com.tencent.supersonic.common.pojo.Pair; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.SignatureUtils; -import com.tencent.supersonic.headless.api.model.enums.AppStatusEnum; -import com.tencent.supersonic.headless.api.model.response.AppDetailResp; -import com.tencent.supersonic.headless.model.domain.AppService; +import com.tencent.supersonic.headless.api.service.AppService; +import com.tencent.supersonic.headless.common.model.enums.AppStatusEnum; +import com.tencent.supersonic.headless.common.model.response.AppDetailResp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -15,13 +15,14 @@ import org.aspectj.lang.annotation.Pointcut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; + import javax.servlet.http.HttpServletRequest; @Component @Aspect @Order(1) @Slf4j -public class ApiDataAspect { +public class ApiHeaderCheckAspect { public static final String APPID = "appId"; @@ -32,7 +33,7 @@ public class ApiDataAspect { @Autowired private AppService appService; - @Pointcut("@annotation(com.tencent.supersonic.headless.query.annotation.ApiDataPermission)") + @Pointcut("@annotation(com.tencent.supersonic.headless.api.annotation.ApiHeaderCheck)") private void apiPermissionCheck() { } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/UpdateCycleEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/UpdateCycleEnum.java deleted file mode 100644 index 4d9385fd6..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/UpdateCycleEnum.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.tencent.supersonic.headless.api.materialization.enums; - - -public enum UpdateCycleEnum { - DAY, - WEEK, - MONTH -} \ No newline at end of file diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/MetricTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/MetricTypeEnum.java deleted file mode 100644 index e2141fc4b..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/MetricTypeEnum.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.tencent.supersonic.headless.api.model.enums; - - -public enum MetricTypeEnum { - - ATOMIC, - DERIVED - -} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/AppConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/AppConfig.java deleted file mode 100644 index 4012b0d93..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/AppConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.tencent.supersonic.headless.api.model.pojo; - -import com.google.common.collect.Lists; -import lombok.Data; - -import java.util.List; - -@Data -public class AppConfig { - - private List items = Lists.newArrayList(); - -} diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/AppDO.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/persistence/dataobject/AppDO.java similarity index 87% rename from headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/AppDO.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/persistence/dataobject/AppDO.java index ae523e1c6..363e0f9da 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/AppDO.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/persistence/dataobject/AppDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.model.domain.dataobject; +package com.tencent.supersonic.headless.api.persistence.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,7 +12,7 @@ import java.util.Date; public class AppDO { @TableId(type = IdType.AUTO) - private Long id; + private Integer id; private String name; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/AppMapper.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/persistence/mapper/AppMapper.java similarity index 54% rename from headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/AppMapper.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/persistence/mapper/AppMapper.java index d9c5f922d..9facea174 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/AppMapper.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/persistence/mapper/AppMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.model.infrastructure.mapper; +package com.tencent.supersonic.headless.api.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.headless.model.domain.dataobject.AppDO; +import com.tencent.supersonic.headless.api.persistence.dataobject.AppDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/ApiQuerySingleResult.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/ApiQuerySingleResult.java deleted file mode 100644 index 7a23b705b..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/ApiQuerySingleResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.tencent.supersonic.headless.api.query.pojo; - - -import com.tencent.supersonic.headless.api.model.pojo.Item; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import lombok.Data; - -@Data -public class ApiQuerySingleResult { - - private Item item; - - private QueryResultWithSchemaResp result; - -} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/rest/ApiQueryController.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/rest/ApiQueryController.java new file mode 100644 index 000000000..b6e01a0e2 --- /dev/null +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/rest/ApiQueryController.java @@ -0,0 +1,43 @@ +package com.tencent.supersonic.headless.api.rest; + +import com.tencent.supersonic.headless.api.service.ApiQueryService; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.MetaQueryApiReq; +import com.tencent.supersonic.headless.common.query.request.QueryApiReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.response.ApiQueryResultResp; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("/api/semantic/apiQuery") +@Slf4j +public class ApiQueryController { + + @Autowired + private ApiQueryService apiQueryService; + + @PostMapping("/metricDataQueryById") + public ApiQueryResultResp metricDataQueryById(@RequestBody QueryApiReq queryApiReq, + HttpServletRequest request) throws Exception { + return apiQueryService.metricDataQueryById(queryApiReq, request); + } + + @PostMapping("/metaQuery") + public Object metaQuery(@RequestBody MetaQueryApiReq metaQueryApiReq, HttpServletRequest request) { + return apiQueryService.metaQuery(metaQueryApiReq, request); + } + + @PostMapping("/dataQueryByStruct") + public QueryResultWithSchemaResp dataQueryByStruct(QueryStructReq queryStructReq, + HttpServletRequest request) throws Exception { + return apiQueryService.dataQueryByStruct(queryStructReq, request); + } + +} diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/AppController.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/rest/AppController.java similarity index 88% rename from headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/AppController.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/rest/AppController.java index 9be93877c..5fac5f9c4 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/AppController.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/rest/AppController.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.headless.model.rest; +package com.tencent.supersonic.headless.api.rest; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.headless.api.model.request.AppQueryReq; -import com.tencent.supersonic.headless.api.model.request.AppReq; -import com.tencent.supersonic.headless.api.model.response.AppDetailResp; -import com.tencent.supersonic.headless.api.model.response.AppResp; -import com.tencent.supersonic.headless.model.domain.AppService; +import com.tencent.supersonic.headless.api.service.AppService; +import com.tencent.supersonic.headless.common.model.request.AppQueryReq; +import com.tencent.supersonic.headless.common.model.request.AppReq; +import com.tencent.supersonic.headless.common.model.response.AppDetailResp; +import com.tencent.supersonic.headless.common.model.response.AppResp; 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/api/src/main/java/com/tencent/supersonic/headless/api/service/ApiQueryService.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/ApiQueryService.java new file mode 100644 index 000000000..a171a9ebf --- /dev/null +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/ApiQueryService.java @@ -0,0 +1,47 @@ +package com.tencent.supersonic.headless.api.service; + +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.MetaQueryApiReq; +import com.tencent.supersonic.headless.common.query.request.QueryApiReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.response.ApiQueryResultResp; +import com.tencent.supersonic.headless.api.annotation.ApiHeaderCheck; + +import javax.servlet.http.HttpServletRequest; +/** + * Api service for other apps to query meta info and data + */ +public interface ApiQueryService { + + /** + * Query the metric data based on the metric id. + * The data will be drilled down based on the information configured when applying for the APP. + * @param queryApiReq + * @param request + * @return + * @throws Exception + */ + @ApiHeaderCheck + ApiQueryResultResp metricDataQueryById(QueryApiReq queryApiReq, HttpServletRequest request) throws Exception; + + /** + * Query data based on structure + * @param queryStructReq + * @param request + * @return + * @throws Exception + */ + @ApiHeaderCheck + QueryResultWithSchemaResp dataQueryByStruct(QueryStructReq queryStructReq, + HttpServletRequest request) throws Exception; + + /** + * Query the meta information of the metric, dimension and tag + * @param metaQueryApiReq + * @param request + * @return + */ + @ApiHeaderCheck + Object metaQuery(MetaQueryApiReq metaQueryApiReq, HttpServletRequest request); + +} diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/AppService.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/AppService.java similarity index 60% rename from headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/AppService.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/service/AppService.java index 168ab5abf..8765c95ed 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/AppService.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/AppService.java @@ -1,12 +1,12 @@ -package com.tencent.supersonic.headless.model.domain; +package com.tencent.supersonic.headless.api.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.model.request.AppQueryReq; -import com.tencent.supersonic.headless.api.model.request.AppReq; -import com.tencent.supersonic.headless.api.model.response.AppDetailResp; -import com.tencent.supersonic.headless.api.model.response.AppResp; +import com.tencent.supersonic.headless.common.model.request.AppQueryReq; +import com.tencent.supersonic.headless.common.model.request.AppReq; +import com.tencent.supersonic.headless.common.model.response.AppDetailResp; +import com.tencent.supersonic.headless.common.model.response.AppResp; public interface AppService { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/impl/ApiQueryServiceImpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/impl/ApiQueryServiceImpl.java new file mode 100644 index 000000000..11c04e1d7 --- /dev/null +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/impl/ApiQueryServiceImpl.java @@ -0,0 +1,177 @@ +package com.tencent.supersonic.headless.api.service.impl; + +import com.google.common.collect.Lists; +import com.tencent.supersonic.auth.api.authentication.pojo.User; +import com.tencent.supersonic.common.pojo.Aggregator; +import com.tencent.supersonic.common.pojo.Constants; +import com.tencent.supersonic.common.pojo.DateConf; +import com.tencent.supersonic.common.pojo.enums.ApiItemType; +import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; +import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; +import com.tencent.supersonic.headless.api.aspect.ApiHeaderCheckAspect; +import com.tencent.supersonic.headless.api.service.ApiQueryService; +import com.tencent.supersonic.headless.api.service.AppService; +import com.tencent.supersonic.headless.common.model.pojo.Item; +import com.tencent.supersonic.headless.common.model.response.AppDetailResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.pojo.ApiQuerySingleResult; +import com.tencent.supersonic.headless.common.query.request.MetaQueryApiReq; +import com.tencent.supersonic.headless.common.query.request.QueryApiReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.response.ApiQueryResultResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.annotation.ApiHeaderCheck; +import com.tencent.supersonic.headless.query.service.QueryService; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + + +@Service +public class ApiQueryServiceImpl implements ApiQueryService { + + private static final long result_size = 10000; + + private AppService appService; + + private MetricService metricService; + + private DimensionService dimensionService; + + private QueryService queryService; + + public ApiQueryServiceImpl(AppService appService, + MetricService metricService, + DimensionService dimensionService, + QueryService queryService) { + this.appService = appService; + this.metricService = metricService; + this.dimensionService = dimensionService; + this.queryService = queryService; + } + + @Override + @ApiHeaderCheck + public ApiQueryResultResp metricDataQueryById(QueryApiReq queryApiReq, + HttpServletRequest request) throws Exception { + AppDetailResp appDetailResp = getAppDetailResp(request); + authCheck(appDetailResp, queryApiReq.getIds(), ApiItemType.METRIC); + List results = Lists.newArrayList(); + Map map = appDetailResp.getConfig().getItems().stream() + .collect(Collectors.toMap(Item::getId, i -> i)); + for (Long id : queryApiReq.getIds()) { + Item item = map.get(id); + ApiQuerySingleResult apiQuerySingleResult = dataQuery(appDetailResp.getId(), + item, queryApiReq.getDateConf()); + results.add(apiQuerySingleResult); + } + return ApiQueryResultResp.builder().results(results).build(); + } + + @Override + @ApiHeaderCheck + public QueryResultWithSchemaResp dataQueryByStruct(QueryStructReq queryStructReq, + HttpServletRequest request) throws Exception { + AppDetailResp appDetailResp = getAppDetailResp(request); + structAuthCheck(appDetailResp, queryStructReq); + return queryService.queryByStruct(queryStructReq, User.getAppUser(appDetailResp.getId())); + } + + @Override + @ApiHeaderCheck + public Object metaQuery(MetaQueryApiReq metaQueryApiReq, HttpServletRequest request) { + AppDetailResp appDetailResp = getAppDetailResp(request); + MetaFilter metaFilter = new MetaFilter(); + metaFilter.setIds(metaQueryApiReq.getIds()); + if (ApiItemType.METRIC.equals(metaQueryApiReq.getType())) { + authCheck(appDetailResp, metaQueryApiReq.getIds(), ApiItemType.METRIC); + return metricService.getMetrics(metaFilter); + } else if (ApiItemType.DIMENSION.equals(metaQueryApiReq.getType())) { + authCheck(appDetailResp, metaQueryApiReq.getIds(), ApiItemType.DIMENSION); + return dimensionService.getDimensions(metaFilter); + } else if (ApiItemType.TAG.equals(metaQueryApiReq.getType())) { + throw new InvalidArgumentException("标签元数据类型正在支持中"); + } + throw new InvalidArgumentException("不支持的元数据类型:" + metaQueryApiReq.getType()); + } + + private ApiQuerySingleResult dataQuery(Integer appId, Item item, DateConf dateConf) throws Exception { + MetricResp metricResp = metricService.getMetric(item.getId()); + List items = item.getRelateItems(); + List dimensionResps = Lists.newArrayList(); + if (!CollectionUtils.isEmpty(items)) { + List ids = items.stream().map(Item::getId).collect(Collectors.toList()); + DimensionFilter dimensionFilter = new DimensionFilter(); + dimensionFilter.setIds(ids); + dimensionResps = dimensionService.getDimensions(dimensionFilter); + } + QueryStructReq queryStructReq = buildQueryStructReq(dimensionResps, metricResp, dateConf); + QueryResultWithSchemaResp queryResultWithSchemaResp = + queryService.queryByStruct(queryStructReq, User.getAppUser(appId)); + ApiQuerySingleResult apiQuerySingleResult = new ApiQuerySingleResult(); + apiQuerySingleResult.setItem(item); + apiQuerySingleResult.setResult(queryResultWithSchemaResp); + return apiQuerySingleResult; + } + + private AppDetailResp getAppDetailResp(HttpServletRequest request) { + int appId = Integer.parseInt(request.getHeader(ApiHeaderCheckAspect.APPID)); + return appService.getApp(appId); + } + + private void authCheck(AppDetailResp appDetailResp, List ids, ApiItemType type) { + Set idsInApp = appDetailResp.getConfig().getAllItems().stream() + .filter(item -> type.equals(item.getType())).map(Item::getId).collect(Collectors.toSet()); + if (!idsInApp.containsAll(ids)) { + throw new InvalidArgumentException("查询范围超过应用申请范围, 请检查"); + } + } + + private void structAuthCheck(AppDetailResp appDetailResp, QueryStructReq queryStructReq) { + List metricIdsToQuery = metricService.getMetrics(new MetaFilter(queryStructReq.getModelIds())) + .stream().filter(metricResp -> queryStructReq.getMetrics().contains(metricResp.getBizName())) + .map(MetricResp::getId).collect(Collectors.toList()); + List dimensionIdsToQuery = dimensionService.getDimensions(new MetaFilter(queryStructReq.getModelIds())) + .stream().filter(dimensionResp -> queryStructReq.getGroups().contains(dimensionResp.getBizName())) + .map(DimensionResp::getId).collect(Collectors.toList()); + authCheck(appDetailResp, metricIdsToQuery, ApiItemType.METRIC); + authCheck(appDetailResp, dimensionIdsToQuery, ApiItemType.DIMENSION); + } + + private QueryStructReq buildQueryStructReq(List dimensionResps, + MetricResp metricResp, DateConf dateConf) { + Set modelIds = dimensionResps.stream().map(DimensionResp::getModelId).collect(Collectors.toSet()); + modelIds.add(metricResp.getModelId()); + QueryStructReq queryStructReq = new QueryStructReq(); + queryStructReq.setGroups(dimensionResps.stream() + .map(DimensionResp::getBizName).collect(Collectors.toList())); + queryStructReq.getGroups().add(0, getTimeDimension(dateConf)); + Aggregator aggregator = new Aggregator(); + aggregator.setColumn(metricResp.getBizName()); + queryStructReq.setAggregators(Lists.newArrayList(aggregator)); + queryStructReq.setDateInfo(dateConf); + queryStructReq.setModelIds(modelIds); + queryStructReq.setLimit(result_size); + return queryStructReq; + } + + private String getTimeDimension(DateConf dateConf) { + if (Constants.MONTH.equals(dateConf.getPeriod())) { + return TimeDimensionEnum.MONTH.getName(); + } else if (Constants.WEEK.equals(dateConf.getPeriod())) { + return TimeDimensionEnum.WEEK.getName(); + } else { + return TimeDimensionEnum.DAY.getName(); + } + } + +} diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/AppServiceImpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/impl/AppServiceImpl.java similarity index 91% rename from headless/model/src/main/java/com/tencent/supersonic/headless/model/application/AppServiceImpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/service/impl/AppServiceImpl.java index 20bd25b52..e1e6537bb 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/AppServiceImpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/service/impl/AppServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.model.application; +package com.tencent.supersonic.headless.api.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,20 +10,20 @@ import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.PageUtils; -import com.tencent.supersonic.headless.api.model.enums.AppStatusEnum; -import com.tencent.supersonic.headless.api.model.pojo.AppConfig; -import com.tencent.supersonic.headless.api.model.request.AppQueryReq; -import com.tencent.supersonic.headless.api.model.request.AppReq; -import com.tencent.supersonic.headless.api.model.response.AppDetailResp; -import com.tencent.supersonic.headless.api.model.response.AppResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.model.domain.AppService; +import com.tencent.supersonic.headless.api.persistence.dataobject.AppDO; +import com.tencent.supersonic.headless.api.persistence.mapper.AppMapper; +import com.tencent.supersonic.headless.api.service.AppService; +import com.tencent.supersonic.headless.common.model.enums.AppStatusEnum; +import com.tencent.supersonic.headless.common.model.pojo.AppConfig; +import com.tencent.supersonic.headless.common.model.request.AppQueryReq; +import com.tencent.supersonic.headless.common.model.request.AppReq; +import com.tencent.supersonic.headless.common.model.response.AppDetailResp; +import com.tencent.supersonic.headless.common.model.response.AppResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.MetricService; -import com.tencent.supersonic.headless.model.domain.dataobject.AppDO; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.headless.model.infrastructure.mapper.AppMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/headless/common/pom.xml b/headless/common/pom.xml new file mode 100644 index 000000000..248d5d2ef --- /dev/null +++ b/headless/common/pom.xml @@ -0,0 +1,69 @@ + + + + com.tencent.supersonic + headless + ${revision} + + 4.0.0 + + headless-common + + + + + + + + + com.clickhouse + clickhouse-jdbc + ${clickhouse.jdbc.version} + + all + + + + com.tencent.supersonic + common + ${project.version} + + + + org.projectlombok + lombok + ${lombok.version} + + + jakarta.validation + jakarta.validation-api + + + org.springframework + spring-core + ${spring.version} + + + com.alibaba + fastjson + ${fastjson.version} + compile + + + commons-codec + commons-codec + + + org.springframework.boot + spring-boot-starter-web + ${spring.version} + + + com.tencent.supersonic + auth-api + ${project.version} + + + diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementFrequencyEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/ElementFrequencyEnum.java similarity index 50% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementFrequencyEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/ElementFrequencyEnum.java index de4764734..6d5d8090d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementFrequencyEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/ElementFrequencyEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.enums; +package com.tencent.supersonic.headless.common.materialization.enums; public enum ElementFrequencyEnum { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/ElementTypeEnum.java similarity index 58% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementTypeEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/ElementTypeEnum.java index b2b9ef8bd..22055f175 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementTypeEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/ElementTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.enums; +package com.tencent.supersonic.headless.common.materialization.enums; public enum ElementTypeEnum { diff --git a/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/UpdateCycleEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/UpdateCycleEnum.java new file mode 100644 index 000000000..b329b9e99 --- /dev/null +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/enums/UpdateCycleEnum.java @@ -0,0 +1,8 @@ +package com.tencent.supersonic.headless.common.materialization.enums; + + +public enum UpdateCycleEnum { + DAY, + WEEK, + MONTH +} \ No newline at end of file diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationConfFilter.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationConfFilter.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationConfFilter.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationConfFilter.java index e8bbfe2cf..23d022372 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationConfFilter.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationConfFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.pojo; +package com.tencent.supersonic.headless.common.materialization.pojo; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationDateFilter.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationDateFilter.java similarity index 77% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationDateFilter.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationDateFilter.java index 64e8c5e68..09732aead 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationDateFilter.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationDateFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.pojo; +package com.tencent.supersonic.headless.common.materialization.pojo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationFilter.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationFilter.java similarity index 68% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationFilter.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationFilter.java index 836edfdcc..1c0d2f646 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationFilter.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationFilter.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.materialization.pojo; +package com.tencent.supersonic.headless.common.materialization.pojo; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.UpdateCycleEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationRecordFilter.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationRecordFilter.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationRecordFilter.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationRecordFilter.java index cd248dccc..cb3ce6301 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationRecordFilter.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/pojo/MaterializationRecordFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.pojo; +package com.tencent.supersonic.headless.common.materialization.pojo; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationElementReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationElementReq.java similarity index 71% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationElementReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationElementReq.java index 75c6b0ef6..23edf8d2f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationElementReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationElementReq.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.api.materialization.request; +package com.tencent.supersonic.headless.common.materialization.request; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementTypeEnum; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationRecordReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationRecordReq.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationRecordReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationRecordReq.java index d052ab8e3..1682af8ed 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationRecordReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationRecordReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.request; +package com.tencent.supersonic.headless.common.materialization.request; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationReq.java similarity index 72% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationReq.java index c63c9ba83..222e8b8f0 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.api.materialization.request; +package com.tencent.supersonic.headless.common.materialization.request; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationSourceReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationSourceReq.java similarity index 71% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationSourceReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationSourceReq.java index 6acb3f446..dba1f2bea 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationSourceReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/request/MaterializationSourceReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.request; +package com.tencent.supersonic.headless.common.materialization.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationDateResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationDateResp.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationDateResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationDateResp.java index 7e230e301..55afa0dbc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationDateResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationDateResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.response; +package com.tencent.supersonic.headless.common.materialization.response; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementModelResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationElementModelResp.java similarity index 73% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementModelResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationElementModelResp.java index d0073afd3..75d691cd7 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementModelResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationElementModelResp.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.api.materialization.response; +package com.tencent.supersonic.headless.common.materialization.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.Measure; import java.util.List; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationElementResp.java similarity index 67% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationElementResp.java index d14d7c1de..32186099b 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationElementResp.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.headless.api.materialization.response; +package com.tencent.supersonic.headless.common.materialization.response; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementTypeEnum; import lombok.Data; @Data diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationRecordResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationRecordResp.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationRecordResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationRecordResp.java index 109079b26..d55c7eb78 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationRecordResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationRecordResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.materialization.response; +package com.tencent.supersonic.headless.common.materialization.response; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationResp.java similarity index 72% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationResp.java index 788b02e25..ee244f4d5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationResp.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.api.materialization.response; +package com.tencent.supersonic.headless.common.materialization.response; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.UpdateCycleEnum; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationSourceResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationSourceResp.java similarity index 71% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationSourceResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationSourceResp.java index 78f243ab3..9025e3f09 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationSourceResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/materialization/response/MaterializationSourceResp.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.api.materialization.response; +package com.tencent.supersonic.headless.common.materialization.response; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.materialization.enums.UpdateCycleEnum; import java.util.List; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/AppStatusEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/AppStatusEnum.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/AppStatusEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/AppStatusEnum.java index acd0f5c99..1aca8ed9d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/AppStatusEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/AppStatusEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum AppStatusEnum { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DataTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/DataTypeEnum.java similarity index 98% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DataTypeEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/DataTypeEnum.java index f397e9a46..b6986e7dc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DataTypeEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/DataTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; import com.tencent.supersonic.common.pojo.Constants; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DimensionTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/DimensionTypeEnum.java similarity index 52% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DimensionTypeEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/DimensionTypeEnum.java index dfb20f31e..72d609637 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DimensionTypeEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/DimensionTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum DimensionTypeEnum { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/IdentifyTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/IdentifyTypeEnum.java similarity index 50% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/IdentifyTypeEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/IdentifyTypeEnum.java index 754fb745c..86b08261d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/IdentifyTypeEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/IdentifyTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum IdentifyTypeEnum { diff --git a/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/MetricTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/MetricTypeEnum.java new file mode 100644 index 000000000..02c5e9d18 --- /dev/null +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/MetricTypeEnum.java @@ -0,0 +1,9 @@ +package com.tencent.supersonic.headless.common.model.enums; + + +public enum MetricTypeEnum { + + ATOMIC, + DERIVED + +} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/ModelSourceTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/ModelSourceTypeEnum.java similarity index 93% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/ModelSourceTypeEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/ModelSourceTypeEnum.java index ea6234162..279ca7088 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/ModelSourceTypeEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/ModelSourceTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; import java.util.Objects; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/OperatorEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/OperatorEnum.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/OperatorEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/OperatorEnum.java index 4480f8990..6b62ed11a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/OperatorEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/OperatorEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum OperatorEnum { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryOptMode.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryOptMode.java similarity index 50% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryOptMode.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryOptMode.java index e24ca839c..6fa35243f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryOptMode.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryOptMode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum QueryOptMode { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeBackEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryTypeBackEnum.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeBackEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryTypeBackEnum.java index 07f11fad8..6f3d3054a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeBackEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryTypeBackEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum QueryTypeBackEnum { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryTypeEnum.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryTypeEnum.java index 25e86e250..5089c8f8c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum QueryTypeEnum { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/SemanticTypeEnum.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/SemanticTypeEnum.java similarity index 56% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/SemanticTypeEnum.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/SemanticTypeEnum.java index fb5dd47fb..c927740c8 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/SemanticTypeEnum.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/enums/SemanticTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.enums; +package com.tencent.supersonic.headless.common.model.enums; public enum SemanticTypeEnum { diff --git a/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/AppConfig.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/AppConfig.java new file mode 100644 index 000000000..149d001c9 --- /dev/null +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/AppConfig.java @@ -0,0 +1,24 @@ +package com.tencent.supersonic.headless.common.model.pojo; + +import com.google.common.collect.Lists; +import lombok.Data; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +@Data +public class AppConfig { + + private List items = Lists.newArrayList(); + + public Set getAllItems() { + Set itemSet = new HashSet<>(); + for (Item item : items) { + itemSet.add(item); + itemSet.addAll(item.getRelateItems()); + } + return itemSet; + } + +} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DatasourceType.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DatasourceType.java similarity index 87% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DatasourceType.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DatasourceType.java index 4710ae920..279685fec 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DatasourceType.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DatasourceType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.tencent.supersonic.common.pojo.Constants; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Dim.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Dim.java similarity index 93% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Dim.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Dim.java index 5cfe7bfb0..0ec874d04 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Dim.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Dim.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.tencent.supersonic.common.pojo.Constants; import lombok.AllArgsConstructor; @@ -63,4 +63,8 @@ public class Dim { ); } + public String getFieldName() { + return bizName; + } + } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimValueMap.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DimValueMap.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimValueMap.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DimValueMap.java index b689cea6e..832f6f336 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimValueMap.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DimValueMap.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimensionTimeTypeParams.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DimensionTimeTypeParams.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimensionTimeTypeParams.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DimensionTimeTypeParams.java index 6e69ee339..e89761823 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimensionTimeTypeParams.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DimensionTimeTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DrillDownDimension.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DrillDownDimension.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DrillDownDimension.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DrillDownDimension.java index 335c58dda..c74a768c5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DrillDownDimension.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/DrillDownDimension.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Entity.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Entity.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Entity.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Entity.java index 148b63847..8a4584f45 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Entity.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Entity.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Identify.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Identify.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Identify.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Identify.java index 845b38dc8..b0752a341 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Identify.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Identify.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; @@ -27,4 +27,9 @@ public class Identify { this.type = type; this.bizName = bizName; } + + public String getFieldName() { + return bizName; + } + } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Item.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Item.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Item.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Item.java index 64a550ff2..a026900a1 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Item.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Item.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.ApiItemType; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ItemDateFilter.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/ItemDateFilter.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ItemDateFilter.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/ItemDateFilter.java index 0827e9a71..3dfe29a90 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ItemDateFilter.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/ItemDateFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import java.util.List; import lombok.AllArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Measure.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Measure.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Measure.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Measure.java index 4ee882ffd..8036f126a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Measure.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/Measure.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,17 +9,12 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class Measure { - private String name; private String agg; private String expr; - private String constraint; - - private String alias; - private String createMetric; private String bizName; @@ -33,4 +28,8 @@ public class Measure { this.bizName = bizName; } + public String getFieldName() { + return expr; + } + } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricQueryDefaultConfig.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/MetricQueryDefaultConfig.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricQueryDefaultConfig.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/MetricQueryDefaultConfig.java index 0aecf8106..0acbd56c2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricQueryDefaultConfig.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/MetricQueryDefaultConfig.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricTypeParams.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/MetricTypeParams.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricTypeParams.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/MetricTypeParams.java index 934fc3ba6..6701df515 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricTypeParams.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/MetricTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import java.util.List; import com.google.common.collect.Lists; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ModelDetail.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/ModelDetail.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ModelDetail.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/ModelDetail.java index dd70a2956..e18c23a53 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ModelDetail.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/ModelDetail.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.model.enums.DimensionTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.DimensionTypeEnum; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryResult.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/QueryResult.java similarity index 85% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryResult.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/QueryResult.java index 89062973e..e5dac35ab 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryResult.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/QueryResult.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import java.io.Serializable; import java.util.ArrayList; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryStat.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/QueryStat.java similarity index 98% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryStat.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/QueryStat.java index 4cc14d37e..649c5dcbc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryStat.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/QueryStat.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/RelateDimension.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/RelateDimension.java similarity index 85% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/RelateDimension.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/RelateDimension.java index 3391aff9c..ec1041135 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/RelateDimension.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/RelateDimension.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/SchemaItem.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/SchemaItem.java similarity index 96% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/SchemaItem.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/SchemaItem.java index f5c7171e4..dd569aa8c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/SchemaItem.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/pojo/SchemaItem.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.pojo; +package com.tencent.supersonic.headless.common.model.pojo; import com.google.common.base.Objects; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/AppQueryReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/AppQueryReq.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/AppQueryReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/AppQueryReq.java index 37c991422..68abc808a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/AppQueryReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/AppQueryReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.PageBaseReq; -import com.tencent.supersonic.headless.api.model.enums.AppStatusEnum; +import com.tencent.supersonic.headless.common.model.enums.AppStatusEnum; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/AppReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/AppReq.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/AppReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/AppReq.java index a8d030600..c3c223177 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/AppReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/AppReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.headless.api.model.pojo.AppConfig; +import com.tencent.supersonic.headless.common.model.pojo.AppConfig; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DatabaseReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DatabaseReq.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DatabaseReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DatabaseReq.java index 196cd725e..27f4d9ebc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DatabaseReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DatabaseReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.DataTypeEnum; import lombok.Data; import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DateInfoReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DateInfoReq.java similarity index 94% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DateInfoReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DateInfoReq.java index d4333e527..7a72e18c4 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DateInfoReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DateInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import java.util.ArrayList; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DimensionReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DimensionReq.java similarity index 74% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DimensionReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DimensionReq.java index 2bff9eb54..f260bcf61 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DimensionReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DimensionReq.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DomainReq.java similarity index 85% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DomainReq.java index fbddd3644..bd9de521b 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DomainReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import java.util.ArrayList; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainUpdateReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DomainUpdateReq.java similarity index 62% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainUpdateReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DomainUpdateReq.java index 2394cbcc2..6b7775458 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainUpdateReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/DomainUpdateReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetaBatchReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetaBatchReq.java similarity index 69% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetaBatchReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetaBatchReq.java index d5ce06c62..d0f1b0d8c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetaBatchReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetaBatchReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricBaseReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetricBaseReq.java similarity index 77% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricBaseReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetricBaseReq.java index e8ce3d391..f30e86b5f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricBaseReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetricBaseReq.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetricReq.java similarity index 71% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetricReq.java index ff5874d43..56a533217 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/MetricReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; -import com.tencent.supersonic.headless.api.model.enums.MetricTypeEnum; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.common.model.enums.MetricTypeEnum; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.MetricTypeParams; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ModelReq.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ModelReq.java index de6448bf9..83ce59c73 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ModelReq.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelSchemaFilterReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ModelSchemaFilterReq.java similarity index 75% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelSchemaFilterReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ModelSchemaFilterReq.java index f5d9b39cd..f4bf4f32f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelSchemaFilterReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ModelSchemaFilterReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageDimensionReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageDimensionReq.java similarity index 65% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageDimensionReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageDimensionReq.java index 91d8be4ac..5ac1837ed 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageDimensionReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageDimensionReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageMetricReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageMetricReq.java similarity index 64% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageMetricReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageMetricReq.java index 92f04df9c..586edd3d4 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageMetricReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageMetricReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageSchemaItemReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageSchemaItemReq.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageSchemaItemReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageSchemaItemReq.java index 3527b4d8e..a76babe46 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageSchemaItemReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/PageSchemaItemReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.PageBaseReq; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/SqlExecuteReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/SqlExecuteReq.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/SqlExecuteReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/SqlExecuteReq.java index a7bc37f70..9781e9a74 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/SqlExecuteReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/SqlExecuteReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import javax.validation.constraints.NotBlank; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ViewInfoReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ViewInfoReq.java similarity index 83% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ViewInfoReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ViewInfoReq.java index 57d0f1301..c456613c8 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ViewInfoReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/request/ViewInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.request; +package com.tencent.supersonic.headless.common.model.request; import java.util.Date; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/AppDetailResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/AppDetailResp.java similarity index 62% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/AppDetailResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/AppDetailResp.java index 5c16d8d77..4182c4b7a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/AppDetailResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/AppDetailResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/AppResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/AppResp.java similarity index 76% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/AppResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/AppResp.java index 50706df34..459bd0647 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/AppResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/AppResp.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.headless.api.model.enums.AppStatusEnum; -import com.tencent.supersonic.headless.api.model.pojo.AppConfig; +import com.tencent.supersonic.headless.common.model.enums.AppStatusEnum; +import com.tencent.supersonic.headless.common.model.pojo.AppConfig; import lombok.Data; import org.apache.commons.lang3.StringUtils; @@ -15,7 +15,7 @@ import java.util.List; @Data public class AppResp extends RecordInfo { - private Long id; + private Integer id; private String name; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DatabaseResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DatabaseResp.java similarity index 95% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DatabaseResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DatabaseResp.java index bbea6f867..c33741d70 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DatabaseResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DatabaseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import java.util.List; import java.util.regex.Matcher; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimSchemaResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DimSchemaResp.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimSchemaResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DimSchemaResp.java index 2a698cda3..53ff0028a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimSchemaResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DimSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimensionResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DimensionResp.java similarity index 76% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimensionResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DimensionResp.java index fe0628358..efb206852 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimensionResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DimensionResp.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DomainResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DomainResp.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DomainResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DomainResp.java index 79dcc4848..985988296 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DomainResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/DomainResp.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; -import com.tencent.supersonic.headless.api.model.pojo.Entity; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.Entity; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import java.util.List; import java.util.Objects; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ExplainResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ExplainResp.java similarity index 83% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ExplainResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ExplainResp.java index cf9d91605..667c96903 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ExplainResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ExplainResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MeasureResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MeasureResp.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MeasureResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MeasureResp.java index 9fabe2ed5..9d551ae1a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MeasureResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MeasureResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MetricResp.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MetricResp.java index da7ea237f..c0a27b589 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MetricResp.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.common.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import lombok.ToString; import org.apache.commons.collections.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricSchemaResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MetricSchemaResp.java similarity index 72% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricSchemaResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MetricSchemaResp.java index 7c88703ab..495ad5be0 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricSchemaResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/MetricSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelResp.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelResp.java index 4b14b020f..04cc8e6eb 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelResp.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.Identify; -import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.Identify; +import com.tencent.supersonic.headless.common.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaRelaResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelSchemaRelaResp.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaRelaResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelSchemaRelaResp.java index 5f43d72b3..39d1ac2b2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaRelaResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelSchemaRelaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelSchemaResp.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelSchemaResp.java index 553c5721b..8e510ca89 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/ModelSchemaResp.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.headless.api.model.pojo.Identify; +import com.tencent.supersonic.headless.common.model.pojo.Identify; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/QueryResultWithSchemaResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/QueryResultWithSchemaResp.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/QueryResultWithSchemaResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/QueryResultWithSchemaResp.java index 2697a2b3e..1961b8e64 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/QueryResultWithSchemaResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/QueryResultWithSchemaResp.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.QueryAuthorization; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.headless.api.model.enums.SemanticTypeEnum; -import com.tencent.supersonic.headless.api.model.pojo.QueryResult; +import com.tencent.supersonic.headless.common.model.enums.SemanticTypeEnum; +import com.tencent.supersonic.headless.common.model.pojo.QueryResult; import lombok.Data; import lombok.ToString; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/SqlParserResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/SqlParserResp.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/SqlParserResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/SqlParserResp.java index 9d5b56c94..acbf63c1d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/SqlParserResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/response/SqlParserResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.response; +package com.tencent.supersonic.headless.common.model.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DataModelYamlTpl.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DataModelYamlTpl.java similarity index 74% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DataModelYamlTpl.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DataModelYamlTpl.java index bd6e3658c..cc7253958 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DataModelYamlTpl.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DataModelYamlTpl.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.api.model.yaml; +package com.tencent.supersonic.headless.common.model.yaml; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; import java.util.List; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionTimeTypeParamsTpl.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DimensionTimeTypeParamsTpl.java similarity index 70% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionTimeTypeParamsTpl.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DimensionTimeTypeParamsTpl.java index 551c8b908..f68e1ba65 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionTimeTypeParamsTpl.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DimensionTimeTypeParamsTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.yaml; +package com.tencent.supersonic.headless.common.model.yaml; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionYamlTpl.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DimensionYamlTpl.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionYamlTpl.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DimensionYamlTpl.java index 0395ea20e..9cbacec41 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionYamlTpl.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/DimensionYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.yaml; +package com.tencent.supersonic.headless.common.model.yaml; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/IdentifyYamlTpl.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/IdentifyYamlTpl.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/IdentifyYamlTpl.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/IdentifyYamlTpl.java index 9dbf2969e..42ccd3692 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/IdentifyYamlTpl.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/IdentifyYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.yaml; +package com.tencent.supersonic.headless.common.model.yaml; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MeasureYamlTpl.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MeasureYamlTpl.java similarity index 85% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MeasureYamlTpl.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MeasureYamlTpl.java index 2b499c52c..bc0e5c707 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MeasureYamlTpl.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MeasureYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.yaml; +package com.tencent.supersonic.headless.common.model.yaml; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricTypeParamsYamlTpl.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MetricTypeParamsYamlTpl.java similarity index 73% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricTypeParamsYamlTpl.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MetricTypeParamsYamlTpl.java index c661623b5..3fe15da38 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricTypeParamsYamlTpl.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MetricTypeParamsYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.yaml; +package com.tencent.supersonic.headless.common.model.yaml; import java.util.List; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricYamlTpl.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MetricYamlTpl.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricYamlTpl.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MetricYamlTpl.java index 20ed5d14c..3752026ed 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricYamlTpl.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/model/yaml/MetricYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.model.yaml; +package com.tencent.supersonic.headless.common.model.yaml; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/enums/AggOption.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/enums/AggOption.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/enums/AggOption.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/enums/AggOption.java index 9fbd9d2e0..003ea09fe 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/enums/AggOption.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/enums/AggOption.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.enums; +package com.tencent.supersonic.headless.common.query.enums; public enum AggOption { NATIVE, diff --git a/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/ApiQuerySingleResult.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/ApiQuerySingleResult.java new file mode 100644 index 000000000..b92bb7f89 --- /dev/null +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/ApiQuerySingleResult.java @@ -0,0 +1,15 @@ +package com.tencent.supersonic.headless.common.query.pojo; + + +import com.tencent.supersonic.headless.common.model.pojo.Item; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import lombok.Data; + +@Data +public class ApiQuerySingleResult { + + private Item item; + + private QueryResultWithSchemaResp result; + +} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Cache.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Cache.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Cache.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Cache.java index 5e1ab296a..8103dd0eb 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Cache.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Cache.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.pojo; +package com.tencent.supersonic.headless.common.query.pojo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/DataDownload.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/DataDownload.java similarity index 75% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/DataDownload.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/DataDownload.java index 9d7b7637a..e9e7e4825 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/DataDownload.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/DataDownload.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.pojo; +package com.tencent.supersonic.headless.common.query.pojo; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Materialization.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Materialization.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Materialization.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Materialization.java index 696c4de36..9f214016a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Materialization.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Materialization.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.pojo; +package com.tencent.supersonic.headless.common.query.pojo; import java.util.List; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/MetricTable.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/MetricTable.java similarity index 66% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/MetricTable.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/MetricTable.java index 142dbdfcd..73a43a099 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/MetricTable.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/MetricTable.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.api.query.pojo; +package com.tencent.supersonic.headless.common.query.pojo; -import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.enums.AggOption; import java.util.List; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Param.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Param.java similarity index 92% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Param.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Param.java index d71cfa1af..2fc5a7959 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Param.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/pojo/Param.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.pojo; +package com.tencent.supersonic.headless.common.query.pojo; import javax.validation.constraints.NotBlank; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/BatchDownloadReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/BatchDownloadReq.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/BatchDownloadReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/BatchDownloadReq.java index ae02e7353..91091f697 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/BatchDownloadReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/BatchDownloadReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/DownloadStructReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/DownloadStructReq.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/DownloadStructReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/DownloadStructReq.java index 8513ca19b..1817490b2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/DownloadStructReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/DownloadStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ExplainSqlReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ExplainSqlReq.java similarity index 69% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ExplainSqlReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ExplainSqlReq.java index 8ebfe4a42..7b75b4738 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ExplainSqlReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ExplainSqlReq.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; -import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.QueryTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ItemUseReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ItemUseReq.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ItemUseReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ItemUseReq.java index 42f11b350..085a2af42 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ItemUseReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ItemUseReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import java.util.List; import lombok.Data; diff --git a/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/MetaQueryApiReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/MetaQueryApiReq.java new file mode 100644 index 000000000..a9ab78db5 --- /dev/null +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/MetaQueryApiReq.java @@ -0,0 +1,17 @@ +package com.tencent.supersonic.headless.common.query.request; + +import com.tencent.supersonic.common.pojo.enums.ApiItemType; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +@Data +public class MetaQueryApiReq { + + @NotEmpty(message = "ids不可为空") + private List ids; + + private ApiItemType type = ApiItemType.METRIC; + +} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/MetricReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/MetricReq.java similarity index 87% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/MetricReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/MetricReq.java index 3854d7eec..b71bfb000 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/MetricReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/MetricReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.tencent.supersonic.common.pojo.ColumnOrder; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ParseSqlReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ParseSqlReq.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ParseSqlReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ParseSqlReq.java index c826bf954..9668f5f6e 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ParseSqlReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/ParseSqlReq.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; -import com.tencent.supersonic.headless.api.query.pojo.MetricTable; +import com.tencent.supersonic.headless.common.query.pojo.MetricTable; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryApiPreviewReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryApiPreviewReq.java similarity index 60% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryApiPreviewReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryApiPreviewReq.java index 1286bdec8..e2d6d9cac 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryApiPreviewReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryApiPreviewReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.headless.api.model.pojo.Item; +import com.tencent.supersonic.headless.common.model.pojo.Item; import lombok.Data; @Data diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryApiReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryApiReq.java similarity index 63% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryApiReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryApiReq.java index a044ec639..b06fdbf16 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryApiReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryApiReq.java @@ -1,7 +1,6 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.common.pojo.enums.ApiItemType; import lombok.Data; import javax.validation.constraints.NotEmpty; @@ -13,8 +12,6 @@ public class QueryApiReq { @NotEmpty(message = "ids不可为空") private List ids; - private ApiItemType type = ApiItemType.METRIC; - private DateConf dateConf = new DateConf(); } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryDimValueReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryDimValueReq.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryDimValueReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryDimValueReq.java index 2aeceeab1..b28b172cc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryDimValueReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryDimValueReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryMultiStructReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryMultiStructReq.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryMultiStructReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryMultiStructReq.java index 9e69c78e4..401bd0bb7 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryMultiStructReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryMultiStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.alibaba.fastjson.JSONObject; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryS2SQLReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryS2SQLReq.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryS2SQLReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryS2SQLReq.java index 56e005c4d..ca3d4c7da 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryS2SQLReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryS2SQLReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.google.common.collect.Lists; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryStructReq.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryStructReq.java similarity index 98% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryStructReq.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryStructReq.java index 9d743d368..1b88b76e5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryStructReq.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/request/QueryStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.request; +package com.tencent.supersonic.headless.common.query.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.Aggregator; @@ -12,8 +12,8 @@ import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; import com.tencent.supersonic.common.util.SqlFilterUtils; import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper; -import com.tencent.supersonic.headless.api.query.pojo.Cache; -import com.tencent.supersonic.headless.api.query.pojo.Param; +import com.tencent.supersonic.headless.common.query.pojo.Cache; +import com.tencent.supersonic.headless.common.query.pojo.Param; import lombok.Data; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ApiQueryResultResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/response/ApiQueryResultResp.java similarity index 54% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ApiQueryResultResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/response/ApiQueryResultResp.java index ec182c11b..8b017a12f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ApiQueryResultResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/response/ApiQueryResultResp.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.api.query.response; +package com.tencent.supersonic.headless.common.query.response; -import com.tencent.supersonic.headless.api.query.pojo.ApiQuerySingleResult; +import com.tencent.supersonic.headless.common.query.pojo.ApiQuerySingleResult; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ItemUseResp.java b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/response/ItemUseResp.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ItemUseResp.java rename to headless/common/src/main/java/com/tencent/supersonic/headless/common/query/response/ItemUseResp.java index f0875210f..376868d48 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ItemUseResp.java +++ b/headless/common/src/main/java/com/tencent/supersonic/headless/common/query/response/ItemUseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.query.response; +package com.tencent.supersonic.headless.common.query.response; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/headless/materialization/pom.xml b/headless/materialization/pom.xml index 4a57ee119..384af29e4 100644 --- a/headless/materialization/pom.xml +++ b/headless/materialization/pom.xml @@ -13,7 +13,7 @@ com.tencent.supersonic - headless-api + headless-common ${project.version} compile diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationConfServiceImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationConfServiceImpl.java index 2b6402eca..32da8e1a0 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationConfServiceImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationConfServiceImpl.java @@ -7,24 +7,24 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementModelResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationSourceResp; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.MeasureResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementModelResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationSourceResp; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.MeasureResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; import com.tencent.supersonic.headless.materialization.domain.MaterializationConfService; import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationElementRepository; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationRecordServiceImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationRecordServiceImpl.java index 713e2cb9f..d00766f76 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationRecordServiceImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationRecordServiceImpl.java @@ -5,11 +5,11 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationDateFilter; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationDateResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationDateFilter; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationDateResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationRecordResp; import com.tencent.supersonic.headless.materialization.domain.MaterializationRecordService; import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationRecordRepository; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationConfService.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationConfService.java index 1a8af3899..ebf3e07b0 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationConfService.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationConfService.java @@ -1,14 +1,14 @@ package com.tencent.supersonic.headless.materialization.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementModelResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationSourceResp; -import com.tencent.supersonic.headless.api.model.response.MeasureResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementModelResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationSourceResp; +import com.tencent.supersonic.headless.common.model.response.MeasureResp; import java.util.List; public interface MaterializationConfService { diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationRecordService.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationRecordService.java index c0160fc06..d9330c6b6 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationRecordService.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationRecordService.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.headless.materialization.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationDateFilter; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationDateResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationDateFilter; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationDateResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationRecordResp; import java.util.List; public interface MaterializationRecordService { diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/Materialization.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/Materialization.java index decc512f4..22c333162 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/Materialization.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/Materialization.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.materialization.domain.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.UpdateCycleEnum; import lombok.Data; import java.util.List; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationElement.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationElement.java index 32040aa4a..2bb1011f5 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationElement.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationElement.java @@ -4,8 +4,8 @@ package com.tencent.supersonic.headless.materialization.domain.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementTypeEnum; import lombok.Data; @Data diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationElementRepository.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationElementRepository.java index 3b18562ef..bd685937d 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationElementRepository.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationElementRepository.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.materialization.domain.repository; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementResp; import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationElement; import java.util.List; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRecordRepository.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRecordRepository.java index 5130bf1a1..a82e31a94 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRecordRepository.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRecordRepository.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.materialization.domain.repository; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationRecordResp; import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; import java.util.List; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRepository.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRepository.java index b5273d5c9..9194c874b 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRepository.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRepository.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.materialization.domain.repository; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; import java.util.List; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationConverter.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationConverter.java index 2c79345b0..4d716dc0b 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationConverter.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationConverter.java @@ -3,14 +3,14 @@ package com.tencent.supersonic.headless.materialization.domain.utils; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDOWithBLOBs; import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOWithBLOBs; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationPartitionHelper.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationPartitionHelper.java index b65d98c84..df8264b41 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationPartitionHelper.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationPartitionHelper.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.materialization.domain.utils; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; import org.apache.logging.log4j.util.Strings; import org.springframework.util.CollectionUtils; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationRecordConverter.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationRecordConverter.java index 2db77dc4c..26b6ed811 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationRecordConverter.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationRecordConverter.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.materialization.domain.utils; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationRecordResp; import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationRecordDO; import org.apache.logging.log4j.util.Strings; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationUtils.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationUtils.java index 90c1d60c0..64936225f 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationUtils.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationUtils.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.materialization.domain.utils; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; public interface MaterializationUtils { diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationZipperUtils.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationZipperUtils.java index a0cd566b7..d3f3268b7 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationZipperUtils.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationZipperUtils.java @@ -4,11 +4,11 @@ package com.tencent.supersonic.headless.materialization.domain.utils; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.common.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; import org.apache.logging.log4j.util.Strings; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java index 02eec8ac3..accb537c0 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.materialization.infrastructure.mapper; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationFilter; import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDOWithBLOBs; import org.apache.ibatis.annotations.Mapper; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java index be6c4a5ef..99375d812 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.materialization.infrastructure.repository; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationElementResp; import com.tencent.supersonic.headless.materialization.infrastructure.mapper.MaterializationElementDOMapper; import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOExample; import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOKey; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java index b9cb957a6..ae3a204b7 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.materialization.infrastructure.repository; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationRecordResp; import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationRecordDO; import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationRecordRepository; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRepositoryImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRepositoryImpl.java index 2c4af4bc5..24d61aff1 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRepositoryImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRepositoryImpl.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.materialization.infrastructure.repository; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationRepository; import com.tencent.supersonic.headless.materialization.domain.utils.MaterializationConverter; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationConfController.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationConfController.java index 652a0c8bd..5caf738d2 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationConfController.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationConfController.java @@ -2,12 +2,12 @@ package com.tencent.supersonic.headless.materialization.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.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationSourceResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationSourceResp; import com.tencent.supersonic.headless.materialization.domain.MaterializationConfService; import java.util.List; import javax.servlet.http.HttpServletRequest; diff --git a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationRecordController.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationRecordController.java index c7eb19441..d439065f3 100644 --- a/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationRecordController.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationRecordController.java @@ -2,11 +2,11 @@ package com.tencent.supersonic.headless.materialization.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.materialization.pojo.MaterializationDateFilter; -import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationDateResp; -import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationDateFilter; +import com.tencent.supersonic.headless.common.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.common.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationDateResp; +import com.tencent.supersonic.headless.common.materialization.response.MaterializationRecordResp; import com.tencent.supersonic.headless.materialization.domain.MaterializationRecordService; import org.springframework.web.bind.annotation.RestController; diff --git a/headless/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml b/headless/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml index cc8fa3983..c6116a4a2 100644 --- a/headless/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml +++ b/headless/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml @@ -59,7 +59,7 @@ date_info, entities, description - select * from s2_materialization diff --git a/headless/model/pom.xml b/headless/model/pom.xml index a2f693b72..c3dd57e32 100644 --- a/headless/model/pom.xml +++ b/headless/model/pom.xml @@ -42,7 +42,7 @@ com.tencent.supersonic - headless-api + headless-common ${project.version} compile diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CatalogImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CatalogImpl.java index c1290f423..48b055cc8 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CatalogImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CatalogImpl.java @@ -3,14 +3,14 @@ package com.tencent.supersonic.headless.model.application; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricYamlTpl; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.model.domain.DatabaseService; import com.tencent.supersonic.headless.model.domain.DimensionService; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DatabaseServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DatabaseServiceImpl.java index 7432d3b30..6f4de8943 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DatabaseServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DatabaseServiceImpl.java @@ -1,10 +1,10 @@ package com.tencent.supersonic.headless.model.application; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.model.request.DatabaseReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.request.DatabaseReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.model.domain.DatabaseService; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DimensionServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DimensionServiceImpl.java index ab4717506..676a8c987 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DimensionServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DimensionServiceImpl.java @@ -15,15 +15,15 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.ChatGptHelper; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.model.request.DimensionReq; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.common.model.request.DimensionReq; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.model.domain.DatabaseService; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.ModelRelaService; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DomainServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DomainServiceImpl.java index 08788a95f..58bf40252 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DomainServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DomainServiceImpl.java @@ -6,10 +6,10 @@ import com.tencent.supersonic.auth.api.authentication.service.UserService; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.headless.api.model.request.DomainReq; -import com.tencent.supersonic.headless.api.model.request.DomainUpdateReq; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.request.DomainReq; +import com.tencent.supersonic.headless.common.model.request.DomainUpdateReq; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; import com.tencent.supersonic.headless.model.domain.DomainService; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.model.domain.dataobject.DomainDO; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/MetricServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/MetricServiceImpl.java index 3f2ebdb16..f015c2337 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/MetricServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/MetricServiceImpl.java @@ -15,16 +15,16 @@ import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.ChatGptHelper; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.MetricReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.MetricQueryDefaultConfig; +import com.tencent.supersonic.headless.common.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.MetricReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; import com.tencent.supersonic.headless.model.domain.CollectService; import com.tencent.supersonic.headless.model.domain.DomainService; import com.tencent.supersonic.headless.model.domain.MetricService; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelServiceImpl.java index cf79bf68c..115175c6c 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelServiceImpl.java @@ -10,29 +10,29 @@ import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.pojo.Identify; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.model.request.DateInfoReq; -import com.tencent.supersonic.headless.api.model.request.DimensionReq; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.MetricReq; -import com.tencent.supersonic.headless.api.model.request.ModelReq; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.MeasureResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.pojo.Identify; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.common.model.request.DateInfoReq; +import com.tencent.supersonic.headless.common.model.request.DimensionReq; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.MetricReq; +import com.tencent.supersonic.headless.common.model.request.ModelReq; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.MeasureResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricYamlTpl; import com.tencent.supersonic.headless.model.domain.DatabaseService; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.DomainService; @@ -116,11 +116,11 @@ public class ModelServiceImpl implements ModelService { @Transactional public ModelResp createModel(ModelReq modelReq, User user) throws Exception { checkName(modelReq); - ModelDO datasourceDO = ModelConverter.convert(modelReq, user); - modelRepository.createModel(datasourceDO); - batchCreateDimension(datasourceDO, user); - batchCreateMetric(datasourceDO, user); - return ModelConverter.convert(datasourceDO); + ModelDO modelDO = ModelConverter.convert(modelReq, user); + modelRepository.createModel(modelDO); + batchCreateDimension(modelDO, user); + batchCreateMetric(modelDO, user); + return ModelConverter.convert(modelDO); } @Override diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ViewInfoServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ViewInfoServiceImpl.java index 573a95a14..7e6a3eae2 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ViewInfoServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ViewInfoServiceImpl.java @@ -4,11 +4,11 @@ package com.tencent.supersonic.headless.model.application; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.model.request.ViewInfoReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaRelaResp; +import com.tencent.supersonic.headless.common.model.request.ViewInfoReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaRelaResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.MetricService; import com.tencent.supersonic.headless.model.domain.ModelService; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/Catalog.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/Catalog.java index 80a681d9d..f3f187780 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/Catalog.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/Catalog.java @@ -2,14 +2,14 @@ package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricYamlTpl; import java.util.List; import java.util.Map; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DatabaseService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DatabaseService.java index 3ba55310d..3422b9afe 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DatabaseService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DatabaseService.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.model.request.DatabaseReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.request.DatabaseReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import java.util.List; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DimensionService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DimensionService.java index bfa00f8c3..27ddaa659 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DimensionService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DimensionService.java @@ -4,11 +4,11 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.pojo.enums.EventType; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.request.DimensionReq; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.request.DimensionReq; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import java.util.List; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DomainService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DomainService.java index ff41f625e..2b7d4a892 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DomainService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DomainService.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.model.request.DomainReq; -import com.tencent.supersonic.headless.api.model.request.DomainUpdateReq; -import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.request.DomainReq; +import com.tencent.supersonic.headless.common.model.request.DomainUpdateReq; +import com.tencent.supersonic.headless.common.model.response.DomainResp; import java.util.List; import java.util.Map; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/MetricService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/MetricService.java index 6168727ce..05635024c 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/MetricService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/MetricService.java @@ -4,12 +4,12 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.pojo.enums.EventType; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.MetricReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.MetricQueryDefaultConfig; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.MetricReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.MetricResp; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import java.util.List; import java.util.Set; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelService.java index 95d9856f6..112109eb5 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelService.java @@ -3,17 +3,17 @@ package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.ModelReq; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.MeasureResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.ModelReq; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.MeasureResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricYamlTpl; import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; import java.util.List; import java.util.Map; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DatasourceYamlManager.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DatasourceYamlManager.java index e5e6292b4..bb2be757b 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DatasourceYamlManager.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DatasourceYamlManager.java @@ -1,16 +1,16 @@ package com.tencent.supersonic.headless.model.domain.manager; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.pojo.Identify; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionTimeTypeParamsTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.IdentifyYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MeasureYamlTpl; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.pojo.Identify; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionTimeTypeParamsTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.IdentifyYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MeasureYamlTpl; import com.tencent.supersonic.headless.model.domain.pojo.Datasource; import com.tencent.supersonic.headless.model.domain.pojo.DatasourceQueryEnum; import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DimensionYamlManager.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DimensionYamlManager.java index e2981abd5..2fbcae7a8 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DimensionYamlManager.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DimensionYamlManager.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.model.domain.manager; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; import com.tencent.supersonic.headless.model.domain.pojo.Dimension; import com.tencent.supersonic.headless.model.domain.utils.DimensionConverter; import java.util.ArrayList; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/MetricYamlManager.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/MetricYamlManager.java index ca4376a92..c13cbb655 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/MetricYamlManager.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/MetricYamlManager.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.model.domain.manager; -import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricYamlTpl; import com.tencent.supersonic.headless.model.domain.pojo.Metric; import com.tencent.supersonic.headless.model.domain.utils.MetricConverter; import java.util.ArrayList; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Datasource.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Datasource.java index 98cd60ff4..f8d027224 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Datasource.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Datasource.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.model.domain.pojo; -import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Dimension.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Dimension.java index b27ffec1e..aecf4a305 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Dimension.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Dimension.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.model.domain.pojo; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Domain.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Domain.java index 1b84f2c9c..fd89607dc 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Domain.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Domain.java @@ -1,10 +1,10 @@ package com.tencent.supersonic.headless.model.domain.pojo; -import com.tencent.supersonic.headless.api.model.pojo.Entity; -import com.tencent.supersonic.headless.api.model.request.DomainReq; +import com.tencent.supersonic.headless.common.model.pojo.Entity; +import com.tencent.supersonic.headless.common.model.request.DomainReq; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import java.util.List; import lombok.Data; import org.springframework.beans.BeanUtils; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/JdbcDataSource.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/JdbcDataSource.java index e40c00170..de47be8f7 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/JdbcDataSource.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/JdbcDataSource.java @@ -6,8 +6,8 @@ import com.alibaba.druid.filter.Filter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; -import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; import com.tencent.supersonic.headless.model.domain.utils.JdbcDataSourceUtils; import java.util.Arrays; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Metric.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Metric.java index 40e0c2ba6..86278cc11 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Metric.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Metric.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.model.domain.pojo; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.common.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Model.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Model.java index 30470b518..b8f8bd50d 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Model.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Model.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.model.domain.pojo; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.Entity; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.Entity; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DateInfoRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DateInfoRepository.java index 10004770a..3121733f3 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DateInfoRepository.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DateInfoRepository.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.model.domain.repository; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.model.request.DateInfoReq; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.request.DateInfoReq; import com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO; import java.util.List; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DatabaseConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DatabaseConverter.java index 82688174c..0b4f78582 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DatabaseConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DatabaseConverter.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.model.domain.utils; import com.alibaba.fastjson.JSONObject; -import com.tencent.supersonic.headless.api.model.request.DatabaseReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.request.DatabaseReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDO; import com.tencent.supersonic.headless.model.domain.pojo.ConnectInfo; import com.tencent.supersonic.headless.model.domain.pojo.Database; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DimensionConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DimensionConverter.java index 82562d37d..4c5679962 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DimensionConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DimensionConverter.java @@ -5,11 +5,11 @@ import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.request.DimensionReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.request.DimensionReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; import com.tencent.supersonic.headless.model.domain.dataobject.DimensionDO; import com.tencent.supersonic.headless.model.domain.pojo.Dimension; import org.apache.logging.log4j.util.Strings; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DomainConvert.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DomainConvert.java index fae1cbd0b..fd40d6079 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DomainConvert.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DomainConvert.java @@ -3,10 +3,10 @@ package com.tencent.supersonic.headless.model.domain.utils; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.model.request.DomainReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.request.DomainReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; import com.tencent.supersonic.headless.model.domain.dataobject.DomainDO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/JdbcDataSourceUtils.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/JdbcDataSourceUtils.java index bea3a117e..d203fdb7a 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/JdbcDataSourceUtils.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/JdbcDataSourceUtils.java @@ -10,8 +10,8 @@ import static com.tencent.supersonic.common.pojo.Constants.PATTERN_JDBC_TYPE; import static com.tencent.supersonic.common.pojo.Constants.SPACE; import com.alibaba.druid.util.StringUtils; -import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; import com.tencent.supersonic.common.util.MD5Util; import com.tencent.supersonic.headless.model.domain.pojo.Database; import com.tencent.supersonic.headless.model.domain.pojo.JdbcDataSource; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/MetricConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/MetricConverter.java index 4c0e88372..641c04238 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/MetricConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/MetricConverter.java @@ -5,15 +5,15 @@ import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.DataFormat; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.model.request.MetricReq; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.yaml.MeasureYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricTypeParamsYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.common.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.common.model.request.MetricReq; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.yaml.MeasureYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricTypeParamsYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricYamlTpl; import com.tencent.supersonic.headless.model.domain.dataobject.MetricDO; import com.tencent.supersonic.headless.model.domain.pojo.Metric; import org.springframework.beans.BeanUtils; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/ModelConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/ModelConverter.java index c264fd086..fbafadf03 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/ModelConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/ModelConverter.java @@ -6,19 +6,22 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.model.enums.MetricTypeEnum; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.Identify; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.model.request.DimensionReq; -import com.tencent.supersonic.headless.api.model.request.MetricReq; -import com.tencent.supersonic.headless.api.model.request.ModelReq; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.MeasureResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.enums.DimensionTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.IdentifyTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.MetricTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.SemanticTypeEnum; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.Identify; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.common.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.common.model.request.DimensionReq; +import com.tencent.supersonic.headless.common.model.request.MetricReq; +import com.tencent.supersonic.headless.common.model.request.ModelReq; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.MeasureResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -74,6 +77,9 @@ public class ModelConverter { public static ModelDO convert(ModelDO modelDO, ModelReq modelReq, User user) { ModelDetail modelDetail = getModelDetail(modelReq); BeanMapper.mapper(modelReq, modelDO); + if (modelReq.getDrillDownDimensions() != null) { + modelDO.setDrillDownDimensions(JSONObject.toJSONString(modelReq.getDrillDownDimensions())); + } modelDO.setModelDetail(JSONObject.toJSONString((modelDetail))); modelDO.setUpdatedBy(user.getName()); modelDO.setUpdatedAt(new Date()); @@ -95,10 +101,10 @@ public class ModelConverter { dimensionReq.setName(dim.getName()); dimensionReq.setBizName(dim.getBizName()); dimensionReq.setDescription(dim.getName()); - dimensionReq.setSemanticType("CATEGORY"); + dimensionReq.setSemanticType(SemanticTypeEnum.CATEGORY.name()); dimensionReq.setModelId(modelDO.getId()); dimensionReq.setExpr(dim.getBizName()); - dimensionReq.setType("categorical"); + dimensionReq.setType(DimensionTypeEnum.categorical.name()); dimensionReq.setDescription(Objects.isNull(dim.getDescription()) ? "" : dim.getDescription()); dimensionReq.setIsTag(dim.getIsTag()); return dimensionReq; @@ -123,7 +129,7 @@ public class ModelConverter { dimensionReq.setName(identify.getName()); dimensionReq.setBizName(identify.getBizName()); dimensionReq.setDescription(identify.getName()); - dimensionReq.setSemanticType("CATEGORY"); + dimensionReq.setSemanticType(SemanticTypeEnum.CATEGORY.name()); dimensionReq.setModelId(modelDO.getId()); dimensionReq.setExpr(identify.getBizName()); dimensionReq.setType(identify.getType()); @@ -141,7 +147,7 @@ public class ModelConverter { private static boolean isCreateDimension(Dim dim) { return dim.getIsCreateDimension() == 1 && StringUtils.isNotBlank(dim.getName()) - && !dim.getType().equalsIgnoreCase("time"); + && !dim.getType().equalsIgnoreCase(DimensionTypeEnum.time.name()); } private static boolean isCreateMetric(Measure measure) { @@ -175,7 +181,7 @@ public class ModelConverter { return dimensionReqs; } dimensionReqs.addAll(identifies.stream() - .filter(i -> i.getType().equalsIgnoreCase("primary")) + .filter(i -> i.getType().equalsIgnoreCase(IdentifyTypeEnum.primary.name())) .filter(i -> StringUtils.isNotBlank(i.getName())) .map(identify -> convert(identify, modelDO)).collect(Collectors.toList())); return dimensionReqs; @@ -196,17 +202,18 @@ public class ModelConverter { BeanMapper.mapper(modelReq.getModelDetail(), modelDetail); List measures = modelDetail.getMeasures(); for (Measure measure : measures) { - if (StringUtils.isBlank(measure.getExpr())) { - measure.setExpr(measure.getBizName()); + if (StringUtils.isBlank(measure.getBizName())) { + continue; } - if (StringUtils.isBlank(measure.getConstraint())) { - measure.setConstraint(null); + //Compatible with front-end tmp + String oriFieldName = measure.getBizName() + .replaceFirst(modelReq.getBizName() + "_", ""); + measure.setExpr(oriFieldName); + if (!measure.getBizName().startsWith(modelReq.getBizName())) { + measure.setBizName(String.format("%s_%s", modelReq.getBizName(), oriFieldName)); } - if (StringUtils.isBlank(measure.getAlias())) { - measure.setAlias(null); - } - measure.setBizName(String.format("%s_%s", modelReq.getBizName(), measure.getBizName())); } return modelDetail; } + } diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SqlUtils.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SqlUtils.java index 54a670737..71284d013 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SqlUtils.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SqlUtils.java @@ -4,9 +4,9 @@ import static com.tencent.supersonic.common.pojo.Constants.AT_SYMBOL; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.util.DateUtils; -import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.model.domain.pojo.JdbcDataSource; import java.rmi.ServerException; import java.sql.Connection; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SysTimeDimensionBuilder.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SysTimeDimensionBuilder.java index bbcb53cfe..ca006c3d6 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SysTimeDimensionBuilder.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SysTimeDimensionBuilder.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.model.domain.utils; -import com.tencent.supersonic.headless.api.model.enums.DimensionTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.DimensionTypeEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.pojo.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.pojo.DimensionTimeTypeParams; import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DateInfoMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DateInfoMapper.java index c22ee4d90..ae69ba3a1 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DateInfoMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DateInfoMapper.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.headless.model.infrastructure.mapper; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; import com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO; +import org.apache.ibatis.annotations.Mapper; import java.util.List; -import org.apache.ibatis.annotations.Mapper; @Mapper public interface DateInfoMapper { diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DateInfoRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DateInfoRepositoryImpl.java index e1482a61d..fdc3fd606 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DateInfoRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DateInfoRepositoryImpl.java @@ -3,22 +3,23 @@ package com.tencent.supersonic.headless.model.infrastructure.repository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Stopwatch; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.model.request.DateInfoReq; import com.tencent.supersonic.common.pojo.Constants; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.request.DateInfoReq; import com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO; import com.tencent.supersonic.headless.model.domain.repository.DateInfoRepository; import com.tencent.supersonic.headless.model.infrastructure.mapper.DateInfoMapper; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + @Slf4j @Repository public class DateInfoRepositoryImpl implements DateInfoRepository { diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DatabaseController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DatabaseController.java index 943cbbd8e..5428771c1 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DatabaseController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DatabaseController.java @@ -2,10 +2,10 @@ package com.tencent.supersonic.headless.model.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.model.request.DatabaseReq; -import com.tencent.supersonic.headless.api.model.request.SqlExecuteReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.request.DatabaseReq; +import com.tencent.supersonic.headless.common.model.request.SqlExecuteReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.model.domain.DatabaseService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DimensionController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DimensionController.java index b0ed7cfa0..60d7f104c 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DimensionController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DimensionController.java @@ -5,11 +5,11 @@ import com.google.common.collect.Lists; 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.SensitiveLevelEnum; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.request.DimensionReq; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.request.DimensionReq; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DomainController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DomainController.java index 786f8389b..303d4635e 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DomainController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DomainController.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.model.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.model.request.DomainReq; -import com.tencent.supersonic.headless.api.model.request.DomainUpdateReq; -import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.request.DomainReq; +import com.tencent.supersonic.headless.common.model.request.DomainUpdateReq; +import com.tencent.supersonic.headless.common.model.response.DomainResp; import com.tencent.supersonic.headless.model.domain.DomainService; import java.util.Arrays; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/MetricController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/MetricController.java index 8d2f7e9c4..51829c509 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/MetricController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/MetricController.java @@ -6,12 +6,12 @@ import com.google.common.collect.Lists; 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.SensitiveLevelEnum; -import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.api.model.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.MetricReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.common.model.pojo.MetricQueryDefaultConfig; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.MetricReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.MetricResp; import com.tencent.supersonic.headless.model.domain.MetricService; import com.tencent.supersonic.headless.model.domain.pojo.MetricFilter; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelController.java index 69ff2fed3..5f9e7e002 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelController.java @@ -3,10 +3,10 @@ package com.tencent.supersonic.headless.model.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.model.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.model.request.ModelReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.common.model.request.ModelReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; import org.springframework.web.bind.annotation.RestController; diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ViewInfoController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ViewInfoController.java index 1d14c6f62..11d0c88e2 100644 --- a/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ViewInfoController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ViewInfoController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.model.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.model.request.ViewInfoReq; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaRelaResp; +import com.tencent.supersonic.headless.common.model.request.ViewInfoReq; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaRelaResp; import com.tencent.supersonic.headless.model.domain.dataobject.ViewInfoDO; import com.tencent.supersonic.headless.model.application.ViewInfoServiceImpl; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/model/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java b/headless/model/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java index 7a924ecc4..31bad6a16 100644 --- a/headless/model/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java +++ b/headless/model/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java @@ -5,15 +5,15 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserService; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.api.model.enums.DimensionTypeEnum; -import com.tencent.supersonic.headless.api.model.enums.IdentifyTypeEnum; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.pojo.DimensionTimeTypeParams; -import com.tencent.supersonic.headless.api.model.pojo.Identify; -import com.tencent.supersonic.headless.api.model.pojo.Measure; -import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.model.request.ModelReq; -import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.enums.DimensionTypeEnum; +import com.tencent.supersonic.headless.common.model.enums.IdentifyTypeEnum; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.pojo.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.common.model.pojo.Identify; +import com.tencent.supersonic.headless.common.model.pojo.Measure; +import com.tencent.supersonic.headless.common.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.common.model.request.ModelReq; +import com.tencent.supersonic.headless.common.model.response.ModelResp; import com.tencent.supersonic.headless.model.domain.DatabaseService; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.DomainService; diff --git a/headless/pom.xml b/headless/pom.xml index be458539c..c59b897d2 100644 --- a/headless/pom.xml +++ b/headless/pom.xml @@ -13,10 +13,11 @@ pom - api + common model query materialization + api diff --git a/headless/query/pom.xml b/headless/query/pom.xml index 4161abfa1..1c3621c6f 100644 --- a/headless/query/pom.xml +++ b/headless/query/pom.xml @@ -38,7 +38,7 @@ com.tencent.supersonic - headless-api + headless-common ${project.version} diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/S2SQLDataAspect.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/S2SQLDataAspect.java index 528285bc7..131d35c6c 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/S2SQLDataAspect.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/S2SQLDataAspect.java @@ -7,10 +7,10 @@ import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResource import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/StructDataAspect.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/StructDataAspect.java index f7ce39510..524ef9f0c 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/StructDataAspect.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/aspect/StructDataAspect.java @@ -7,10 +7,10 @@ import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResource import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/JdbcExecutor.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/JdbcExecutor.java index 1f1db78ed..5062b6317 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/JdbcExecutor.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/JdbcExecutor.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.executor; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.model.domain.utils.SqlUtils; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/QueryExecutor.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/QueryExecutor.java index a9a217aa3..10d704964 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/QueryExecutor.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/QueryExecutor.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.query.executor; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/DetailQuery.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/DetailQuery.java index 81d7d725b..71c58ca39 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/DetailQuery.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/DetailQuery.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.optimizer; import com.google.common.base.Strings; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.Objects; import java.util.stream.Collectors; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/QueryOptimizer.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/QueryOptimizer.java index 8734849e3..eea72a59b 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/QueryOptimizer.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/QueryOptimizer.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.query.optimizer; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; public interface QueryOptimizer { diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/QueryParser.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/QueryParser.java index fa40d0b28..fdd39047d 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/QueryParser.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/QueryParser.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.headless.query.parser; import com.tencent.supersonic.common.util.StringUtil; -import com.tencent.supersonic.headless.api.query.enums.AggOption; -import com.tencent.supersonic.headless.api.query.pojo.MetricTable; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.pojo.MetricTable; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.query.utils.ComponentFactory; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/SqlParser.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/SqlParser.java index b7b282b27..f97657ffd 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/SqlParser.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/SqlParser.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.query.parser; -import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.enums.AggOption; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/CalciteSqlParser.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/CalciteSqlParser.java index 45cc6f73d..203eea31f 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/CalciteSqlParser.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/CalciteSqlParser.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.parser.calcite; -import com.tencent.supersonic.headless.api.query.enums.AggOption; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.parser.SqlParser; import com.tencent.supersonic.headless.query.parser.calcite.planner.AggPlanner; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/HeadlessSchemaManager.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/HeadlessSchemaManager.java index a3b28ac74..304194226 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/HeadlessSchemaManager.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/HeadlessSchemaManager.java @@ -5,13 +5,13 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionTimeTypeParamsTpl; -import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.IdentifyYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MeasureYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricTypeParamsYamlTpl; -import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionTimeTypeParamsTpl; +import com.tencent.supersonic.headless.common.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.IdentifyYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MeasureYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricTypeParamsYamlTpl; +import com.tencent.supersonic.headless.common.model.yaml.MetricYamlTpl; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/AggPlanner.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/AggPlanner.java index b5478911c..f238113cf 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/AggPlanner.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/AggPlanner.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.query.parser.calcite.planner; -import com.tencent.supersonic.headless.api.query.enums.AggOption; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.query.parser.calcite.Configuration; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/MaterializationPlanner.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/MaterializationPlanner.java index a6cf604f1..da33bbf68 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/MaterializationPlanner.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/MaterializationPlanner.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.query.parser.calcite.planner; import com.tencent.supersonic.common.util.calcite.SqlParseUtils; -import com.tencent.supersonic.headless.api.query.enums.AggOption; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.query.parser.calcite.Configuration; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/Planner.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/Planner.java index 190727468..ff86376f7 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/Planner.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/Planner.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.parser.calcite.planner; -import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.enums.AggOption; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Renderer.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Renderer.java index c3855398e..096c67fe5 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Renderer.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Renderer.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.parser.calcite.sql; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Measure; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DataSourceNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DataSourceNode.java index 19aadeab3..b8672fa4c 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DataSourceNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DataSourceNode.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.query.parser.calcite.sql.node; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.query.parser.calcite.Configuration; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/FilterRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/FilterRender.java index df357774c..bd5a3d45d 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/FilterRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/FilterRender.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.query.parser.calcite.sql.node.FilterNode; import com.tencent.supersonic.headless.query.parser.calcite.sql.node.MetricNode; import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/JoinRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/JoinRender.java index f8535df12..9ddc56318 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/JoinRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/JoinRender.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization.TimePartType; import com.tencent.supersonic.headless.query.parser.calcite.sql.node.AggFunctionNode; import com.tencent.supersonic.headless.query.parser.calcite.sql.node.DataSourceNode; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/OutputRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/OutputRender.java index 0500601c0..c835599db 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/OutputRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/OutputRender.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.common.pojo.ColumnOrder; import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; import com.tencent.supersonic.headless.query.parser.calcite.sql.Renderer; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/SourceRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/SourceRender.java index 1ae046df7..e78b7dee6 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/SourceRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/SourceRender.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/CalculateAggConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/CalculateAggConverter.java index 960e140de..53bb22a32 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/CalculateAggConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/CalculateAggConverter.java @@ -6,11 +6,11 @@ import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.query.enums.AggOption; -import com.tencent.supersonic.headless.api.query.pojo.MetricTable; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.pojo.MetricTable; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.model.domain.pojo.EngineTypeEnum; import com.tencent.supersonic.headless.query.parser.HeadlessConverter; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/DefaultDimValueConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/DefaultDimValueConverter.java index 7296dcee9..85c759a6b 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/DefaultDimValueConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/DefaultDimValueConverter.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.parser.HeadlessConverter; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/MetricCheckConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/MetricCheckConverter.java index 32ce15217..d3094c607 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/MetricCheckConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/MetricCheckConverter.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.parser.HeadlessConverter; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ParserDefaultConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ParserDefaultConverter.java index 3f9a3aec4..3cd953d4a 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ParserDefaultConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ParserDefaultConverter.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.ColumnOrder; -import com.tencent.supersonic.headless.api.query.pojo.Param; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.pojo.Param; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.parser.HeadlessConverter; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/QueryReqConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/QueryReqConverter.java index a5acdfead..d5fc82d33 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/QueryReqConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/QueryReqConverter.java @@ -9,15 +9,15 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.model.request.SqlExecuteReq; -import com.tencent.supersonic.headless.api.model.response.DatabaseResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.query.enums.AggOption; -import com.tencent.supersonic.headless.api.query.pojo.MetricTable; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.request.SqlExecuteReq; +import com.tencent.supersonic.headless.common.model.response.DatabaseResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.query.enums.AggOption; +import com.tencent.supersonic.headless.common.query.pojo.MetricTable; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ZipperModelConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ZipperModelConverter.java index adc5d4796..3752f7e7b 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ZipperModelConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ZipperModelConverter.java @@ -1,10 +1,10 @@ package com.tencent.supersonic.headless.query.parser.convert; -import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.parser.HeadlessConverter; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/mapper/StatMapper.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/mapper/StatMapper.java index e26a4633c..74bf6fdb0 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/mapper/StatMapper.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/mapper/StatMapper.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.query.persistence.mapper; -import com.tencent.supersonic.headless.api.model.pojo.QueryStat; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.model.pojo.QueryStat; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/QueryStatement.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/QueryStatement.java index 21deeabe0..e7a5a6707 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/QueryStatement.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/QueryStatement.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.query.persistence.pojo; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import lombok.Data; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepository.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepository.java index 327fb0c1c..0d218bef6 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepository.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepository.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.query.persistence.repository; -import com.tencent.supersonic.headless.api.model.pojo.QueryStat; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; -import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.common.model.pojo.QueryStat; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.query.response.ItemUseResp; import java.util.List; public interface StatRepository { diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepositoryImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepositoryImpl.java index ce95650c0..ba89d7b76 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepositoryImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepositoryImpl.java @@ -3,9 +3,9 @@ package com.tencent.supersonic.headless.query.persistence.repository; import static com.tencent.supersonic.common.pojo.Constants.AT_SYMBOL; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tencent.supersonic.headless.api.model.pojo.QueryStat; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; -import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.common.model.pojo.QueryStat; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.query.response.ItemUseResp; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.headless.query.persistence.mapper.StatMapper; import java.util.ArrayList; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/ApiQueryController.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/ApiQueryController.java deleted file mode 100644 index 1d1d254a1..000000000 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/ApiQueryController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.tencent.supersonic.headless.query.rest; - -import com.tencent.supersonic.headless.api.query.request.QueryApiPreviewReq; -import com.tencent.supersonic.headless.api.query.request.QueryApiReq; -import com.tencent.supersonic.headless.api.query.response.ApiQueryResultResp; -import com.tencent.supersonic.headless.query.service.ApiQueryService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.HttpServletRequest; - -@RestController -@RequestMapping("/api/semantic/apiQuery") -@Slf4j -public class ApiQueryController { - - @Autowired - private ApiQueryService apiQueryService; - - @PostMapping("/preview") - public ApiQueryResultResp preview(@RequestBody QueryApiPreviewReq queryApiReq) throws Exception { - return apiQueryService.preview(queryApiReq); - } - - @PostMapping("/query") - public ApiQueryResultResp query(@RequestBody QueryApiReq queryApiReq, HttpServletRequest request) throws Exception { - return apiQueryService.query(queryApiReq, request); - } - -} diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/QueryController.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/QueryController.java index 725351898..e32a7ec84 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/QueryController.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/QueryController.java @@ -3,20 +3,20 @@ package com.tencent.supersonic.headless.query.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.headless.api.model.response.ExplainResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.model.response.SqlParserResp; -import com.tencent.supersonic.headless.api.query.request.BatchDownloadReq; -import com.tencent.supersonic.headless.api.query.request.DownloadStructReq; -import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; -import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.common.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.common.model.response.ExplainResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.response.SqlParserResp; +import com.tencent.supersonic.headless.common.query.request.BatchDownloadReq; +import com.tencent.supersonic.headless.common.query.request.DownloadStructReq; +import com.tencent.supersonic.headless.common.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.response.ItemUseResp; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.query.service.DownloadService; import com.tencent.supersonic.headless.query.service.QueryService; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/SchemaController.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/SchemaController.java index a1c449aad..1b5cf9872 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/SchemaController.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/SchemaController.java @@ -4,14 +4,14 @@ import com.github.pagehelper.PageInfo; 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.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; import com.tencent.supersonic.headless.query.service.SchemaService; import java.util.List; import javax.servlet.http.HttpServletRequest; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryService.java deleted file mode 100644 index 6ee9dcd50..000000000 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.tencent.supersonic.headless.query.service; - -import com.tencent.supersonic.headless.api.query.request.QueryApiPreviewReq; -import com.tencent.supersonic.headless.api.query.request.QueryApiReq; -import com.tencent.supersonic.headless.api.query.response.ApiQueryResultResp; -import com.tencent.supersonic.headless.query.annotation.ApiDataPermission; - -import javax.servlet.http.HttpServletRequest; - -public interface ApiQueryService { - - ApiQueryResultResp preview(QueryApiPreviewReq queryApiReq) throws Exception; - - @ApiDataPermission - ApiQueryResultResp query(QueryApiReq queryApiReq, HttpServletRequest request) throws Exception; -} diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryServiceImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryServiceImpl.java deleted file mode 100644 index 9c6f99e77..000000000 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/ApiQueryServiceImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.tencent.supersonic.headless.query.service; - -import com.google.common.collect.Lists; -import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.common.pojo.Aggregator; -import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.headless.api.model.pojo.Item; -import com.tencent.supersonic.headless.api.model.response.AppDetailResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.pojo.ApiQuerySingleResult; -import com.tencent.supersonic.headless.api.query.request.QueryApiPreviewReq; -import com.tencent.supersonic.headless.api.query.request.QueryApiReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; -import com.tencent.supersonic.headless.api.query.response.ApiQueryResultResp; -import com.tencent.supersonic.headless.model.domain.AppService; -import com.tencent.supersonic.headless.model.domain.DimensionService; -import com.tencent.supersonic.headless.model.domain.MetricService; -import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; -import com.tencent.supersonic.headless.query.annotation.ApiDataPermission; -import com.tencent.supersonic.headless.query.aspect.ApiDataAspect; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * Api service for other apps - * The current version defaults to query metrics data. - */ -@Service -public class ApiQueryServiceImpl implements ApiQueryService { - - private static final long result_size = 10000; - - private AppService appService; - - private MetricService metricService; - - private DimensionService dimensionService; - - private QueryService queryService; - - public ApiQueryServiceImpl(AppService appService, - MetricService metricService, - DimensionService dimensionService, - QueryService queryService) { - this.appService = appService; - this.metricService = metricService; - this.dimensionService = dimensionService; - this.queryService = queryService; - } - - @Override - public ApiQueryResultResp preview(QueryApiPreviewReq queryApiReq) throws Exception { - Item item = queryApiReq.getItem(); - ApiQuerySingleResult apiQuerySingleResult = query(item, queryApiReq.getDateConf()); - return ApiQueryResultResp.builder().results(Lists.newArrayList(apiQuerySingleResult)).build(); - } - - public ApiQuerySingleResult query(Item item, DateConf dateConf) throws Exception { - MetricResp metricResp = metricService.getMetric(item.getId()); - List items = item.getRelateItems(); - List dimensionResps = Lists.newArrayList(); - if (!CollectionUtils.isEmpty(items)) { - List ids = items.stream().map(Item::getId).collect(Collectors.toList()); - DimensionFilter dimensionFilter = new DimensionFilter(); - dimensionFilter.setIds(ids); - dimensionResps = dimensionService.getDimensions(dimensionFilter); - } - QueryStructReq queryStructReq = buildQueryStructReq(dimensionResps, metricResp, dateConf); - QueryResultWithSchemaResp queryResultWithSchemaResp = - queryService.queryByStruct(queryStructReq, User.getAppUser(0)); - ApiQuerySingleResult apiQuerySingleResult = new ApiQuerySingleResult(); - apiQuerySingleResult.setItem(item); - apiQuerySingleResult.setResult(queryResultWithSchemaResp); - return apiQuerySingleResult; - } - - @Override - @ApiDataPermission - public ApiQueryResultResp query(QueryApiReq queryApiReq, HttpServletRequest request) throws Exception { - int appId = Integer.parseInt(request.getHeader(ApiDataAspect.APPID)); - AppDetailResp appDetailResp = appService.getApp(appId); - Set idsInApp = appDetailResp.getConfig().getItems().stream() - .map(Item::getId).collect(Collectors.toSet()); - if (!idsInApp.containsAll(queryApiReq.getIds())) { - throw new InvalidArgumentException("查询范围超过应用申请范围, 请检查"); - } - List results = Lists.newArrayList(); - Map map = appDetailResp.getConfig().getItems().stream() - .collect(Collectors.toMap(Item::getId, i -> i)); - for (Long id : queryApiReq.getIds()) { - Item item = map.get(id); - ApiQuerySingleResult apiQuerySingleResult = query(item, queryApiReq.getDateConf()); - results.add(apiQuerySingleResult); - } - return ApiQueryResultResp.builder().results(results).build(); - } - - private QueryStructReq buildQueryStructReq(List dimensionResps, - MetricResp metricResp, DateConf dateConf) { - Set modelIds = dimensionResps.stream().map(DimensionResp::getModelId).collect(Collectors.toSet()); - modelIds.add(metricResp.getModelId()); - QueryStructReq queryStructReq = new QueryStructReq(); - queryStructReq.setGroups(dimensionResps.stream() - .map(DimensionResp::getBizName).collect(Collectors.toList())); - queryStructReq.getGroups().add(0, getTimeDimension(dateConf)); - Aggregator aggregator = new Aggregator(); - aggregator.setColumn(metricResp.getBizName()); - queryStructReq.setAggregators(Lists.newArrayList(aggregator)); - queryStructReq.setDateInfo(dateConf); - queryStructReq.setModelIds(modelIds); - queryStructReq.setLimit(result_size); - return queryStructReq; - } - - private String getTimeDimension(DateConf dateConf) { - if (Constants.MONTH.equals(dateConf.getPeriod())) { - return TimeDimensionEnum.MONTH.getName(); - } else if (Constants.WEEK.equals(dateConf.getPeriod())) { - return TimeDimensionEnum.WEEK.getName(); - } else { - return TimeDimensionEnum.DAY.getName(); - } - } - -} diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/AuthCommonService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/AuthCommonService.java index 6fe835b11..c4e1436c5 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/AuthCommonService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/AuthCommonService.java @@ -16,10 +16,10 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.MetricService; import com.tencent.supersonic.headless.model.domain.ModelService; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadService.java index ff8cdb698..a17baf21e 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadService.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.query.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.query.request.BatchDownloadReq; -import com.tencent.supersonic.headless.api.query.request.DownloadStructReq; +import com.tencent.supersonic.headless.common.query.request.BatchDownloadReq; +import com.tencent.supersonic.headless.common.query.request.DownloadStructReq; import javax.servlet.http.HttpServletResponse; public interface DownloadService { diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadServiceImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadServiceImpl.java index f0e33bb94..447689ac8 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadServiceImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadServiceImpl.java @@ -12,17 +12,17 @@ import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateUtils; -import com.tencent.supersonic.headless.api.model.enums.SemanticTypeEnum; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.pojo.DataDownload; -import com.tencent.supersonic.headless.api.query.request.BatchDownloadReq; -import com.tencent.supersonic.headless.api.query.request.DownloadStructReq; +import com.tencent.supersonic.headless.common.model.enums.SemanticTypeEnum; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.pojo.DataDownload; +import com.tencent.supersonic.headless.common.query.request.BatchDownloadReq; +import com.tencent.supersonic.headless.common.query.request.DownloadStructReq; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.query.utils.DataTransformUtils; import lombok.extern.slf4j.Slf4j; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngine.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngine.java index 080b50c68..d06390181 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngine.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngine.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.query.service; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.query.executor.QueryExecutor; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngineImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngineImpl.java index ec6989415..4ead0ef82 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngineImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngineImpl.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.query.service; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.query.executor.QueryExecutor; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryService.java index 803beb0e5..fe8c097fd 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryService.java @@ -1,16 +1,16 @@ package com.tencent.supersonic.headless.query.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.model.response.ExplainResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; -import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.common.model.response.ExplainResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.response.ItemUseResp; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.List; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryServiceImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryServiceImpl.java index d3977d342..54a761760 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryServiceImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryServiceImpl.java @@ -9,23 +9,23 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.cache.CacheUtils; -import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.headless.api.model.pojo.Dim; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.ExplainResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.pojo.Cache; -import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; -import com.tencent.supersonic.headless.api.query.request.MetricReq; -import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; -import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.common.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.common.model.pojo.Dim; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.ExplainResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.pojo.Cache; +import com.tencent.supersonic.headless.common.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.query.request.MetricReq; +import com.tencent.supersonic.headless.common.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.response.ItemUseResp; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.query.executor.QueryExecutor; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaService.java index b3b0efe9d..bf20c5527 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaService.java @@ -3,14 +3,14 @@ package com.tencent.supersonic.headless.query.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; import java.util.List; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaServiceImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaServiceImpl.java index 5f3314279..b28f9c163 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaServiceImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaServiceImpl.java @@ -4,18 +4,18 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.model.request.PageMetricReq; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.DomainResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.model.response.ModelResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; -import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.common.model.request.PageMetricReq; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.DomainResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.query.response.ItemUseResp; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.DomainService; import com.tencent.supersonic.headless.model.domain.MetricService; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DimValueAspect.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DimValueAspect.java index fca0ba2a0..1c554179d 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DimValueAspect.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DimValueAspect.java @@ -8,11 +8,11 @@ import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.DimensionService; import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import lombok.extern.slf4j.Slf4j; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryStructUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryStructUtils.java index 236068fec..f9091cd42 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryStructUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryStructUtils.java @@ -20,17 +20,17 @@ import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserRemoveHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.common.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.model.domain.pojo.EngineTypeEnum; import com.tencent.supersonic.headless.query.service.SchemaService; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryUtils.java index 63f4377dc..05617606d 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryUtils.java @@ -8,11 +8,11 @@ import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.cache.CacheUtils; -import com.tencent.supersonic.headless.api.model.enums.SemanticTypeEnum; -import com.tencent.supersonic.headless.api.model.response.DimensionResp; -import com.tencent.supersonic.headless.api.model.response.MetricResp; -import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.common.model.enums.SemanticTypeEnum; +import com.tencent.supersonic.headless.common.model.response.DimensionResp; +import com.tencent.supersonic.headless.common.model.response.MetricResp; +import com.tencent.supersonic.headless.common.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.common.query.request.QueryMultiStructReq; import com.tencent.supersonic.headless.model.domain.Catalog; import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.Arrays; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/SqlGenerateUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/SqlGenerateUtils.java index 4d2d19c80..10aed2480 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/SqlGenerateUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/SqlGenerateUtils.java @@ -5,7 +5,7 @@ import static com.tencent.supersonic.common.pojo.Constants.JOIN_UNDERLINE; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/StatUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/StatUtils.java index baf3ff48c..4f7641bfa 100644 --- a/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/StatUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/StatUtils.java @@ -7,16 +7,16 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.SqlFilterUtils; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.model.enums.QueryOptMode; -import com.tencent.supersonic.headless.api.model.enums.QueryTypeBackEnum; -import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.headless.api.model.pojo.QueryStat; -import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.query.request.ItemUseReq; -import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.api.query.request.QueryStructReq; -import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.common.model.enums.QueryOptMode; +import com.tencent.supersonic.headless.common.model.enums.QueryTypeBackEnum; +import com.tencent.supersonic.headless.common.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.common.model.pojo.QueryStat; +import com.tencent.supersonic.headless.common.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.common.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.common.query.request.ItemUseReq; +import com.tencent.supersonic.headless.common.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.common.query.request.QueryStructReq; +import com.tencent.supersonic.headless.common.query.response.ItemUseResp; import com.tencent.supersonic.headless.model.domain.ModelService; import com.tencent.supersonic.headless.query.persistence.repository.StatRepository; import lombok.extern.slf4j.Slf4j; diff --git a/headless/query/src/main/resources/mapper/StatMapper.xml b/headless/query/src/main/resources/mapper/StatMapper.xml index 3f41c3ac2..fe40a6cc3 100644 --- a/headless/query/src/main/resources/mapper/StatMapper.xml +++ b/headless/query/src/main/resources/mapper/StatMapper.xml @@ -5,7 +5,7 @@ + type="com.tencent.supersonic.headless.common.model.pojo.QueryStat"> @@ -55,7 +55,7 @@