diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java index b81973bf8..ad93bf790 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java @@ -85,7 +85,7 @@ public class QueryRecommendProcessor implements ParseResultProcessor { ChatQueryRepository chatQueryRepository = ContextUtils.getBean(ChatQueryRepository.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("question_id", chatQueryDO.getQuestionId()); - updateWrapper.set("parse_time_cost", chatQueryDO.getSimilarQueries()); + updateWrapper.set("similar_queries", chatQueryDO.getSimilarQueries()); chatQueryRepository.updateChatQuery(chatQueryDO, updateWrapper); } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeDefaultConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeDefaultConfig.java index 72eb229fd..0d6dc4c90 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeDefaultConfig.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeDefaultConfig.java @@ -1,10 +1,13 @@ package com.tencent.supersonic.headless.api.pojo; +import com.tencent.supersonic.common.pojo.Constants; +import com.tencent.supersonic.common.pojo.enums.TimeMode; import lombok.Data; @Data public class MetricTypeDefaultConfig { - private TimeDefaultConfig timeDefaultConfig; + private TimeDefaultConfig timeDefaultConfig = + new TimeDefaultConfig(7, Constants.DAY, TimeMode.RECENT); } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TagTypeDefaultConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TagTypeDefaultConfig.java index f0a074364..f9e72821c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TagTypeDefaultConfig.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TagTypeDefaultConfig.java @@ -8,6 +8,6 @@ public class TagTypeDefaultConfig { private DefaultDisplayInfo defaultDisplayInfo; //default time to filter tag selection results - private TimeDefaultConfig timeDefaultConfig; + private TimeDefaultConfig timeDefaultConfig = new TimeDefaultConfig(); } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TimeDefaultConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TimeDefaultConfig.java index d0eb71b07..c1ae17aa6 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TimeDefaultConfig.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TimeDefaultConfig.java @@ -3,9 +3,13 @@ package com.tencent.supersonic.headless.api.pojo; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.TimeMode; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@AllArgsConstructor +@NoArgsConstructor public class TimeDefaultConfig { @@ -22,5 +26,4 @@ public class TimeDefaultConfig { private TimeMode timeMode = TimeMode.LAST; - } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DataSetReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DataSetReq.java index 95c934cfd..f9d7c7dd4 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DataSetReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DataSetReq.java @@ -3,9 +3,10 @@ package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.headless.api.pojo.DataSetDetail; import com.tencent.supersonic.headless.api.pojo.QueryConfig; import com.tencent.supersonic.headless.api.pojo.SchemaItem; -import java.util.List; import lombok.Data; +import java.util.List; + @Data public class DataSetReq extends SchemaItem { @@ -15,7 +16,7 @@ public class DataSetReq extends SchemaItem { private String alias; - private QueryConfig queryConfig; + private QueryConfig queryConfig = new QueryConfig(); private List admins; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java index c701b89de..aaf50afe0 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DataSetResp.java @@ -5,12 +5,13 @@ import com.tencent.supersonic.headless.api.pojo.DataSetDetail; import com.tencent.supersonic.headless.api.pojo.DataSetModelConfig; import com.tencent.supersonic.headless.api.pojo.QueryConfig; import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import lombok.Data; +import org.springframework.util.CollectionUtils; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import lombok.Data; -import org.springframework.util.CollectionUtils; @Data public class DataSetResp extends SchemaItem { @@ -27,7 +28,7 @@ public class DataSetResp extends SchemaItem { private List adminOrgs = new ArrayList<>(); - private QueryConfig queryConfig; + private QueryConfig queryConfig = new QueryConfig(); private List allMetrics = new ArrayList<>(); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/QueryTypeParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/QueryTypeParser.java index 53c298ea0..c92c8ea61 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/QueryTypeParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/parser/QueryTypeParser.java @@ -47,7 +47,7 @@ public class QueryTypeParser implements SemanticParser { SemanticParseInfo parseInfo = semanticQuery.getParseInfo(); SqlInfo sqlInfo = parseInfo.getSqlInfo(); if (Objects.isNull(sqlInfo) || StringUtils.isBlank(sqlInfo.getS2SQL())) { - return QueryType.ID; + return QueryType.DETAIL; } //1. entity queryType Long dataSetId = parseInfo.getDataSetId(); @@ -80,7 +80,7 @@ public class QueryTypeParser implements SemanticParser { if (selectContainsMetric(sqlInfo, dataSetId, semanticSchema)) { return QueryType.METRIC; } - return QueryType.ID; + return QueryType.DETAIL; } private static List filterByTimeFields(List whereFields) { diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java index c7862cf4a..ad1d07dd9 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java @@ -22,7 +22,6 @@ import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.common.pojo.enums.TimeMode; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.headless.api.pojo.DataSetDetail; @@ -38,10 +37,7 @@ 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.MetricParam; -import com.tencent.supersonic.headless.api.pojo.MetricTypeDefaultConfig; import com.tencent.supersonic.headless.api.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.pojo.QueryConfig; -import com.tencent.supersonic.headless.api.pojo.TimeDefaultConfig; import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; import com.tencent.supersonic.headless.api.pojo.enums.IdentifyType; import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; @@ -473,14 +469,6 @@ public class S2VisitsDemo extends S2BaseDemo { dataSetDetail.setDataSetModelConfigs(dataSetModelConfigs); dataSetReq.setDataSetDetail(dataSetDetail); dataSetReq.setTypeEnum(TypeEnums.DATASET); - QueryConfig queryConfig = new QueryConfig(); - MetricTypeDefaultConfig metricTypeDefaultConfig = new MetricTypeDefaultConfig(); - TimeDefaultConfig timeDefaultConfig = new TimeDefaultConfig(); - timeDefaultConfig.setTimeMode(TimeMode.RECENT); - timeDefaultConfig.setUnit(7); - metricTypeDefaultConfig.setTimeDefaultConfig(timeDefaultConfig); - queryConfig.setMetricTypeDefaultConfig(metricTypeDefaultConfig); - dataSetReq.setQueryConfig(queryConfig); return dataSetService.save(dataSetReq, User.getFakeUser()); }