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 af79b4796..be20e73b5 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 @@ -202,8 +202,7 @@ public class QueryServiceImpl implements QueryService { @Override @TimeCost public QueryResult performExecution(ExecuteQueryReq queryReq) throws Exception { - ChatParseDO chatParseDO = chatService.getParseInfo(queryReq.getQueryId(), - queryReq.getParseId()); + ChatParseDO chatParseDO = chatService.getParseInfo(queryReq.getQueryId(), queryReq.getParseId()); ChatQueryDO chatQueryDO = chatService.getLastQuery(queryReq.getChatId()); List timeCostDOList = new ArrayList<>(); SemanticParseInfo parseInfo = JsonUtil.toObject(chatParseDO.getParseInfo(), SemanticParseInfo.class); diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java index d6b04e63a..13c42a677 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java @@ -66,7 +66,7 @@ public class FieldAndValueAcquireVisitor extends ExpressionVisitorAdapter { List expressions = rightExpressionList.getExpressions(); if (CollectionUtils.isNotEmpty(expressions)) { for (Expression expression : expressions) { - result.add(expression.toString()); + result.add(getFieldValue(expression)); } } } diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/EntityQueryTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/EntityQueryTest.java index a0f2b7e1c..87b64adf1 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/EntityQueryTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/EntityQueryTest.java @@ -1,5 +1,7 @@ package com.tencent.supersonic.integration; +import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE; + import com.tencent.supersonic.chat.api.pojo.SchemaElement; import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo; import com.tencent.supersonic.chat.api.pojo.request.QueryFilter; @@ -7,12 +9,12 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.chat.query.rule.entity.EntityFilterQuery; import com.tencent.supersonic.chat.query.rule.metric.MetricEntityQuery; import com.tencent.supersonic.common.pojo.DateConf; +import com.tencent.supersonic.common.pojo.DateConf.DateMode; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.util.DataUtils; -import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE; +import org.junit.Test; public class EntityQueryTest extends BaseQueryTest { @@ -33,7 +35,7 @@ public class EntityQueryTest extends BaseQueryTest { SchemaElement metric = SchemaElement.builder().name("播放量").build(); expectedParseInfo.getMetrics().add(metric); - expectedParseInfo.setDateInfo(DataUtils.getDateConf(DateConf.DateMode.RECENT, 7, period, startDay, endDay)); + expectedParseInfo.setDateInfo(DataUtils.getDateConf(DateMode.BETWEEN, 1, period, startDay, endDay)); expectedParseInfo.setNativeQuery(false); assertQueryResult(expectedResult, actualResult); diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java index eb7f0a9d8..16d3a8e08 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java @@ -58,6 +58,7 @@ public class MetricInterpretTest { .queryId(parseResp.getQueryId()) .queryText(parseResp.getQueryText()) .parseInfo(parseResp.getSelectedParses().get(0)) + .parseId(parseResp.getSelectedParses().get(0).getId()) .build(); QueryResult queryResult = queryService.performExecution(executeReq); Assert.assertEquals(queryResult.getQueryResults().get(0).get("answer"), lLmAnswerResp.getAssistantMessage());