[improvement][headless] Merge struct and SQL query code, unify the queries. (#680)

chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityInternalDetail.java

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.chat.core.config;
 
 
-import com.tencent.supersonic.headless.api.response.DimSchemaResp;
-import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
 import java.util.List;
 import lombok.Data;
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/BaseSemanticInterpreter.java

@@ -3,7 +3,7 @@ package com.tencent.supersonic.chat.core.knowledge.semantic;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.tencent.supersonic.chat.api.pojo.ModelSchema;
-import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

chat/core/src/main/java/com/tencent/supersonic/chat/core/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.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq;
-import com.tencent.supersonic.headless.api.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.request.PageMetricReq;
-import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
-import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.response.DimensionResp;
-import com.tencent.supersonic.headless.api.response.DomainResp;
-import com.tencent.supersonic.headless.api.response.ExplainResp;
-import com.tencent.supersonic.headless.api.response.MetricResp;
-import com.tencent.supersonic.headless.api.response.ModelResp;
-import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
+import com.tencent.supersonic.headless.api.pojo.response.ExplainResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.server.service.DimensionService;
 import com.tencent.supersonic.headless.server.service.MetricService;
 import com.tencent.supersonic.headless.server.service.QueryService;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java

@@ -9,9 +9,9 @@ import com.tencent.supersonic.chat.api.pojo.SchemaValueMap;
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;
 import com.tencent.supersonic.headless.api.pojo.RelateDimension;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
-import com.tencent.supersonic.headless.api.response.DimSchemaResp;
-import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
-import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.CollectionUtils;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/RemoteSemanticInterpreter.java

@@ -20,21 +20,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.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq;
-import com.tencent.supersonic.headless.api.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.request.PageMetricReq;
-import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
-import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.response.DimensionResp;
-import com.tencent.supersonic.headless.api.response.DomainResp;
-import com.tencent.supersonic.headless.api.response.ExplainResp;
-import com.tencent.supersonic.headless.api.response.MetricResp;
-import com.tencent.supersonic.headless.api.response.ModelResp;
-import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
+import com.tencent.supersonic.headless.api.pojo.response.ExplainResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;

chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/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.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.request.PageMetricReq;
-import com.tencent.supersonic.headless.api.response.DomainResp;
-import com.tencent.supersonic.headless.api.response.DimensionResp;
-import com.tencent.supersonic.headless.api.response.ExplainResp;
-import com.tencent.supersonic.headless.api.response.MetricResp;
-import com.tencent.supersonic.headless.api.response.ModelResp;
-import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.api.request.QueryDimValueReq;
-import com.tencent.supersonic.headless.api.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.ExplainResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq;
+import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 
 import java.util.List;
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMRequestService.java

@@ -25,7 +25,7 @@ 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.headless.api.pojo.SchemaItem;
-import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/BaseSemanticQuery.java

@@ -14,11 +14,11 @@ import com.tencent.supersonic.common.pojo.Filter;
 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.headless.api.enums.QueryType;
-import com.tencent.supersonic.headless.api.request.ExplainSqlReq;
-import com.tencent.supersonic.headless.api.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.response.ExplainResp;
+import com.tencent.supersonic.headless.api.pojo.enums.QueryType;
+import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.ExplainResp;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/MetricAnalyzeQuery.java

@@ -19,8 +19,8 @@ import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/s2sql/LLMSqlQuery.java

@@ -11,8 +11,8 @@ import com.tencent.supersonic.chat.core.utils.QueryReqBuilder;
 import com.tencent.supersonic.chat.core.query.QueryManager;
 import com.tencent.supersonic.chat.core.query.llm.LLMSemanticQuery;
 import com.tencent.supersonic.common.pojo.QueryColumn;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/RuleSemanticQuery.java

@@ -22,9 +22,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.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

chat/core/src/main/java/com/tencent/supersonic/chat/core/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.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;

chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricSemanticQuery.java

@@ -35,8 +35,8 @@ import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 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.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import java.text.DecimalFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;

chat/core/src/main/java/com/tencent/supersonic/chat/core/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.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;

chat/core/src/main/java/com/tencent/supersonic/chat/core/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.response.SemanticQueryResp;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;

chat/core/src/main/java/com/tencent/supersonic/chat/core/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.request.QueryMultiStructReq;
-import com.tencent.supersonic.headless.api.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java

@@ -12,12 +12,12 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp;
 import com.tencent.supersonic.chat.core.utils.ComponentFactory;
 import com.tencent.supersonic.chat.server.service.ConfigService;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
-import com.tencent.supersonic.headless.api.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.request.PageMetricReq;
-import com.tencent.supersonic.headless.api.response.DimensionResp;
-import com.tencent.supersonic.headless.api.response.DomainResp;
-import com.tencent.supersonic.headless.api.response.MetricResp;
-import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/SemanticService.java

@@ -26,8 +26,8 @@ import com.tencent.supersonic.common.pojo.ModelCluster;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.util.ContextUtils;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collections;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java

@@ -32,8 +32,8 @@ import com.tencent.supersonic.chat.server.service.ConfigService;
 import com.tencent.supersonic.chat.server.service.SemanticService;
 import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
-import com.tencent.supersonic.headless.api.response.DimensionResp;
-import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.service.DimensionService;
 import com.tencent.supersonic.headless.server.service.MetricService;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java

@@ -16,7 +16,7 @@ import com.tencent.supersonic.chat.server.persistence.repository.PluginRepositor
 import com.tencent.supersonic.chat.server.service.PluginService;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java

@@ -63,8 +63,8 @@ import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserRemoveHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;

chat/server/src/main/java/com/tencent/supersonic/chat/server/util/DictMetaHelper.java

@@ -17,8 +17,8 @@ import com.tencent.supersonic.chat.core.knowledge.DimValue2DictCommand;
 import com.tencent.supersonic.chat.core.knowledge.semantic.SemanticInterpreter;
 import com.tencent.supersonic.chat.server.persistence.dataobject.DimValueDO;
 import com.tencent.supersonic.chat.server.service.ConfigService;
-import com.tencent.supersonic.headless.api.request.PageDimensionReq;
-import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;

chat/server/src/test/java/com/tencent/supersonic/chat/server/test/context/MockBeansConfiguration.java

@@ -15,11 +15,11 @@ import com.tencent.supersonic.chat.server.service.ChatService;
 import com.tencent.supersonic.chat.server.service.QueryService;
 import com.tencent.supersonic.chat.server.service.impl.ConfigServiceImpl;
 import com.tencent.supersonic.common.pojo.Constants;
-import com.tencent.supersonic.headless.api.response.DimSchemaResp;
-import com.tencent.supersonic.headless.api.response.DimensionResp;
-import com.tencent.supersonic.headless.api.response.MetricResp;
-import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
-import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
+import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
+import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp;
 import com.tencent.supersonic.headless.server.pojo.DimensionFilter;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.service.DimensionService;

chat/server/src/test/java/com/tencent/supersonic/chat/server/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.request.QuerySqlReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

common/src/main/java/com/tencent/supersonic/common/pojo/Parameter.java

@@ -16,15 +16,6 @@ public class Parameter {
     private String dataType;
     private String module;
     private List<Object> candidateValues;
-
-    public Parameter(String name, String value, String comment, String dataType, String module) {
-        this.name = name;
-        this.value = value;
-        this.comment = comment;
-        this.dataType = dataType;
-        this.module = module;
-    }
-
     public Parameter(String name, String value, String comment, String description, String dataType, String module) {
         this.name = name;
         this.value = value;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.api.pojo;
 
-import com.tencent.supersonic.headless.api.enums.AggOption;
+import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
 import lombok.Data;
 
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.api.enums.DimensionType;
+import com.tencent.supersonic.headless.api.pojo.enums.DimensionType;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.api.pojo;
 
 
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import lombok.Data;
 
 @Data

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AggOption.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 /**
  * Aggregation type of metric when query metric without aggregation method

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AppStatus.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 public enum AppStatus {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DataType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 
 import com.tencent.supersonic.common.pojo.Constants;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DatasourceQuery.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 /**
  * model datasource define type:

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DimensionType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 
 public enum DimensionType {

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/EngineType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 
 public enum EngineType {

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/IdentifyType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 public enum IdentifyType {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricDefineType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 public enum MetricDefineType {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 
 import com.tencent.supersonic.headless.api.pojo.MeasureParam;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/ModelSourceType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 import java.util.Objects;
 /**

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryOptMode.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 public enum QueryOptMode {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 
 public enum QueryType {

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryTypeBack.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 
 public enum QueryTypeBack {

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/SemanticType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.enums;
+package com.tencent.supersonic.headless.api.pojo.enums;
 
 public enum SemanticType {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppQueryReq.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.PageBaseReq;
-import com.tencent.supersonic.headless.api.enums.AppStatus;
+import com.tencent.supersonic.headless.api.pojo.enums.AppStatus;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import com.tencent.supersonic.headless.api.pojo.AppConfig;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/BatchDownloadReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DatabaseReq.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.api.enums.DataType;
+import com.tencent.supersonic.headless.api.pojo.enums.DataType;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DateInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import java.util.ArrayList;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
 import com.tencent.supersonic.headless.api.pojo.DimValueMap;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainUpdateReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DownloadStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ExplainSqlReq.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
-import com.tencent.supersonic.headless.api.enums.QueryType;
+import com.tencent.supersonic.headless.api.pojo.enums.QueryType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/FieldRemovedReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import lombok.Data;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemUseReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import java.util.List;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetaBatchReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import lombok.Data;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricBaseReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.DataFormat;
 import com.tencent.supersonic.headless.api.pojo.RelateDimension;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricQueryReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.ColumnOrder;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricReq.java

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tencent.supersonic.headless.api.enums.MetricDefineType;
-import com.tencent.supersonic.headless.api.enums.MetricType;
+import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType;
+import com.tencent.supersonic.headless.api.pojo.enums.MetricType;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelReq.java

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 
 import com.google.common.collect.Lists;
+import com.tencent.supersonic.headless.api.pojo.Dim;
 import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
 import com.tencent.supersonic.headless.api.pojo.ModelDetail;
-import com.tencent.supersonic.headless.api.pojo.Dim;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaFilterReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageDimensionReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageMetricReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageSchemaItemReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.PageBaseReq;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ParseSqlReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import java.util.HashMap;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDimValueReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryMultiStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.alibaba.fastjson.JSONObject;
 import com.tencent.supersonic.headless.api.pojo.Cache;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QuerySqlReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.Aggregator;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SemanticQueryReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.headless.api.pojo.Cache;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 
 import javax.validation.constraints.NotBlank;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ViewInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.request;
+package com.tencent.supersonic.headless.api.pojo.request;
 
 import java.util.Date;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppDetailResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppResp.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;
-import com.tencent.supersonic.headless.api.enums.AppStatus;
+import com.tencent.supersonic.headless.api.pojo.enums.AppStatus;
 import com.tencent.supersonic.headless.api.pojo.AppConfig;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DatabaseResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimensionResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DomainResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ExplainResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemQueryResultResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import com.tencent.supersonic.headless.api.pojo.SingleItemQueryResult;
 import lombok.Builder;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemUseResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MeasureResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricResp.java

@@ -1,15 +1,15 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.DataFormat;
-import com.tencent.supersonic.headless.api.enums.MetricDefineType;
 import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.RelateDimension;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams;
 import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams;
-import com.tencent.supersonic.headless.api.pojo.RelateDimension;
-import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
 import org.apache.commons.collections.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.headless.api.pojo.Dim;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaRelaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import com.tencent.supersonic.common.pojo.ModelRela;
 import com.tencent.supersonic.headless.api.pojo.Identify;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SemanticQueryResp.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.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.enums.SemanticType;
 import com.tencent.supersonic.headless.api.pojo.QueryResult;
+import com.tencent.supersonic.headless.api.pojo.enums.SemanticType;
 import lombok.Data;
 import lombok.ToString;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SqlParserResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/UnAvailableItemResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.api.response;
+package com.tencent.supersonic.headless.api.pojo.response;
 
 import lombok.Builder;
 import lombok.Data;

headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.adaptor.db;
 
-import com.tencent.supersonic.headless.api.enums.EngineType;
+import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 
 import java.util.HashMap;
 import java.util.Map;

headless/core/src/main/java/com/tencent/supersonic/headless/core/cache/QueryCache.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.cache;
 
 
 import com.tencent.supersonic.headless.api.pojo.Cache;
-import com.tencent.supersonic.headless.api.request.SemanticQueryReq;
+import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;

headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.executor;
 
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.core.pojo.Database;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.core.utils.SqlUtils;

headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.executor;
 
-import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 
 /**

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java

@@ -2,12 +2,12 @@ package com.tencent.supersonic.headless.core.parser;
 
 import com.google.common.base.Strings;
 import com.tencent.supersonic.common.util.StringUtil;
-import com.tencent.supersonic.headless.api.enums.AggOption;
+import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
-import com.tencent.supersonic.headless.api.request.MetricQueryReq;
-import com.tencent.supersonic.headless.api.request.ParseSqlReq;
-import com.tencent.supersonic.headless.api.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.request.SqlExecuteReq;
+import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq;
+import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq;
+import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
+import com.tencent.supersonic.headless.api.pojo.request.SqlExecuteReq;
 import com.tencent.supersonic.headless.core.parser.converter.HeadlessConverter;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.core.utils.ComponentFactory;

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.parser;
 
-import com.tencent.supersonic.headless.api.enums.AggOption;
+import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 
 public interface SqlParser {

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.headless.core.parser.calcite;
 
-import com.tencent.supersonic.headless.api.enums.AggOption;
-import com.tencent.supersonic.headless.api.enums.EngineType;
-import com.tencent.supersonic.headless.api.request.MetricQueryReq;
+import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
+import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq;
 import com.tencent.supersonic.headless.core.parser.SqlParser;
 import com.tencent.supersonic.headless.core.parser.calcite.planner.AggPlanner;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel;

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/Configuration.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.core.parser.calcite;
 
 
-import com.tencent.supersonic.headless.api.enums.EngineType;
+import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlTypeFactoryImpl;
 import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlDialect;
 import com.tencent.supersonic.headless.core.parser.calcite.schema.ViewExpanderImpl;

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java

@@ -1,9 +1,9 @@
 package com.tencent.supersonic.headless.core.parser.calcite.planner;
 
 
-import com.tencent.supersonic.headless.api.enums.AggOption;
-import com.tencent.supersonic.headless.api.enums.EngineType;
-import com.tencent.supersonic.headless.api.request.MetricQueryReq;
+import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
+import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq;
 import com.tencent.supersonic.headless.core.parser.calcite.Configuration;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;